diff options
| author | bcook <> | 2015-12-07 03:30:09 +0000 |
|---|---|---|
| committer | bcook <> | 2015-12-07 03:30:09 +0000 |
| commit | 863420516020a6af751001be45efa4a142f6d11b (patch) | |
| tree | 613f4bc895fc5368ac26e34e3d4327d53c64d3b9 /src | |
| parent | 4d26f018548e418a929ddebcd02db00c053fd576 (diff) | |
| download | openbsd-863420516020a6af751001be45efa4a142f6d11b.tar.gz openbsd-863420516020a6af751001be45efa4a142f6d11b.tar.bz2 openbsd-863420516020a6af751001be45efa4a142f6d11b.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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/engine/eng_openssl.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/engine/eng_openssl.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/engine/eng_openssl.c b/src/lib/libcrypto/engine/eng_openssl.c index a3baed3805..6154aebdee 100644 --- a/src/lib/libcrypto/engine/eng_openssl.c +++ b/src/lib/libcrypto/engine/eng_openssl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: eng_openssl.c,v 1.11 2015/08/28 01:06:09 beck Exp $ */ | 1 | /* $OpenBSD: eng_openssl.c,v 1.12 2015/12/07 03:30:09 bcook Exp $ */ |
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
| 3 | * project 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -105,7 +105,7 @@ | |||
| 105 | #undef TEST_ENG_OPENSSL_RC4_P_INIT | 105 | #undef TEST_ENG_OPENSSL_RC4_P_INIT |
| 106 | #undef TEST_ENG_OPENSSL_RC4_P_CIPHER | 106 | #undef TEST_ENG_OPENSSL_RC4_P_CIPHER |
| 107 | #endif | 107 | #endif |
| 108 | #if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA0) || defined(OPENSSL_NO_SHA1) | 108 | #if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA1) |
| 109 | #undef TEST_ENG_OPENSSL_SHA | 109 | #undef TEST_ENG_OPENSSL_SHA |
| 110 | #undef TEST_ENG_OPENSSL_SHA_OTHERS | 110 | #undef TEST_ENG_OPENSSL_SHA_OTHERS |
| 111 | #undef TEST_ENG_OPENSSL_SHA_P_INIT | 111 | #undef TEST_ENG_OPENSSL_SHA_P_INIT |
diff --git a/src/lib/libssl/src/crypto/engine/eng_openssl.c b/src/lib/libssl/src/crypto/engine/eng_openssl.c index a3baed3805..6154aebdee 100644 --- a/src/lib/libssl/src/crypto/engine/eng_openssl.c +++ b/src/lib/libssl/src/crypto/engine/eng_openssl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: eng_openssl.c,v 1.11 2015/08/28 01:06:09 beck Exp $ */ | 1 | /* $OpenBSD: eng_openssl.c,v 1.12 2015/12/07 03:30:09 bcook Exp $ */ |
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
| 3 | * project 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -105,7 +105,7 @@ | |||
| 105 | #undef TEST_ENG_OPENSSL_RC4_P_INIT | 105 | #undef TEST_ENG_OPENSSL_RC4_P_INIT |
| 106 | #undef TEST_ENG_OPENSSL_RC4_P_CIPHER | 106 | #undef TEST_ENG_OPENSSL_RC4_P_CIPHER |
| 107 | #endif | 107 | #endif |
| 108 | #if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA0) || defined(OPENSSL_NO_SHA1) | 108 | #if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA1) |
| 109 | #undef TEST_ENG_OPENSSL_SHA | 109 | #undef TEST_ENG_OPENSSL_SHA |
| 110 | #undef TEST_ENG_OPENSSL_SHA_OTHERS | 110 | #undef TEST_ENG_OPENSSL_SHA_OTHERS |
| 111 | #undef TEST_ENG_OPENSSL_SHA_P_INIT | 111 | #undef TEST_ENG_OPENSSL_SHA_P_INIT |