diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | key.c | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -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 | ||
48 | 20120628 | 50 | 20120628 |
49 | - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null | 51 | - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null |
@@ -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); |