[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  71627423e57882a038e65993c948b2ec78c837a1 (commit)
      from  0069806128a24dd25908ee3dbb271cda3cc92bda (commit)


- Log -----------------------------------------------------------------
commit 71627423e57882a038e65993c948b2ec78c837a1
Author: Mat <mberchtold at gmail.com>
Date:   Fri Mar 11 04:52:32 2016 +0100

    Fix no-rmd160 classic Windows build
    
    no-ripemd was unified a while ago but the change was not done in mk1mf.pl. This commit changes the no-ripemd string to no-rmd160 which fixes the no-rmd160 classic build.
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 util/mk1mf.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index d1aac5b..209113f 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -134,7 +134,7 @@ foreach (@ARGV)
 		print STDERR <<"EOF";
 and [options] can be one of
 	no-md2 no-md4 no-md5 no-sha no-mdc2	- Skip this digest
-	no-ripemd
+	no-rmd160
 	no-rc2 no-rc4 no-rc5 no-idea no-des     - Skip this symetric cipher
 	no-bf no-cast no-aes no-camellia no-seed
 	no-rsa no-dsa no-dh			- Skip this public key cipher
@@ -1377,7 +1377,7 @@ sub read_options
 		"no-md2" => \$no_md2,
 		"no-md4" => \$no_md4,
 		"no-md5" => \$no_md5,
-		"no-ripemd" => \$no_ripemd,
+		"no-rmd160" => \$no_ripemd,
 		"no-mdc2" => \$no_mdc2,
 		"no-whirlpool" => \$no_whirlpool,
 		"no-patents" =>