src: Migrate to SSH_LOG.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/kex1.c b/src/kex1.c
index b396a71..cbbf810 100644
--- a/src/kex1.c
+++ b/src/kex1.c
@@ -247,7 +247,7 @@ static ssh_string encrypt_session_key(ssh_session session, ssh_public_key srvkey
   }
   ssh_string_fill(data1, buffer, 32);
   if (ABS(hlen - slen) < 128){
-    ssh_log(session, SSH_LOG_FUNCTIONS,
+    SSH_LOG(SSH_LOG_FUNCTIONS,
         "Difference between server modulus and host modulus is only %d. "
         "It's illegal and may not work",
         ABS(hlen - slen));
@@ -320,7 +320,7 @@ SSH_PACKET_CALLBACK(ssh_packet_publickey1){
   enter_function();
   (void)type;
   (void)user;
-  ssh_log(session, SSH_LOG_PROTOCOL, "Got a SSH_SMSG_PUBLIC_KEY");
+  SSH_LOG(SSH_LOG_PROTOCOL, "Got a SSH_SMSG_PUBLIC_KEY");
   if(session->session_state != SSH_SESSION_STATE_INITIAL_KEX){
     ssh_set_error(session,SSH_FATAL,"SSH_KEXINIT received in wrong state");
     goto error;
@@ -354,7 +354,7 @@ SSH_PACKET_CALLBACK(ssh_packet_publickey1){
 
   if ((ko != sizeof(uint32_t)) || !host_mod || !host_exp
       || !server_mod || !server_exp) {
-    ssh_log(session, SSH_LOG_RARE, "Invalid SSH_SMSG_PUBLIC_KEY packet");
+    SSH_LOG(SSH_LOG_RARE, "Invalid SSH_SMSG_PUBLIC_KEY packet");
     ssh_set_error(session, SSH_FATAL, "Invalid SSH_SMSG_PUBLIC_KEY packet");
     goto error;
   }
@@ -364,7 +364,7 @@ SSH_PACKET_CALLBACK(ssh_packet_publickey1){
   protocol_flags = ntohl(protocol_flags);
   supported_ciphers_mask = ntohl(supported_ciphers_mask);
   supported_authentications_mask = ntohl(supported_authentications_mask);
-  ssh_log(session, SSH_LOG_PROTOCOL,
+  SSH_LOG(SSH_LOG_PROTOCOL,
       "Server bits: %d; Host bits: %d; Protocol flags: %.8lx; "
       "Cipher mask: %.8lx; Auth mask: %.8lx",
       server_bits,
@@ -409,7 +409,7 @@ SSH_PACKET_CALLBACK(ssh_packet_publickey1){
     ssh_set_error(session, SSH_FATAL, "Remote server doesn't accept 3DES");
     goto error;
   }
-  ssh_log(session, SSH_LOG_PROTOCOL, "Sending SSH_CMSG_SESSION_KEY");
+  SSH_LOG(SSH_LOG_PROTOCOL, "Sending SSH_CMSG_SESSION_KEY");
 
    if (buffer_add_u8(session->out_buffer, SSH_CMSG_SESSION_KEY) < 0) {
      goto error;
@@ -427,7 +427,7 @@ SSH_PACKET_CALLBACK(ssh_packet_publickey1){
    }
 
    bits = ssh_string_len(enc_session) * 8 - 7;
-   ssh_log(session, SSH_LOG_PROTOCOL, "%d bits, %" PRIdS " bytes encrypted session",
+   SSH_LOG(SSH_LOG_PROTOCOL, "%d bits, %" PRIdS " bytes encrypted session",
        bits, ssh_string_len(enc_session));
    bits = htons(bits);
    /* the encrypted mpint */
@@ -477,21 +477,21 @@ end:
 int ssh_get_kex1(ssh_session session) {
   int ret=SSH_ERROR;
   enter_function();
-  ssh_log(session, SSH_LOG_PROTOCOL, "Waiting for a SSH_SMSG_PUBLIC_KEY");
+  SSH_LOG(SSH_LOG_PROTOCOL, "Waiting for a SSH_SMSG_PUBLIC_KEY");
   /* Here the callback is called */
   while(session->session_state==SSH_SESSION_STATE_INITIAL_KEX){
     ssh_handle_packets(session, SSH_TIMEOUT_USER);
   }
   if(session->session_state==SSH_SESSION_STATE_ERROR)
     goto error;
-  ssh_log(session, SSH_LOG_PROTOCOL, "Waiting for a SSH_SMSG_SUCCESS");
+  SSH_LOG(SSH_LOG_PROTOCOL, "Waiting for a SSH_SMSG_SUCCESS");
   /* Waiting for SSH_SMSG_SUCCESS */
   while(session->session_state==SSH_SESSION_STATE_KEXINIT_RECEIVED){
     ssh_handle_packets(session, SSH_TIMEOUT_USER);
   }
   if(session->session_state==SSH_SESSION_STATE_ERROR)
       goto error;
-  ssh_log(session, SSH_LOG_PROTOCOL, "received SSH_SMSG_SUCCESS\n");
+  SSH_LOG(SSH_LOG_PROTOCOL, "received SSH_SMSG_SUCCESS\n");
   ret=SSH_OK;
 error:
   leave_function();