From: Benjamin Kaduk <bkaduk@akamai.com>
Date: Wed, 20 Apr 2016 18:58:25 +0000 (-0500)
Subject: Remove some OPENSSL_NO_SHA that snuck in
X-Git-Tag: OpenSSL_1_1_0-pre6~1058
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=1e8ead8688f0afb5584264c29907f089cc1f6a8a;hp=dc3c5067cd90f3f2159e5d53c57b92730c687d7e;ds=sidebyside

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 <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
---

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
diff --git a/apps/progs.pl b/apps/progs.pl
index 78e13e0d3f..e43d436665 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -93,11 +93,6 @@ foreach my $cmd (@ARGV) {
 }
 
 my %md_disabler = (
-    sha1       => "sha",
-    sha224     => "sha",
-    sha256     => "sha",
-    sha384     => "sha",
-    sha512     => "sha",
     blake2b512 => "blake2",
     blake2s256 => "blake2",
     );