提交 1e8ead86 编写于 作者: B Benjamin Kaduk 提交者: Rich Salz

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: NRichard Levitte <levitte@openssl.org>
Reviewed-by: NMatt Caswell <matt@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 dc3c5067
......@@ -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
......
......@@ -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",
);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册