diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2016-12-18 17:08:58 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-12-21 16:58:40 +0900 |
commit | 1d94bc3a20e1fb7160f265e106e5c3c4502430b3 (patch) | |
tree | 3a2f00a432a74782d8b8a870e89da93ad9a421e9 /ext | |
parent | fd2ea0c41d55f3d0b34edb1d25c673bc004f6913 (diff) | |
download | ruby-openssl-1d94bc3a20e1fb7160f265e106e5c3c4502430b3.tar.gz |
Rename functions in openssl_missing.c
To avoid symbol conflict that would occur if two versions of OpenSSL are
loaded at the same time.
Diffstat (limited to 'ext')
-rw-r--r-- | ext/openssl/openssl_missing.c | 22 | ||||
-rw-r--r-- | ext/openssl/openssl_missing.h | 27 |
2 files changed, 29 insertions, 20 deletions
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c index cc13b7a3..94ce85af 100644 --- a/ext/openssl/openssl_missing.c +++ b/ext/openssl/openssl_missing.c @@ -23,7 +23,7 @@ /* added in 0.9.8X */ #if !defined(HAVE_EVP_CIPHER_CTX_NEW) EVP_CIPHER_CTX * -EVP_CIPHER_CTX_new(void) +ossl_EVP_CIPHER_CTX_new(void) { EVP_CIPHER_CTX *ctx = OPENSSL_malloc(sizeof(EVP_CIPHER_CTX)); if (!ctx) @@ -35,7 +35,7 @@ EVP_CIPHER_CTX_new(void) #if !defined(HAVE_EVP_CIPHER_CTX_FREE) void -EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) +ossl_EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) { if (ctx) { EVP_CIPHER_CTX_cleanup(ctx); @@ -52,7 +52,7 @@ EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) * tested on 0.9.7d. */ int -EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in) +ossl_EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in) { memcpy(out, in, sizeof(EVP_CIPHER_CTX)); @@ -71,7 +71,7 @@ EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in) #if !defined(OPENSSL_NO_HMAC) #if !defined(HAVE_HMAC_CTX_COPY) int -HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in) +ossl_HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in) { if (!out || !in) return 0; @@ -112,7 +112,7 @@ static struct { }; int -EC_curve_nist2nid(const char *name) +ossl_EC_curve_nist2nid(const char *name) { size_t i; for (i = 0; i < (sizeof(nist_curves) / sizeof(nist_curves[0])); i++) { @@ -127,7 +127,7 @@ EC_curve_nist2nid(const char *name) /*** added in 1.1.0 ***/ #if !defined(HAVE_HMAC_CTX_NEW) HMAC_CTX * -HMAC_CTX_new(void) +ossl_HMAC_CTX_new(void) { HMAC_CTX *ctx = OPENSSL_malloc(sizeof(HMAC_CTX)); if (!ctx) @@ -139,7 +139,7 @@ HMAC_CTX_new(void) #if !defined(HAVE_HMAC_CTX_FREE) void -HMAC_CTX_free(HMAC_CTX *ctx) +ossl_HMAC_CTX_free(HMAC_CTX *ctx) { if (ctx) { HMAC_CTX_cleanup(ctx); @@ -150,8 +150,8 @@ HMAC_CTX_free(HMAC_CTX *ctx) #if !defined(HAVE_X509_CRL_GET0_SIGNATURE) void -X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, - const X509_ALGOR **palg) +ossl_X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, + const X509_ALGOR **palg) { if (psig != NULL) *psig = crl->signature; @@ -162,8 +162,8 @@ X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, #if !defined(HAVE_X509_REQ_GET0_SIGNATURE) void -X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig, - const X509_ALGOR **palg) +ossl_X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig, + const X509_ALGOR **palg) { if (psig != NULL) *psig = req->signature; diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index c7a367c3..1c289ebb 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -14,11 +14,13 @@ /* added in 0.9.8X */ #if !defined(HAVE_EVP_CIPHER_CTX_NEW) -EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void); +EVP_CIPHER_CTX *ossl_EVP_CIPHER_CTX_new(void); +# define EVP_CIPHER_CTX_new ossl_EVP_CIPHER_CTX_new #endif #if !defined(HAVE_EVP_CIPHER_CTX_FREE) -void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx); +void ossl_EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *); +# define EVP_CIPHER_CTX_free ossl_EVP_CIPHER_CTX_free #endif #if !defined(HAVE_SSL_CTX_CLEAR_OPTIONS) @@ -31,11 +33,13 @@ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx); #endif #if !defined(HAVE_EVP_CIPHER_CTX_COPY) -int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in); +int ossl_EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *, const EVP_CIPHER_CTX *); +# define EVP_CIPHER_CTX_copy ossl_EVP_CIPHER_CTX_copy #endif #if !defined(HAVE_HMAC_CTX_COPY) -int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in); +int ossl_HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in); +# define HMAC_CTX_copy ossl_HMAC_CTX_copy #endif #if !defined(HAVE_X509_STORE_CTX_GET0_CURRENT_CRL) @@ -58,7 +62,8 @@ int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in); /* added in 1.0.2 */ #if !defined(OPENSSL_NO_EC) #if !defined(HAVE_EC_CURVE_NIST2NID) -int EC_curve_nist2nid(const char *); +int ossl_EC_curve_nist2nid(const char *); +# define EC_curve_nist2nid ossl_EC_curve_nist2nid #endif #endif @@ -97,11 +102,13 @@ int EC_curve_nist2nid(const char *); #endif #if !defined(HAVE_HMAC_CTX_NEW) -HMAC_CTX *HMAC_CTX_new(void); +HMAC_CTX *ossl_HMAC_CTX_new(void); +# define HMAC_CTX_new ossl_HMAC_CTX_new #endif #if !defined(HAVE_HMAC_CTX_FREE) -void HMAC_CTX_free(HMAC_CTX *ctx); +void ossl_HMAC_CTX_free(HMAC_CTX *); +# define HMAC_CTX_free ossl_HMAC_CTX_free #endif #if !defined(HAVE_X509_STORE_GET_EX_DATA) @@ -118,11 +125,13 @@ void HMAC_CTX_free(HMAC_CTX *ctx); #endif #if !defined(HAVE_X509_CRL_GET0_SIGNATURE) -void X509_CRL_get0_signature(const X509_CRL *, const ASN1_BIT_STRING **, const X509_ALGOR **); +void ossl_X509_CRL_get0_signature(const X509_CRL *, const ASN1_BIT_STRING **, const X509_ALGOR **); +# define X509_CRL_get0_signature ossl_X509_CRL_get0_signature #endif #if !defined(HAVE_X509_REQ_GET0_SIGNATURE) -void X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **, const X509_ALGOR **); +void ossl_X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **, const X509_ALGOR **); +# define X509_REQ_get0_signature ossl_X509_REQ_get0_signature #endif #if !defined(HAVE_X509_REVOKED_GET0_SERIALNUMBER) |