[src/trunk]: src/crypto/external/bsd/openssl.old/dist/crypto use OPENSSL_API_...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3ff1561f43fa
branches:  trunk
changeset: 359304:3ff1561f43fa
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Feb 06 19:58:29 2018 +0000

description:
use OPENSSL_API_COMPAT instead of hacking the version

diffstat:

 crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h         |  2 +-
 crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h       |  2 +-
 crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h   |  2 +-
 crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h       |  2 +-
 crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h     |  2 +-
 crypto/external/bsd/openssl.old/dist/crypto/opensslv.h      |  2 --
 crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h       |  2 +-
 crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h |  2 +-
 8 files changed, 7 insertions(+), 9 deletions(-)

diffs (97 lines):

diff -r a94266978431 -r 3ff1561f43fa crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h
--- a/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h       Tue Feb 06 19:57:57 2018 +0000
+++ b/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h       Tue Feb 06 19:58:29 2018 +0000
@@ -387,7 +387,7 @@
 # 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 -r a94266978431 -r 3ff1561f43fa crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h
--- a/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h     Tue Feb 06 19:57:57 2018 +0000
+++ b/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h     Tue Feb 06 19:58:29 2018 +0000
@@ -326,7 +326,7 @@
 # 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 -r a94266978431 -r 3ff1561f43fa crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h
--- a/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h Tue Feb 06 19:57:57 2018 +0000
+++ b/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h Tue Feb 06 19:58:29 2018 +0000
@@ -329,7 +329,7 @@
 # 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 -r a94266978431 -r 3ff1561f43fa crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h
--- a/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h     Tue Feb 06 19:57:57 2018 +0000
+++ b/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h     Tue Feb 06 19:58:29 2018 +0000
@@ -1533,7 +1533,7 @@
 # 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 -r a94266978431 -r 3ff1561f43fa crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h
--- a/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h   Tue Feb 06 19:57:57 2018 +0000
+++ b/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h   Tue Feb 06 19:58:29 2018 +0000
@@ -102,7 +102,7 @@
 
 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 -r a94266978431 -r 3ff1561f43fa crypto/external/bsd/openssl.old/dist/crypto/opensslv.h
--- a/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h    Tue Feb 06 19:57:57 2018 +0000
+++ b/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h    Tue Feb 06 19:58:29 2018 +0000
@@ -30,9 +30,7 @@
  * (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 -r a94266978431 -r 3ff1561f43fa crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h
--- a/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h     Tue Feb 06 19:57:57 2018 +0000
+++ b/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h     Tue Feb 06 19:58:29 2018 +0000
@@ -660,7 +660,7 @@
 
 #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 -r a94266978431 -r 3ff1561f43fa crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h
--- a/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h       Tue Feb 06 19:57:57 2018 +0000
+++ b/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h       Tue Feb 06 19:58:29 2018 +0000
@@ -1049,7 +1049,7 @@
 # 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)
 {