Module Name: src
Committed By: christos
Date: Mon Feb 5 11:52:33 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
Log Message:
protect the inline functions with the OPENSSL_VERSION_NUMBER
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.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.1.1.1 src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h:1.2
--- src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h:1.1.1.1 Sat Feb 3 17:43:41 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h Mon Feb 5 06:52:32 2018
@@ -30,7 +30,9 @@ 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.2 src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h:1.3
--- src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h:1.2 Sun Feb 4 19:11:33 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h Mon Feb 5 06:52:33 2018
@@ -387,6 +387,7 @@ void ERR_load_DH_strings(void);
# define DH_R_PEER_KEY_ERROR 113
# define DH_R_SHARED_INFO_ERROR 114
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10100000L
static inline void
DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key)
{
@@ -425,6 +426,7 @@ DH_set_length(DH *dh, long length)
{
dh->length = length;
}
+#endif
#ifdef __cplusplus
}
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.2 src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h:1.3
--- src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h:1.2 Sun Feb 4 19:11:33 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h Mon Feb 5 06:52:33 2018
@@ -326,6 +326,7 @@ void ERR_load_DSA_strings(void);
# define DSA_R_PARAMETER_ENCODING_ERROR 105
# define DSA_R_Q_NOT_PRIME 113
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10100000L
static inline void
DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **r, const BIGNUM **s)
{
@@ -400,6 +401,7 @@ static inline int DSA_set0_key(DSA *d, B
return 1;
}
+#endif
#ifdef __cplusplus
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.2 src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h:1.3
--- src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h:1.2 Sun Feb 4 19:11:33 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h Mon Feb 5 06:52:33 2018
@@ -329,6 +329,8 @@ void ERR_load_ECDSA_strings(void);
# define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED 104
# define ECDSA_R_SIGNATURE_MALLOC_FAILED 105
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10100000L
+
static inline void
ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **r, const BIGNUM **s)
{
@@ -351,6 +353,9 @@ ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r
}
return 1;
}
+
+#endif
+
#ifdef __cplusplus
}
#endif
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.2 src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h:1.3
--- src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h:1.2 Sun Feb 4 19:11:33 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h Mon Feb 5 06:52:33 2018
@@ -1533,6 +1533,8 @@ void ERR_load_EVP_strings(void);
# define EVP_R_WRONG_FINAL_BLOCK_LENGTH 109
# define EVP_R_WRONG_PUBLIC_KEY_TYPE 110
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10100000L
+
static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
{
EVP_MD_CTX *ctx = malloc(sizeof(*ctx));
@@ -1557,6 +1559,8 @@ static inline RSA *EVP_PKEY_get0_RSA(EVP
return pkey->pkey.rsa;
}
+#endif
+
# ifdef __cplusplus
}
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.2 src/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h:1.3
--- src/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h:1.2 Sun Feb 4 19:42:46 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h Mon Feb 5 06:52:33 2018
@@ -102,6 +102,7 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_C
void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10100000L
static inline HMAC_CTX *HMAC_CTX_new(void)
{
HMAC_CTX *ctx = malloc(sizeof(*ctx));
@@ -118,6 +119,7 @@ static inline void HMAC_CTX_free(HMAC_CT
HMAC_CTX_cleanup(ctx);
free(ctx);
}
+#endif
#ifdef __cplusplus
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.2 src/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h:1.3
--- src/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h:1.2 Sun Feb 4 19:11:33 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h Mon Feb 5 06:52:33 2018
@@ -660,6 +660,8 @@ void ERR_load_RSA_strings(void);
#include <string.h>
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10100000L
+
static inline RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth)
{
RSA_METHOD *ret = malloc(sizeof(*meth));
@@ -832,6 +834,8 @@ static inline void RSA_get0_crt_params(c
*iqmp = r->iqmp;
}
+#endif
+
#ifdef __cplusplus
}
