summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--key.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 37f9f4866..3754146b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,8 @@
44 from draft6 of the spec and will not be in the RFC when published. Patch 44 from draft6 of the spec and will not be in the RFC when published. Patch
45 from mdb at juniper net via bz#2023, ok markus. 45 from mdb at juniper net via bz#2023, ok markus.
46 - (dtucker) [myproposal.h] Remove trailing backslash to fix compile error. 46 - (dtucker) [myproposal.h] Remove trailing backslash to fix compile error.
47 - (dtucker) [key.c] ifdef out sha256 key types on platforms that don't have
48 the required functions in libcrypto.
47 49
4820120628 5020120628
49 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null 51 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
diff --git a/key.c b/key.c
index 8ef0b7e3c..7e9099703 100644
--- a/key.c
+++ b/key.c
@@ -342,9 +342,11 @@ key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length)
342 case SSH_FP_SHA1: 342 case SSH_FP_SHA1:
343 md = EVP_sha1(); 343 md = EVP_sha1();
344 break; 344 break;
345#ifdef HAVE_EVP_SHA256
345 case SSH_FP_SHA256: 346 case SSH_FP_SHA256:
346 md = EVP_sha256(); 347 md = EVP_sha256();
347 break; 348 break;
349#endif
348 default: 350 default:
349 fatal("key_fingerprint_raw: bad digest type %d", 351 fatal("key_fingerprint_raw: bad digest type %d",
350 dgst_type); 352 dgst_type);