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, 1 deletions

diff --git a/readconf.h b/readconf.h
index 49858bff3..11a7332c2 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.104 2014/12/04 02:24:32 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.105 2014/12/21 22:27:56 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -146,6 +146,8 @@ typedef struct {
 
         char    *revoked_host_keys;
 
+        int     fingerprint_hash;
+
         char    *ignored_unknown; /* Pattern list of unknown tokens to ignore */
 }       Options;