version 1.119, 2014/06/30 12:54:39 |
version 1.120, 2014/07/09 03:02:15 |
|
|
|
|
if ((r = sshkey_load_cert(filename, &ret)) != 0) { |
if ((r = sshkey_load_cert(filename, &ret)) != 0) { |
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); |
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); |
if (r == SSH_ERR_SYSTEM_ERROR && errno == ENOENT) |
/* Old authfile.c ignored all file errors. */ |
|
if (r == SSH_ERR_SYSTEM_ERROR) |
debug("%s: %s", __func__, ssh_err(r)); |
debug("%s: %s", __func__, ssh_err(r)); |
else |
else |
error("%s: %s", __func__, ssh_err(r)); |
error("%s: %s", __func__, ssh_err(r)); |
|
|
|
|
if ((r = sshkey_load_public(filename, &ret, commentp)) != 0) { |
if ((r = sshkey_load_public(filename, &ret, commentp)) != 0) { |
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); |
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); |
if (r == SSH_ERR_SYSTEM_ERROR && errno == ENOENT) |
/* Old authfile.c ignored all file errors. */ |
|
if (r == SSH_ERR_SYSTEM_ERROR) |
debug("%s: %s", __func__, ssh_err(r)); |
debug("%s: %s", __func__, ssh_err(r)); |
else |
else |
error("%s: %s", __func__, ssh_err(r)); |
error("%s: %s", __func__, ssh_err(r)); |
|
|
|
|
if ((r = sshkey_load_private(path, passphrase, &ret, commentp)) != 0) { |
if ((r = sshkey_load_private(path, passphrase, &ret, commentp)) != 0) { |
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); |
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); |
if (r == SSH_ERR_SYSTEM_ERROR && errno == ENOENT) |
/* Old authfile.c ignored all file errors. */ |
|
if (r == SSH_ERR_SYSTEM_ERROR) |
debug("%s: %s", __func__, ssh_err(r)); |
debug("%s: %s", __func__, ssh_err(r)); |
else |
else |
error("%s: %s", __func__, ssh_err(r)); |
error("%s: %s", __func__, ssh_err(r)); |
|
|
if ((r = sshkey_load_private_cert(type, filename, passphrase, |
if ((r = sshkey_load_private_cert(type, filename, passphrase, |
&ret, perm_ok)) != 0) { |
&ret, perm_ok)) != 0) { |
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); |
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); |
if (r == SSH_ERR_SYSTEM_ERROR && errno == ENOENT) |
/* Old authfile.c ignored all file errors. */ |
|
if (r == SSH_ERR_SYSTEM_ERROR) |
debug("%s: %s", __func__, ssh_err(r)); |
debug("%s: %s", __func__, ssh_err(r)); |
else |
else |
error("%s: %s", __func__, ssh_err(r)); |
error("%s: %s", __func__, ssh_err(r)); |
|
|
if ((r = sshkey_load_private_type(type, filename, passphrase, |
if ((r = sshkey_load_private_type(type, filename, passphrase, |
&ret, commentp, perm_ok)) != 0) { |
&ret, commentp, perm_ok)) != 0) { |
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); |
fatal_on_fatal_errors(r, __func__, SSH_ERR_LIBCRYPTO_ERROR); |
if ((r == SSH_ERR_SYSTEM_ERROR && errno == ENOENT) || |
/* Old authfile.c ignored all file errors. */ |
|
if (r == SSH_ERR_SYSTEM_ERROR || |
(r == SSH_ERR_KEY_WRONG_PASSPHRASE)) |
(r == SSH_ERR_KEY_WRONG_PASSPHRASE)) |
debug("%s: %s", __func__, ssh_err(r)); |
debug("%s: %s", __func__, ssh_err(r)); |
else |
else |