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

diff --git a/digest-openssl.c b/digest-openssl.c
index 02b170341..bb58ff226 100644
--- a/digest-openssl.c
+++ b/digest-openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: digest-openssl.c,v 1.4 2014/07/03 03:26:43 djm Exp $ */
+/* $OpenBSD: digest-openssl.c,v 1.5 2014/12/21 22:27:56 djm Exp $ */
 /*
  * Copyright (c) 2013 Damien Miller <djm@mindrot.org>
  *
@@ -74,6 +74,26 @@ ssh_digest_by_alg(int alg)
         return &(digests[alg]);
 }
 
+int
+ssh_digest_alg_by_name(const char *name)
+{
+        int alg;
+
+        for (alg = 0; digests[alg].id != -1; alg++) {
+                if (strcasecmp(name, digests[alg].name) == 0)
+                        return digests[alg].id;
+        }
+        return -1;
+}
+
+const char *
+ssh_digest_alg_name(int alg)
+{
+        const struct ssh_digest *digest = ssh_digest_by_alg(alg);
+
+        return digest == NULL ? NULL : digest->name;
+}
+
 size_t
 ssh_digest_bytes(int alg)
 {