src/usr.bin/ssh/sshkey.c - diff

Return to sshkey.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/sshkey.c between version 1.22 and 1.23

version 1.22, 2015/09/02 07:51:12

version 1.23, 2015/09/13 14:39:16

Line 3775

sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,

const char *passphrase, struct sshkey **keyp, char **commentp)

{

int r;

*keyp = NULL;

if (commentp != NULL)

*commentp = NULL;

Line 3798

Line 3796

return sshkey_parse_private2(blob, type, passphrase,

keyp, commentp);

case KEY_UNSPEC:

if ((r = sshkey_parse_private2(blob, type, passphrase, keyp,

if (sshkey_parse_private2(blob, type, passphrase, keyp,

commentp)) == 0)

commentp) == 0)

return 0;

#ifdef WITH_OPENSSL

return sshkey_parse_private_pem_fileblob(blob, type,

Line 3814

Line 3812

int

sshkey_parse_private_fileblob(struct sshbuf *buffer, const char *passphrase,

const char *filename, struct sshkey **keyp, char **commentp)

struct sshkey **keyp, char **commentp)

{

int r;

if (keyp != NULL)

*keyp = NULL;

if (commentp != NULL)

Line 3825

Line 3821

#ifdef WITH_SSH1

/* it's a SSH v1 key if the public key part is readable */

if ((r = sshkey_parse_public_rsa1_fileblob(buffer, NULL, NULL)) == 0) {

if (sshkey_parse_public_rsa1_fileblob(buffer, NULL, NULL) == 0) {

return sshkey_parse_private_fileblob_type(buffer, KEY_RSA1,

passphrase, keyp, commentp);

}

#endif /* WITH_SSH1 */

if ((r = sshkey_parse_private_fileblob_type(buffer, KEY_UNSPEC,

return sshkey_parse_private_fileblob_type(buffer, KEY_UNSPEC,

passphrase, keyp, commentp)) == 0)

passphrase, keyp, commentp);

return 0;

return r;

}