version 1.124, 2015/09/13 13:48:19 |
version 1.125, 2015/09/13 14:39:16 |
|
|
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, "", &private, |
&private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) { |
&comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) { |
fprintf(stderr, "Error loading key \"%s\": %s\n", |
fprintf(stderr, "Error loading key \"%s\": %s\n", |
filename, ssh_err(r)); |
filename, ssh_err(r)); |
goto fail_load; |
goto fail_load; |
} |
} |
/* try last */ |
/* try last */ |
if (private == NULL && pass != NULL) { |
if (private == NULL && pass != NULL) { |
if ((r = sshkey_parse_private_fileblob(keyblob, pass, filename, |
if ((r = sshkey_parse_private_fileblob(keyblob, pass, &private, |
&private, &comment)) != 0 && |
&comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) { |
r != SSH_ERR_KEY_WRONG_PASSPHRASE) { |
|
fprintf(stderr, "Error loading key \"%s\": %s\n", |
fprintf(stderr, "Error loading key \"%s\": %s\n", |
filename, ssh_err(r)); |
filename, ssh_err(r)); |
goto fail_load; |
goto fail_load; |
|
|
if (strcmp(pass, "") == 0) |
if (strcmp(pass, "") == 0) |
goto fail_load; |
goto fail_load; |
if ((r = sshkey_parse_private_fileblob(keyblob, pass, |
if ((r = sshkey_parse_private_fileblob(keyblob, pass, |
filename, &private, &comment)) == 0) |
&private, &comment)) == 0) |
break; |
break; |
else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) { |
else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) { |
fprintf(stderr, |
fprintf(stderr, |