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@openssl.org>

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 9b679d9b48618b66cf57b4a39d91c5303303d4cf..836fac4260cb230e31d215d1149ad8c25ff3b119 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -632,7 +632,7 @@ void err_delete_thread_state(void)
     ERR_STATE_free(state);
 }
 
     ERR_STATE_free(state);
 }
 

-#if OPENSSL_API_COMPAT < 0x10000000L
+#if OPENSSL_API_COMPAT < 0x10100000L

 void ERR_remove_thread_state(void *dummy)
 {
 }
 void ERR_remove_thread_state(void *dummy)
 {
 }

diff --git a/include/openssl/bn.h b/include/openssl/bn.h
index e0f656a67b3409f95e648b1286633201acb92765..82552b6e84c880dc81104f0f0fc4cc9f2b43f1a7 100644 (file)
--- 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);
 
 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
 #  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 d527675614f8b0697137a084ee35d0fce3170c0d..4334f3ea71a67df340b81e1566488b93cff887c6 100644 (file)
--- 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);
 
                         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
 #  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 36d11a77762ab0847baa419d78f931f343c881d9..29b7194f265e57ab1ced26345f564228c23627a7 100644 (file)
--- 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);
 
 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
 /* 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