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@

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 @@
-/* $OpenBSD: sshconnect2.c,v 1.211 2014/12/11 05:13:28 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.212 2014/12/21 22:27:56 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -582,7 +582,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)
                     key->type, pktype);
                 goto done;
         }
-        fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
+        fp = key_fingerprint(key, options.fingerprint_hash, SSH_FP_DEFAULT);
         debug2("input_userauth_pk_ok: fp %s", fp);
         free(fp);
 
@@ -991,7 +991,7 @@ sign_and_send_pubkey(Authctxt *authctxt, Identity *id)
         int have_sig = 1;
         char *fp;
 
-        fp = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX);
+        fp = key_fingerprint(id->key, options.fingerprint_hash, SSH_FP_DEFAULT);
         debug3("sign_and_send_pubkey: %s %s", key_type(id->key), fp);
         free(fp);