From 1e8ead8688f0afb5584264c29907f089cc1f6a8a Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Wed, 20 Apr 2016 13:58:25 -0500 Subject: Remove some OPENSSL_NO_SHA that snuck in Commit d064e6ab52ac8e7b80b2a5d11b31bca583b769c7 removed all the OPENSSL_NO_SHA guards, but commit a50ad1daaa68c109ea1a14225a7aba8660526101 regenerated some due to the sha entries in the %md_disabler table in apps/progs.pl. Update %md_disabler to reflect that sha is not disableable, and remove OPENSSL_NO_SHA for good. Reviewed-by: Richard Levitte Reviewed-by: Matt Caswell Reviewed-by: Rich Salz --- apps/progs.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'apps/progs.h') diff --git a/apps/progs.h b/apps/progs.h index 346d58394e..9cc2f2b088 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -220,21 +220,11 @@ static FUNCTION functions[] = { #ifndef OPENSSL_NO_GOST { FT_md, "gost", dgst_main}, #endif -#ifndef OPENSSL_NO_SHA { FT_md, "sha1", dgst_main}, -#endif -#ifndef OPENSSL_NO_SHA { FT_md, "sha224", dgst_main}, -#endif -#ifndef OPENSSL_NO_SHA { FT_md, "sha256", dgst_main}, -#endif -#ifndef OPENSSL_NO_SHA { FT_md, "sha384", dgst_main}, -#endif -#ifndef OPENSSL_NO_SHA { FT_md, "sha512", dgst_main}, -#endif #ifndef OPENSSL_NO_MDC2 { FT_md, "mdc2", dgst_main}, #endif -- cgit v1.2.3