[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  2a4af9478d0be41ea8c782c3c7adda00f7e20fbb (commit)
      from  2863d5f3cd96d66cadeef19b8b4111de55ce78de (commit)


- Log -----------------------------------------------------------------
commit 2a4af9478d0be41ea8c782c3c7adda00f7e20fbb
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Jan 24 16:46:54 2015 +0100

    Configure: addendum to OPENSSL_NO_[RMD160|RIPEMD] harmonization.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configure |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Configure b/Configure
index c726478..ca48b52 100755
--- a/Configure
+++ b/Configure
@@ -1083,6 +1083,8 @@ foreach (sort (keys %disabled))
 			}
 		else
 			{
+			($ALGO,$algo) = ("RMD160","rmd160") if ($algo eq "ripemd");
+
 			$openssl_algorithm_defines .= "#define OPENSSL_NO_$ALGO\n";
 			print " OPENSSL_NO_$ALGO";
 
@@ -1093,6 +1095,8 @@ foreach (sort (keys %disabled))
 				push @skip, $algo;
 				# fix-up crypto/directory name(s)
 				@skip[$#skip]="whrlpool" if $algo eq "whirlpool";
+				@skip[$#skip]="ripemd" if $algo eq "rmd160";
+
 				print " (skip dir)";
 
 				$depflags .= " -DOPENSSL_NO_$ALGO";