openbsd/libopenssh
1
0
Fork 0
mirror of https://github.com/openssh/libopenssh synced 2026-04-27 15:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

gracefully skip unrecognised key types

Browse Source
This commit is contained in:
Damien Miller
2012-03-26 23:23:34 +11:00
parent 2c25fb2ede
commit e237a835f2
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ssh/authfd.c
View File

@@ -332,7 +332,7 @@ ssh_fetch_identitylist(int sock, int version, struct ssh_identitylist **idlp)
r = SSH_ERR_ALLOC_FAIL;
goto out;
}
for (i = 0; i < num; i++) {
for (i = 0; i < num;) {
switch (version) {
case 1:
if ((r = deserialise_identity1(msg,
@@ -341,10 +341,17 @@ ssh_fetch_identitylist(int sock, int version, struct ssh_identitylist **idlp)
break;
case 2:
if ((r = deserialise_identity2(msg,
&(idl->keys[i]), &(idl->comments[i]))) != 0)
goto out;
&(idl->keys[i]), &(idl->comments[i]))) != 0) {
if (r == SSH_ERR_KEY_TYPE_UNKNOWN) {
/* Gracefully skip unknown key types */
num--;
continue;
} else
goto out;
}
break;
}
i++;
}
idl->nkeys = num;
*idlp = idl;