1 files changed, 21 insertions, 26 deletions

diff --git a/auth1.c b/auth1.c
index 6eea8d81e..f1ac59814 100644
--- a/auth1.c
+++ b/auth1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth1.c,v 1.77 2012/12/02 20:34:09 djm Exp $ */
+/* $OpenBSD: auth1.c,v 1.79 2013/05/19 02:42:42 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -45,11 +45,11 @@
 extern ServerOptions options;
 extern Buffer loginmsg;
 
-static int auth1_process_password(Authctxt *, char *, size_t);
-static int auth1_process_rsa(Authctxt *, char *, size_t);
-static int auth1_process_rhosts_rsa(Authctxt *, char *, size_t);
-static int auth1_process_tis_challenge(Authctxt *, char *, size_t);
-static int auth1_process_tis_response(Authctxt *, char *, size_t);
+static int auth1_process_password(Authctxt *);
+static int auth1_process_rsa(Authctxt *);
+static int auth1_process_rhosts_rsa(Authctxt *);
+static int auth1_process_tis_challenge(Authctxt *);
+static int auth1_process_tis_response(Authctxt *);
 
 static char *client_user = NULL;    /* Used to fill in remote user for PAM */
 
@@ -57,7 +57,7 @@ struct AuthMethod1 {
         int type;
         char *name;
         int *enabled;
-        int (*method)(Authctxt *, char *, size_t);
+        int (*method)(Authctxt *);
 };
 
 const struct AuthMethod1 auth1_methods[] = {
@@ -112,7 +112,7 @@ get_authname(int type)
 
 /*ARGSUSED*/
 static int
-auth1_process_password(Authctxt *authctxt, char *info, size_t infolen)
+auth1_process_password(Authctxt *authctxt)
 {
         int authenticated = 0;
         char *password;
@@ -130,14 +130,14 @@ auth1_process_password(Authctxt *authctxt, char *info, size_t infolen)
         authenticated = PRIVSEP(auth_password(authctxt, password));
 
         memset(password, 0, dlen);
-        xfree(password);
+        free(password);
 
         return (authenticated);
 }
 
 /*ARGSUSED*/
 static int
-auth1_process_rsa(Authctxt *authctxt, char *info, size_t infolen)
+auth1_process_rsa(Authctxt *authctxt)
 {
         int authenticated = 0;
         BIGNUM *n;
@@ -155,7 +155,7 @@ auth1_process_rsa(Authctxt *authctxt, char *info, size_t infolen)
 
 /*ARGSUSED*/
 static int
-auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen)
+auth1_process_rhosts_rsa(Authctxt *authctxt)
 {
         int keybits, authenticated = 0;
         u_int bits;
@@ -187,14 +187,14 @@ auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen)
             client_host_key);
         key_free(client_host_key);
 
-        snprintf(info, infolen, " ruser %.100s", client_user);
+        auth_info(authctxt, "ruser %.100s", client_user);
 
         return (authenticated);
 }
 
 /*ARGSUSED*/
 static int
-auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen)
+auth1_process_tis_challenge(Authctxt *authctxt)
 {
         char *challenge;
 
@@ -204,7 +204,7 @@ auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen)
         debug("sending challenge '%s'", challenge);
         packet_start(SSH_SMSG_AUTH_TIS_CHALLENGE);
         packet_put_cstring(challenge);
-        xfree(challenge);
+        free(challenge);
         packet_send();
         packet_write_wait();
 
@@ -213,7 +213,7 @@ auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen)
 
 /*ARGSUSED*/
 static int
-auth1_process_tis_response(Authctxt *authctxt, char *info, size_t infolen)
+auth1_process_tis_response(Authctxt *authctxt)
 {
         int authenticated = 0;
         char *response;
@@ -223,7 +223,7 @@ auth1_process_tis_response(Authctxt *authctxt, char *info, size_t infolen)
         packet_check_eom();
         authenticated = verify_response(authctxt, response);
         memset(response, 'r', dlen);
-        xfree(response);
+        free(response);
 
         return (authenticated);
 }
@@ -236,7 +236,6 @@ static void
 do_authloop(Authctxt *authctxt)
 {
         int authenticated = 0;
-        char info[1024];
         int prev = 0, type = 0;
         const struct AuthMethod1 *meth;
 
@@ -254,7 +253,7 @@ do_authloop(Authctxt *authctxt)
 #endif
                 {
                         auth_log(authctxt, 1, 0, "without authentication",
-                            NULL, "");
+                            NULL);
                         return;
                 }
         }
@@ -268,7 +267,6 @@ do_authloop(Authctxt *authctxt)
                 /* default to fail */
                 authenticated = 0;
 
-                info[0] = '\0';
 
                 /* Get a packet from the client. */
                 prev = type;
@@ -298,7 +296,7 @@ do_authloop(Authctxt *authctxt)
                         goto skip;
                 }
 
-                authenticated = meth->method(authctxt, info, sizeof(info));
+                authenticated = meth->method(authctxt);
                 if (authenticated == -1)
                         continue; /* "postponed" */
 
@@ -353,13 +351,10 @@ do_authloop(Authctxt *authctxt)
 
  skip:
                 /* Log before sending the reply */
-                auth_log(authctxt, authenticated, 0, get_authname(type),
-                    NULL, info);
+                auth_log(authctxt, authenticated, 0, get_authname(type), NULL);
 
-                if (client_user != NULL) {
-                        xfree(client_user);
-                        client_user = NULL;
-                }
+                free(client_user);
+                client_user = NULL;
 
                 if (authenticated)
                         return;