mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove some OPENSSL_NO_SHA that snuck in

Browse Source 
Commit d064e6ab52 removed all the
OPENSSL_NO_SHA guards, but commit
a50ad1daaa 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>
This commit is contained in:
Benjamin Kaduk 2016-04-20 13:58:25 -05:00 committed by Rich Salz
parent dc3c5067cd
commit 1e8ead8688
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/progs.h
View File

@ -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

5
apps/progs.pl
View File

@ -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",
);