[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  1aca3618ff86358c659c856b10e2270c3d4230d2 (commit)
      from  cd359b2564b77230a1201a200683dac622c923af (commit)


- Log -----------------------------------------------------------------
commit 1aca3618ff86358c659c856b10e2270c3d4230d2
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Jun 27 11:28:29 2016 +0100

    Fix some OPENSSL_API_COMPAT values
    
    There are 3 OPENSSL_API_COMPAT values that are incorrect in the header
    files, and one inconsistency between the header and the .c
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/err/err.c         | 2 +-
 include/openssl/bn.h     | 2 +-
 include/openssl/idea.h   | 2 +-
 include/openssl/x509v3.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 9b679d9..836fac4 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -632,7 +632,7 @@ void err_delete_thread_state(void)
     ERR_STATE_free(state);
 }
 
-#if OPENSSL_API_COMPAT < 0x10000000L
+#if OPENSSL_API_COMPAT < 0x10100000L
 void ERR_remove_thread_state(void *dummy)
 {
 }
diff --git a/include/openssl/bn.h b/include/openssl/bn.h
index e0f656a..82552b6 100644
--- a/include/openssl/bn.h
+++ b/include/openssl/bn.h
@@ -469,7 +469,7 @@ BIGNUM *BN_get_rfc3526_prime_4096(BIGNUM *bn);
 BIGNUM *BN_get_rfc3526_prime_6144(BIGNUM *bn);
 BIGNUM *BN_get_rfc3526_prime_8192(BIGNUM *bn);
 
-# if OPENSSL_API_COMPAT < 0x00101000L
+# if OPENSSL_API_COMPAT < 0x10100000L
 #  define get_rfc2409_prime_768 BN_get_rfc2409_prime_768
 #  define get_rfc2409_prime_1024 BN_get_rfc2409_prime_1024
 #  define get_rfc3526_prime_1536 BN_get_rfc3526_prime_1536
diff --git a/include/openssl/idea.h b/include/openssl/idea.h
index d527675..4334f3e 100644
--- a/include/openssl/idea.h
+++ b/include/openssl/idea.h
@@ -45,7 +45,7 @@ void IDEA_ofb64_encrypt(const unsigned char *in, unsigned char *out,
                         int *num);
 void IDEA_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
 
-# if OPENSSL_API_COMPAT < 0x00101000L
+# if OPENSSL_API_COMPAT < 0x10100000L
 #  define idea_options          IDEA_options
 #  define idea_ecb_encrypt      IDEA_ecb_encrypt
 #  define idea_set_encrypt_key  IDEA_set_encrypt_key
diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h
index 36d11a7..29b7194 100644
--- a/include/openssl/x509v3.h
+++ b/include/openssl/x509v3.h
@@ -631,7 +631,7 @@ X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
 int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
                     int crit, unsigned long flags);
 
-#if OPENSSL_API_COMPAT < 0x00101000L
+#if OPENSSL_API_COMPAT < 0x10100000L
 /* The new declarations are in crypto.h, but the old ones were here. */
 # define hex_to_string OPENSSL_buf2hexstr
 # define string_to_hex OPENSSL_hexstr2buf