summaryrefslogtreecommitdiffstats
path: root/apps/progs.h
diff options
context:
space:
mode:
authorBenjamin Kaduk <bkaduk@akamai.com>2016-04-20 13:58:25 -0500
committerRich Salz <rsalz@openssl.org>2016-04-26 08:32:10 -0400
commit1e8ead8688f0afb5584264c29907f089cc1f6a8a (patch)
treef19d90446a9d920566dd92d1f49dd73ef99d2633 /apps/progs.h
parentdc3c5067cd90f3f2159e5d53c57b92730c687d7e (diff)
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>
Diffstat (limited to 'apps/progs.h')
-rw-r--r--apps/progs.h10
1 files changed, 0 insertions, 10 deletions
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