[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  28dc5d1963c96db99e3fd48418552a5a0399480d (commit)
      from  dffe51091f412dcbc18f6641132f0b4f0def6bce (commit)


- Log -----------------------------------------------------------------
commit 28dc5d1963c96db99e3fd48418552a5a0399480d
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Oct 8 15:29:15 2015 +0100

    Fix no-ripemd on Windows
    
    mkdef.pl was getting confused by:
    
     # ifdef OPENSSL_NO_RMD160
     #  error RIPEMD is disabled.
     # endif
    
    Changing RIPEMD to RMD160 solves it. Fix suggested by Steve Henson.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 include/openssl/ripemd.h |  2 +-
 util/libeay.num          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/openssl/ripemd.h b/include/openssl/ripemd.h
index 9933078..97ad187 100644
--- a/include/openssl/ripemd.h
+++ b/include/openssl/ripemd.h
@@ -67,7 +67,7 @@ extern "C" {
 #endif
 
 # ifdef OPENSSL_NO_RMD160
-#  error RIPEMD is disabled.
+#  error RMD160 is disabled.
 # endif
 
 # define RIPEMD160_LONG unsigned int
diff --git a/util/libeay.num b/util/libeay.num
index 1b7bb47..661575f 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1016,11 +1016,11 @@ RSA_padding_check_none                  1038	EXIST::FUNCTION:RSA
 bn_add_words                            1039	NOEXIST::FUNCTION:
 d2i_Netscape_RSA_2                      1040	NOEXIST::FUNCTION:
 CRYPTO_get_ex_new_index                 1041	EXIST::FUNCTION:
-RIPEMD160_Init                          1042	EXIST::FUNCTION:
-RIPEMD160_Update                        1043	EXIST::FUNCTION:
-RIPEMD160_Final                         1044	EXIST::FUNCTION:
-RIPEMD160                               1045	EXIST::FUNCTION:
-RIPEMD160_Transform                     1046	EXIST::FUNCTION:
+RIPEMD160_Init                          1042	EXIST::FUNCTION:RMD160
+RIPEMD160_Update                        1043	EXIST::FUNCTION:RMD160
+RIPEMD160_Final                         1044	EXIST::FUNCTION:RMD160
+RIPEMD160                               1045	EXIST::FUNCTION:RMD160
+RIPEMD160_Transform                     1046	EXIST::FUNCTION:RMD160
 RC5_32_set_key                          1047	EXIST::FUNCTION:RC5
 RC5_32_ecb_encrypt                      1048	EXIST::FUNCTION:RC5
 RC5_32_encrypt                          1049	EXIST::FUNCTION:RC5