Module Name: src Committed By: christos Date: Tue Feb 6 19:58:31 UTC 2018
Modified Files: src/crypto/external/bsd/openssl.old/dist/crypto: opensslv.h src/crypto/external/bsd/openssl.old/dist/crypto/dh: dh.h src/crypto/external/bsd/openssl.old/dist/crypto/dsa: dsa.h src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa: ecdsa.h src/crypto/external/bsd/openssl.old/dist/crypto/evp: evp.h src/crypto/external/bsd/openssl.old/dist/crypto/hmac: hmac.h src/crypto/external/bsd/openssl.old/dist/crypto/rsa: rsa.h src/crypto/external/bsd/openssl.old/dist/crypto/x509v3: x509v3.h Log Message: use OPENSSL_API_COMPAT instead of hacking the version To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h diff -u src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h:1.2 src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h:1.3 --- src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h:1.2 Mon Feb 5 06:52:32 2018 +++ src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h Tue Feb 6 14:58:29 2018 @@ -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 Index: src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h diff -u src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h:1.6 src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h:1.7 --- src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h:1.6 Mon Feb 5 15:23:47 2018 +++ src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h Tue Feb 6 14:58:30 2018 @@ -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) { Index: src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h diff -u src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h:1.5 src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h:1.6 --- src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h:1.5 Mon Feb 5 15:27:06 2018 +++ src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h Tue Feb 6 14:58:30 2018 @@ -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) { Index: src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h diff -u src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h:1.4 src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h:1.5 --- src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h:1.4 Mon Feb 5 06:55:46 2018 +++ src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h Tue Feb 6 14:58:30 2018 @@ -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) Index: src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h diff -u src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h:1.4 src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h:1.5 --- src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h:1.4 Mon Feb 5 06:55:47 2018 +++ src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h Tue Feb 6 14:58:30 2018 @@ -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) { Index: src/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h diff -u src/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h:1.5 src/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h:1.6 --- src/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h:1.5 Mon Feb 5 16:12:14 2018 +++ src/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h Tue Feb 6 14:58:30 2018 @@ -102,7 +102,7 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_C 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)); Index: src/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h diff -u src/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h:1.5 src/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h:1.6 --- src/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h:1.5 Mon Feb 5 11:09:09 2018 +++ src/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h Tue Feb 6 14:58:30 2018 @@ -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) { Index: src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h diff -u src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h:1.2 src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h:1.3 --- src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h:1.2 Tue Feb 6 14:51:25 2018 +++ src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h Tue Feb 6 14:58:31 2018 @@ -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) {