[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  168c3b737e898ce97348dfe77ef176e39ae9da0d (commit)
      from  ac19ae151c5a740a77789f6476181e58f563f1e6 (commit)


- Log -----------------------------------------------------------------
commit 168c3b737e898ce97348dfe77ef176e39ae9da0d
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 21 15:04:08 2016 +0000

    Fix no-gost
    
    Configure had the wrong name for the no-gost option.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure     | 2 +-
 apps/progs.h  | 4 ++--
 apps/progs.pl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Configure b/Configure
index cf6f168..e1ede8c 100755
--- a/Configure
+++ b/Configure
@@ -267,6 +267,7 @@ my @disablables = (
     "engine",
     "err",
     "filenames",
+    "gost",
     "heartbeats",
     "hmac",
     "hw(-.+)?",
@@ -276,7 +277,6 @@ my @disablables = (
     "md4",
     "md5",
     "mdc2",
-    "md[-_]ghost94",
     "multiblock",
     "nextprotoneg",
     "ocb",
diff --git a/apps/progs.h b/apps/progs.h
index aa37d36..2711f2a 100644
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -218,8 +218,8 @@ static FUNCTION functions[] = {
 #ifndef OPENSSL_NO_MD5
     { FT_md, "md5", dgst_main},
 #endif
-#ifndef OPENSSL_NO_MD_GHOST94
-    { FT_md, "md_ghost94", dgst_main},
+#ifndef OPENSSL_NO_GOST
+    { FT_md, "gost", dgst_main},
 #endif
 #ifndef OPENSSL_NO_SHA
     { FT_md, "sha1", dgst_main},
diff --git a/apps/progs.pl b/apps/progs.pl
index 669e82b..ee6ce92 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -104,7 +104,7 @@ my %md_disabler = (
     );
 foreach my $cmd (
 	"md2", "md4", "md5",
-	"md_ghost94",
+	"gost",
 	"sha1", "sha224", "sha256", "sha384", "sha512",
 	"mdc2", "rmd160", "blake2b512", "blake2s256"
 ) {