summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshconnect2.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2001-03-12 22:02:03 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2001-03-12 22:02:03 +0000
commita7e1eed1c53b6b405afe9f21111727c1954e7265 (patch)
treead780c7bcf37571e8e047e210b6a86f1da432a0f /usr.bin/ssh/sshconnect2.c
parentba3c6f715f22cd6f898396242be2f7b491887f29 (diff)
remove old key_fingerprint interface, s/_ex//
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
-rw-r--r--usr.bin/ssh/sshconnect2.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index 19d079bd398..046d746a4ec 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/sshconnect2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.53 2001/03/10 17:51:04 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.54 2001/03/12 22:02:02 markus Exp $");
#include <openssl/bn.h>
#include <openssl/md5.h>
@@ -660,7 +660,7 @@ input_userauth_pk_ok(int type, int plen, void *ctxt)
Key *key = NULL;
Buffer b;
int alen, blen, pktype, sent = 0;
- char *pkalg, *pkblob;
+ char *pkalg, *pkblob, *fp;
if (authctxt == NULL)
fatal("input_userauth_pk_ok: no authentication context");
@@ -687,7 +687,6 @@ input_userauth_pk_ok(int type, int plen, void *ctxt)
debug("no last key or no sign cb");
break;
}
- debug2("last_key %s", key_fingerprint(authctxt->last_key));
if ((pktype = key_type_from_name(pkalg)) == KEY_UNSPEC) {
debug("unknown pkalg %s", pkalg);
break;
@@ -696,7 +695,9 @@ input_userauth_pk_ok(int type, int plen, void *ctxt)
debug("no key from blob. pkalg %s", pkalg);
break;
}
- debug2("input_userauth_pk_ok: fp %s", key_fingerprint(key));
+ fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
+ debug2("input_userauth_pk_ok: fp %s", fp);
+ xfree(fp);
if (!key_equal(key, authctxt->last_key)) {
debug("key != last_key");
break;