aboutsummaryrefslogtreecommitdiff
path: root/src/legacy.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/legacy.c')
-rw-r--r--src/legacy.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/legacy.c b/src/legacy.c
index 6ad4fdc2..7f2bb4d0 100644
--- a/src/legacy.c
+++ b/src/legacy.c
@@ -120,11 +120,11 @@ int ssh_userauth_privatekey_file(ssh_session session,
pubkey = publickey_from_file(session, pubkeyfile, &type);
if (pubkey == NULL) {
- ssh_log(session, SSH_LOG_RARE, "Public key file %s not found. Trying to generate it.", pubkeyfile);
+ SSH_LOG(SSH_LOG_RARE, "Public key file %s not found. Trying to generate it.", pubkeyfile);
/* auto-detect the key type with type=0 */
privkey = privatekey_from_file(session, filename, 0, passphrase);
} else {
- ssh_log(session, SSH_LOG_RARE, "Public key file %s loaded.", pubkeyfile);
+ SSH_LOG(SSH_LOG_RARE, "Public key file %s loaded.", pubkeyfile);
privkey = privatekey_from_file(session, filename, type, passphrase);
}
if (privkey == NULL) {
@@ -610,8 +610,8 @@ int ssh_publickey_to_file(ssh_session session,
SAFE_FREE(pubkey_64);
SAFE_FREE(user);
- ssh_log(session, SSH_LOG_RARE, "Trying to write public key file: %s", file);
- ssh_log(session, SSH_LOG_PACKET, "public key file content: %s", buffer);
+ SSH_LOG(SSH_LOG_RARE, "Trying to write public key file: %s", file);
+ SSH_LOG(SSH_LOG_PACKET, "public key file content: %s", buffer);
fp = fopen(file, "w+");
if (fp == NULL) {
@@ -652,9 +652,9 @@ int ssh_try_publickey_from_file(ssh_session session,
}
}
- ssh_log(session, SSH_LOG_PACKET, "Trying to open privatekey %s", keyfile);
+ SSH_LOG(SSH_LOG_PACKET, "Trying to open privatekey %s", keyfile);
if (!ssh_file_readaccess_ok(keyfile)) {
- ssh_log(session, SSH_LOG_PACKET, "Failed to open privatekey %s", keyfile);
+ SSH_LOG(SSH_LOG_PACKET, "Failed to open privatekey %s", keyfile);
return -1;
}
@@ -665,16 +665,16 @@ int ssh_try_publickey_from_file(ssh_session session,
}
snprintf(pubkey_file, len, "%s.pub", keyfile);
- ssh_log(session, SSH_LOG_PACKET, "Trying to open publickey %s",
+ SSH_LOG(SSH_LOG_PACKET, "Trying to open publickey %s",
pubkey_file);
if (!ssh_file_readaccess_ok(pubkey_file)) {
- ssh_log(session, SSH_LOG_PACKET, "Failed to open publickey %s",
+ SSH_LOG(SSH_LOG_PACKET, "Failed to open publickey %s",
pubkey_file);
SAFE_FREE(pubkey_file);
return 1;
}
- ssh_log(session, SSH_LOG_PACKET, "Success opening public and private key");
+ SSH_LOG(SSH_LOG_PACKET, "Success opening public and private key");
/*
* We are sure both the private and public key file is readable. We return
@@ -682,7 +682,7 @@ int ssh_try_publickey_from_file(ssh_session session,
*/
pubkey_string = publickey_from_file(session, pubkey_file, &pubkey_type);
if (pubkey_string == NULL) {
- ssh_log(session, SSH_LOG_PACKET,
+ SSH_LOG(SSH_LOG_PACKET,
"Wasn't able to open public key file %s: %s",
pubkey_file,
ssh_get_error(session));