From ec27a807d9481d07c0fc601019b915ed97c3a054 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 7 Dec 2015 03:30:10 +0000 Subject: 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 --- lib/libcrypto/engine/eng_openssl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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 -- cgit v1.2.3