merge 6.3p1

1 files changed, 11 insertions, 12 deletions

diff --git a/auth-rsa.c b/auth-rsa.c
index 2c8a7cb35..545aa496a 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-rsa.c,v 1.81 2012/10/30 21:29:54 djm Exp $ */
+/* $OpenBSD: auth-rsa.c,v 1.85 2013/07/12 00:19:58 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -164,9 +164,8 @@ static int
 rsa_key_allowed_in_file(struct passwd *pw, char *file,
     const BIGNUM *client_n, Key **rkey)
 {
-        char line[SSH_MAX_PUBKEY_BYTES];
-        int allowed = 0;
-        u_int bits;
+        char *fp, line[SSH_MAX_PUBKEY_BYTES];
+        int allowed = 0, bits;
         FILE *f;
         u_long linenum = 0;
         Key *key;
@@ -227,11 +226,16 @@ rsa_key_allowed_in_file(struct passwd *pw, char *file,
 
                 /* check the real bits  */
                 keybits = BN_num_bits(key->rsa->n);
-                if (keybits < 0 || bits != (u_int)keybits)
+                if (keybits < 0 || bits != keybits)
                         logit("Warning: %s, line %lu: keysize mismatch: "
                             "actual %d vs. announced %d.",
                             file, linenum, BN_num_bits(key->rsa->n), bits);
 
+                fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
+                debug("matching key found: file %s, line %lu %s %s",
+                    file, linenum, key_type(key), fp);
+                free(fp);
+
                 /* Never accept a revoked key */
                 if (auth_key_is_revoked(key))
                         break;
@@ -281,7 +285,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
                 file = expand_authorized_keys(
                     options.authorized_keys_files[i], pw);
                 allowed = rsa_key_allowed_in_file(pw, file, client_n, rkey);
-                xfree(file);
+                free(file);
         }
 
         restore_uid();
@@ -298,7 +302,6 @@ int
 auth_rsa(Authctxt *authctxt, BIGNUM *client_n)
 {
         Key *key;
-        char *fp;
         struct passwd *pw = authctxt->pw;
 
         /* no user given */
@@ -328,11 +331,7 @@ auth_rsa(Authctxt *authctxt, BIGNUM *client_n)
          * options; this will be reset if the options cause the
          * authentication to be rejected.
          */
-        fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
-        verbose("Found matching %s key: %s",
-            key_type(key), fp);
-        xfree(fp);
-        key_free(key);
+        pubkey_auth_info(authctxt, key, NULL);
 
         packet_send_debug("RSA authentication accepted.");
         return (1);