diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-04-20 13:26:54 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-04-27 23:07:41 +0900 |
| commit | 578935718790e8137dd3afd5c5b10c23bbeec51f (patch) | |
| tree | af41ed17b42c09555d61d7d0ac993a8b37601c76 /ext/openssl/openssl_missing.h | |
| parent | 13b33a2163ed52d4683f3901ed1f90ad93aa8474 (diff) | |
| download | ruby-578935718790e8137dd3afd5c5b10c23bbeec51f.tar.gz | |
ext/openssl: use HMAC_CTX_{new,free,reset} to allocate HMAC_CTX
HMAC_CTX is made opaque in OpenSSL 1.1.0
Diffstat (limited to 'ext/openssl/openssl_missing.h')
| -rw-r--r-- | ext/openssl/openssl_missing.h | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index 3e2c8159e4..7227c4611e 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -29,22 +29,16 @@ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx); #endif /*** added in 1.0.0 ***/ -#if !defined(HAVE_HMAC_CTX_COPY) -void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in); -#endif - #if !defined(HAVE_EVP_CIPHER_CTX_COPY) int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in); #endif -#if !defined(HAVE_X509_STORE_GET_EX_DATA) -void *X509_STORE_get_ex_data(X509_STORE *str, int idx); -#endif - -#if !defined(HAVE_X509_STORE_SET_EX_DATA) -int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data); +#if !defined(HAVE_HMAC_CTX_COPY) +void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in); #endif +/*** added in 1.0.1 ***/ +/*** added in 1.0.2 ***/ #if !defined(HAVE_CRYPTO_MEMCMP) int CRYPTO_memcmp(const volatile void * volatile in_a, const volatile void * volatile in_b, size_t len); #endif @@ -54,6 +48,27 @@ int CRYPTO_memcmp(const volatile void * volatile in_a, const volatile void * vol (d2i_of_void *)d2i_X509_REVOKED, (char *)(rev)) #endif +/*** added in 1.1.0 ***/ +#if !defined(HAVE_HMAC_CTX_NEW) +HMAC_CTX *HMAC_CTX_new(void); +#endif + +#if !defined(HAVE_HMAC_CTX_FREE) +void HMAC_CTX_free(HMAC_CTX *ctx); +#endif + +#if !defined(HAVE_HMAC_CTX_RESET) +int HMAC_CTX_reset(HMAC_CTX *ctx); +#endif + +#if !defined(HAVE_X509_STORE_GET_EX_DATA) +void *X509_STORE_get_ex_data(X509_STORE *str, int idx); +#endif + +#if !defined(HAVE_X509_STORE_SET_EX_DATA) +int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data); +#endif + #if defined(__cplusplus) } #endif |