apps/progs.pl: more consistent output for digests

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte
2016-03-18 20:01:58 +01:00
parent 96bea0002b
commit 03f0312936
2 changed files with 11 additions and 4 deletions

View File

@@ -227,6 +227,8 @@ static FUNCTION functions[] = {
#endif
#ifndef OPENSSL_NO_BLAKE2
{ FT_md, "blake2b512", dgst_main},
#endif
#ifndef OPENSSL_NO_BLAKE2
{ FT_md, "blake2s256", dgst_main},
#endif
#ifndef OPENSSL_NO_AES

View File

@@ -84,11 +84,16 @@ foreach (
"md2", "md4", "md5",
"md_ghost94",
"sha1", "sha224", "sha256", "sha384", "sha512",
"mdc2", "rmd160", "blake2b", "blake2s"
"mdc2", "rmd160", "blake2b512", "blake2s256"
) {
printf "#ifndef OPENSSL_NO_".uc($_)."\n" if ! /sha/;
printf " { FT_md, \"".$_."\", dgst_main},\n";
printf "#endif\n" if ! /sha/;
my $str = " { FT_md, \"".$_."\", dgst_main},\n";
if (/blake2/) {
print "#ifndef OPENSSL_NO_BLAKE2\n${str}#endif\n";
} elsif (/sha/) {
print "${str}";
} else {
print "#ifndef OPENSSL_NO_".uc($_)."\n${str}#endif\n";
}
}
foreach (