summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index f10f6bf8c..8a9887a2e 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.180 2010/02/26 20:29:54 djm Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.183 2010/04/26 22:28:24 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -247,7 +247,7 @@ struct Authctxt {
247 const char *host; 247 const char *host;
248 const char *service; 248 const char *service;
249 Authmethod *method; 249 Authmethod *method;
250 int success; 250 sig_atomic_t success;
251 char *authlist; 251 char *authlist;
252 /* pubkey */ 252 /* pubkey */
253 Idlist keys; 253 Idlist keys;
@@ -1250,8 +1250,11 @@ sign_and_send_pubkey(Authctxt *authctxt, Identity *id)
1250 u_int skip = 0; 1250 u_int skip = 0;
1251 int ret = -1; 1251 int ret = -1;
1252 int have_sig = 1; 1252 int have_sig = 1;
1253 char *fp;
1253 1254
1254 debug3("sign_and_send_pubkey"); 1255 fp = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX);
1256 debug3("sign_and_send_pubkey: %s %s", key_type(id->key), fp);
1257 xfree(fp);
1255 1258
1256 if (key_to_blob(id->key, &blob, &bloblen) == 0) { 1259 if (key_to_blob(id->key, &blob, &bloblen) == 0) {
1257 /* we cannot handle this key */ 1260 /* we cannot handle this key */
@@ -1510,7 +1513,8 @@ userauth_pubkey(Authctxt *authctxt)
1510 * private key instead 1513 * private key instead
1511 */ 1514 */
1512 if (id->key && id->key->type != KEY_RSA1) { 1515 if (id->key && id->key->type != KEY_RSA1) {
1513 debug("Offering public key: %s", id->filename); 1516 debug("Offering %s public key: %s", key_type(id->key),
1517 id->filename);
1514 sent = send_pubkey_test(authctxt, id); 1518 sent = send_pubkey_test(authctxt, id);
1515 } else if (id->key == NULL && id->filename) { 1519 } else if (id->key == NULL && id->filename) {
1516 debug("Trying private key: %s", id->filename); 1520 debug("Trying private key: %s", id->filename);