[git] web/master.git branch master updated. 3518cfb

The branch, master on web/master.git has been updated from 0f99615ee5ce51467562bb8b6346e5e7d701daa2 (commit) to 3518cfbcbcd3e8e5ab2aca4da669a4af6ea3210b (commit) http://git.php.net/?p=web/master.git;a=log;h=3518cfbcbcd3e8e5ab2aca4da669a4af6ea3210b;hp=0f99615ee5ce51467562bb8b6346e5e7d701daa2 Summary of changes: include/functions.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- Log ---------------------------------------- commit 3518cfbcbcd3e8e5ab2aca4da669a4af6ea3210b Author: Martin Jansen <martin@divbyzero.net> Date: Sun Jan 22 17:00:17 2012 +0100 The prefix of DSA keys is ssh-dss and not ssh-dsa. diff --git a/include/functions.inc b/include/functions.inc index bdbe2c9..29f63b2 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -194,7 +194,7 @@ function verify_ssh_keys($string) { function get_ssh_keys($string) { $results = array(); - if (preg_match_all('@(ssh-(?:rsa|dsa) ([^\s]+) ([^\s]*))@', $string, $matches, PREG_SET_ORDER)) { + if (preg_match_all('@(ssh-(?:rsa|dss) ([^\s]+) ([^\s]*))@', $string, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $results[] = array('key' => $match[1], 'name' => $match[3]); Thank you for your contribution.