diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index e3515315..e068c421 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -120,10 +120,6 @@ if (OPENSSL_FOUND) set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARIES}) check_function_exists(CRYPTO_ctr128_encrypt HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT) - set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARIES}) - check_function_exists(EVP_CIPHER_CTX_new HAVE_OPENSSL_EVP_CIPHER_CTX_NEW) - set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARIES}) check_function_exists(EVP_KDF_CTX_new_id HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID) diff --git a/config.h.cmake b/config.h.cmake index e708dd0b..b7a1c954 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -129,9 +129,6 @@ /* Define to 1 if you have the `CRYPTO_ctr128_encrypt' function. */ #cmakedefine HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT 1 -/* Define to 1 if you have the `EVP_CIPHER_CTX_new' function. */ -#cmakedefine HAVE_OPENSSL_EVP_CIPHER_CTX_NEW 1 - /* Define to 1 if you have the `EVP_KDF_CTX_new_id' function. */ #cmakedefine HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID 1 diff --git a/src/libcrypto-compat.c b/src/libcrypto-compat.c index 8700a9b5..33b8dffd 100644 --- a/src/libcrypto-compat.c +++ b/src/libcrypto-compat.c @@ -236,23 +236,6 @@ void EVP_MD_CTX_free(EVP_MD_CTX *ctx) OPENSSL_free(ctx); } -#ifndef HAVE_OPENSSL_EVP_CIPHER_CTX_NEW -EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void) -{ - EVP_CIPHER_CTX *ctx = OPENSSL_malloc(sizeof(EVP_CIPHER_CTX)); - if (ctx != NULL) { - EVP_CIPHER_CTX_init(ctx); - } - return ctx; -} - -void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) -{ - EVP_CIPHER_CTX_cleanup(ctx); - OPENSSL_free(ctx); -} -#endif - void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) {