version 1.110, 2014/06/24 01:13:21 |
version 1.111, 2014/06/27 18:50:39 |
|
|
close(fd); |
close(fd); |
|
|
/* At first, try empty passphrase */ |
/* At first, try empty passphrase */ |
if ((r = sshkey_parse_private_fileblob(&keyblob, filename, "", |
if ((r = sshkey_parse_private_fileblob(&keyblob, "", filename, |
&private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
&private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
fatal("Cannot parse %s: %s", filename, ssh_err(r)); |
fatal("Cannot parse %s: %s", filename, ssh_err(r)); |
if (comment == NULL) |
if (comment == NULL) |
comment = xstrdup(filename); |
comment = xstrdup(filename); |
/* try last */ |
/* try last */ |
if (private == NULL && pass != NULL) { |
if (private == NULL && pass != NULL) { |
if ((r = sshkey_parse_private_fileblob(&keyblob, filename, pass, |
if ((r = sshkey_parse_private_fileblob(&keyblob, pass, filename, |
&private, &comment)) != 0 && |
&private, &comment)) != 0 && |
r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
fatal("Cannot parse %s: %s", filename, ssh_err(r)); |
fatal("Cannot parse %s: %s", filename, ssh_err(r)); |
|
|
return -1; |
return -1; |
} |
} |
if ((r = sshkey_parse_private_fileblob(&keyblob, |
if ((r = sshkey_parse_private_fileblob(&keyblob, |
filename, pass, &private, &comment)) != 0 && |
pass, filename, &private, NULL)) != 0 && |
r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
fatal("Cannot parse %s: %s", |
fatal("Cannot parse %s: %s", |
filename, ssh_err(r)); |
filename, ssh_err(r)); |