Commit 1aca3618 authored by Matt Caswell's avatar Matt Caswell
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
parent cd359b25

crypto/err/err.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

}

include/openssl/bn.h

+1 −1
Original line number Diff line number Diff line
@@ -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

include/openssl/idea.h

+1 −1
Original line number Diff line number Diff line
@@ -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

include/openssl/x509v3.h

+1 −1
Original line number Diff line number Diff line
@@ -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