Commit 1e8ead86 authored by Benjamin Kaduk's avatar Benjamin Kaduk Committed by Rich Salz
Browse files

Remove some OPENSSL_NO_SHA that snuck in 



Commit d064e6ab removed all the
OPENSSL_NO_SHA guards, but commit
a50ad1da 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: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent dc3c5067

apps/progs.h

+0 −10
Original line number Diff line number Diff line
@@ -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

apps/progs.pl

+0 −5
Original line number Diff line number Diff line
@@ -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",

    );