version 1.64, 2015/02/16 22:08:57 |
version 1.65, 2015/03/31 22:57:06 |
|
|
struct hostkey_entry *tmp; |
struct hostkey_entry *tmp; |
|
|
if (l->status == HKF_STATUS_INVALID) { |
if (l->status == HKF_STATUS_INVALID) { |
error("%s:%ld: parse error in hostkeys file", |
/* XXX make this verbose() in the future */ |
|
debug("%s:%ld: parse error in hostkeys file", |
l->path, l->linenum); |
l->path, l->linenum); |
return 0; |
return 0; |
} |
} |
|
|
memcpy(ktype, lineinfo.rawkey, l); |
memcpy(ktype, lineinfo.rawkey, l); |
ktype[l] = '\0'; |
ktype[l] = '\0'; |
lineinfo.keytype = sshkey_type_from_name(ktype); |
lineinfo.keytype = sshkey_type_from_name(ktype); |
#ifdef WITH_SSH1 |
|
/* |
/* |
* Assume RSA1 if the first component is a short |
* Assume RSA1 if the first component is a short |
* decimal number. |
* decimal number. |
|
|
if (lineinfo.keytype == KEY_UNSPEC && l < 8 && |
if (lineinfo.keytype == KEY_UNSPEC && l < 8 && |
strspn(ktype, "0123456789") == l) |
strspn(ktype, "0123456789") == l) |
lineinfo.keytype = KEY_RSA1; |
lineinfo.keytype = KEY_RSA1; |
#endif |
|
/* |
/* |
* Check that something other than whitespace follows |
* Check that something other than whitespace follows |
* the key type. This won't catch all corruption, but |
* the key type. This won't catch all corruption, but |