summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2014-12-21 22:27:55 +0000
committerDamien Miller <djm@mindrot.org>2014-12-22 09:32:29 +1100
commit56d1c83cdd1ac76f1c6bd41e01e80dad834f3994 (patch)
tree700a872e702c686c1815bb1049eb93e88079b598 /sshconnect2.c
parent058f839fe15c51be8b3a844a76ab9a8db550be4f (diff)
upstream commit
Add FingerprintHash option to control algorithm used for key fingerprints. Default changes from MD5 to SHA256 and format from hex to base64. Feedback and ok naddy@ markus@
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 6884d6be1..ad20fae6a 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.211 2014/12/11 05:13:28 djm Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.212 2014/12/21 22:27:56 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.
@@ -582,7 +582,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)
582 key->type, pktype); 582 key->type, pktype);
583 goto done; 583 goto done;
584 } 584 }
585 fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); 585 fp = key_fingerprint(key, options.fingerprint_hash, SSH_FP_DEFAULT);
586 debug2("input_userauth_pk_ok: fp %s", fp); 586 debug2("input_userauth_pk_ok: fp %s", fp);
587 free(fp); 587 free(fp);
588 588
@@ -991,7 +991,7 @@ sign_and_send_pubkey(Authctxt *authctxt, Identity *id)
991 int have_sig = 1; 991 int have_sig = 1;
992 char *fp; 992 char *fp;
993 993
994 fp = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX); 994 fp = key_fingerprint(id->key, options.fingerprint_hash, SSH_FP_DEFAULT);
995 debug3("sign_and_send_pubkey: %s %s", key_type(id->key), fp); 995 debug3("sign_and_send_pubkey: %s %s", key_type(id->key), fp);
996 free(fp); 996 free(fp);
997 997