diff options
| author |   bcook <bcook@openbsd.org> | 2015-12-07 03:30:09 +0000 |
|---|---|---|
| committer | bcook <bcook@openbsd.org> | 2015-12-07 03:30:09 +0000 |
| commit | ce09e14431c01874ca802b13cc32ae948bb26702 (patch) | |
| tree | 975edd3bb815f1d7593bd44fe753c6904cfaf9d3 | |
| parent | enable snooping on Intel 100 Series HDA (diff) | |
| download | wireguard-openbsd-ce09e14431c01874ca802b13cc32ae948bb26702.tar.xz wireguard-openbsd-ce09e14431c01874ca802b13cc32ae948bb26702.zip | |
Remove SHA0 check, as we did in v1.21 of sha.h.
This enables ENGINE_get_digest to work again with SHA1.
noted by NARUSE, Yui, @nurse from github
| -rw-r--r-- | lib/libcrypto/engine/eng_openssl.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/engine/eng_openssl.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libcrypto/engine/eng_openssl.c b/lib/libcrypto/engine/eng_openssl.c index a3baed38052..6154aebdee7 100644 --- a/lib/libcrypto/engine/eng_openssl.c +++ b/lib/libcrypto/engine/eng_openssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_openssl.c,v 1.11 2015/08/28 01:06:09 beck Exp $ */ +/* $OpenBSD: eng_openssl.c,v 1.12 2015/12/07 03:30:09 bcook Exp $ */ /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL * project 2000. */ @@ -105,7 +105,7 @@ #undef TEST_ENG_OPENSSL_RC4_P_INIT #undef TEST_ENG_OPENSSL_RC4_P_CIPHER #endif -#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA0) || defined(OPENSSL_NO_SHA1) +#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA1) #undef TEST_ENG_OPENSSL_SHA #undef TEST_ENG_OPENSSL_SHA_OTHERS #undef TEST_ENG_OPENSSL_SHA_P_INIT diff --git a/lib/libssl/src/crypto/engine/eng_openssl.c b/lib/libssl/src/crypto/engine/eng_openssl.c index a3baed38052..6154aebdee7 100644 --- a/lib/libssl/src/crypto/engine/eng_openssl.c +++ b/lib/libssl/src/crypto/engine/eng_openssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_openssl.c,v 1.11 2015/08/28 01:06:09 beck Exp $ */ +/* $OpenBSD: eng_openssl.c,v 1.12 2015/12/07 03:30:09 bcook Exp $ */ /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL * project 2000. */ @@ -105,7 +105,7 @@ #undef TEST_ENG_OPENSSL_RC4_P_INIT #undef TEST_ENG_OPENSSL_RC4_P_CIPHER #endif -#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA0) || defined(OPENSSL_NO_SHA1) +#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA1) #undef TEST_ENG_OPENSSL_SHA #undef TEST_ENG_OPENSSL_SHA_OTHERS #undef TEST_ENG_OPENSSL_SHA_P_INIT |