diff options
| author | christos <christos@NetBSD.org> | 2018-02-06 19:58:29 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2018-02-06 19:58:29 +0000 |
| commit | e4b4ed697dabbdcc5ef78fd2c91aefcf6743750f (patch) | |
| tree | 91ab18c15819d5ee8417354b39dcdb4856f4426f | |
| parent | c00d73d927aa98d720af7ace51e41c99b3bb04c6 (diff) | |
use OPENSSL_API_COMPAT instead of hacking the version
8 files changed, 7 insertions, 9 deletions
diff --git a/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h b/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h index 32e682b4214..ce90f49720c 100644 --- a/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h +++ b/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h @@ -387,7 +387,7 @@ void ERR_load_DH_strings(void); # define DH_R_PEER_KEY_ERROR 113 # define DH_R_SHARED_INFO_ERROR 114 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_API_COMPAT >= 0x10100000L static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) { diff --git a/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h b/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h index d8433dd3272..7ace03dfdff 100644 --- a/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h +++ b/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h @@ -326,7 +326,7 @@ void ERR_load_DSA_strings(void); # define DSA_R_PARAMETER_ENCODING_ERROR 105 # define DSA_R_Q_NOT_PRIME 113 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_API_COMPAT >= 0x10100000L static inline void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **r, const BIGNUM **s) { diff --git a/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h b/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h index 330694fdf34..dbd8f20aaea 100644 --- a/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h +++ b/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h @@ -329,7 +329,7 @@ void ERR_load_ECDSA_strings(void); # define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED 104 # define ECDSA_R_SIGNATURE_MALLOC_FAILED 105 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_API_COMPAT >= 0x10100000L static inline void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **r, const BIGNUM **s) diff --git a/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h b/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h index ed4bd881c8f..124b697eab7 100644 --- a/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h +++ b/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h @@ -1533,7 +1533,7 @@ void ERR_load_EVP_strings(void); # define EVP_R_WRONG_FINAL_BLOCK_LENGTH 109 # define EVP_R_WRONG_PUBLIC_KEY_TYPE 110 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_API_COMPAT >= 0x10100000L static inline EVP_MD_CTX *EVP_MD_CTX_new(void) { diff --git a/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h b/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h index a8378ad04d6..6341dfffcd6 100644 --- a/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h +++ b/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h @@ -102,7 +102,7 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx); void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags); -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_API_COMPAT >= 0x10100000L static inline HMAC_CTX *HMAC_CTX_new(void) { HMAC_CTX *ctx = calloc(1, sizeof(*ctx)); diff --git a/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h b/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h index 7a4244ecd6e..645dd0793f3 100644 --- a/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h +++ b/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h @@ -30,9 +30,7 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# ifndef OPENSSL_VERSION_NUMBER # define OPENSSL_VERSION_NUMBER 0x100020bfL -# endif # ifdef OPENSSL_FIPS # define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k-fips 26 Jan 2017" # else diff --git a/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h b/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h index 85c5489885b..85b39f5c0f0 100644 --- a/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h +++ b/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h @@ -660,7 +660,7 @@ void ERR_load_RSA_strings(void); #include <string.h> -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_API_COMPAT >= 0x10100000L static inline RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth) { diff --git a/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h b/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h index edb61972cef..f9eb1ef0774 100644 --- a/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h +++ b/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h @@ -1049,7 +1049,7 @@ void ERR_load_X509V3_strings(void); # define X509V3_R_UNSUPPORTED_TYPE 167 # define X509V3_R_USER_TOO_LONG 132 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_API_COMPAT >= 0x10100000L static inline uint32_t X509_get_extended_key_usage(X509 *x) { |
