From: Richard Levitte <levitte@openssl.org>
Date: Fri, 18 Mar 2016 19:01:58 +0000 (+0100)
Subject: apps/progs.pl: more consistent output for digests
X-Git-Tag: OpenSSL_1_1_0-pre5~317
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=03f03129361683ee3c5bab5aa82d7060cdfc2bea;hp=96bea0002b44f1f490a798d6122d6b15d1fe6b09;ds=sidebyside

apps/progs.pl: more consistent output for digests

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/apps/progs.h b/apps/progs.h
index fff26392e4..a996353048 100644
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -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
diff --git a/apps/progs.pl b/apps/progs.pl
index f24b91bde8..b601fefb1b 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -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 (