upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 01:12:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '632-evp_cipher_ctx_free-and-evp_cipher_ctx_new-exist-in-openssl-1-0-1' into 'master'

Browse source 
Resolve "EVP_CIPHER_CTX_free and EVP_CIPHER_CTX_new exist in OpenSSL 1.0.1"

Closes #632

See merge request isc-projects/bind9!915
This commit is contained in:
Mark Andrews 2018-10-25 20:30:52 -04:00
commit 7e2026a50b
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/isc/openssl_shim.c
View file

@ -32,6 +32,7 @@ OPENSSL_zalloc(size_t size)
return (ret);
}
#if OPENSSL_VERSION_NUMBER < 0x10001000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX *
EVP_CIPHER_CTX_new(void)
{
@ -47,6 +48,7 @@ EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
OPENSSL_free(ctx);
}
}
#endif
EVP_MD_CTX *
EVP_MD_CTX_new(void)

2
lib/isc/openssl_shim.h
View file

@ -21,8 +21,10 @@
#include <openssl/hmac.h>
void *OPENSSL_zalloc(size_t size);
#if OPENSSL_VERSION_NUMBER < 0x10001000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx);
#endif
EVP_MD_CTX *EVP_MD_CTX_new(void);
void EVP_MD_CTX_free(EVP_MD_CTX *ctx);
int EVP_MD_CTX_reset(EVP_MD_CTX *ctx);