diff --git a/changes/ticket29026 b/changes/ticket29026 new file mode 100644 index 0000000000..1db873dfcf --- /dev/null +++ b/changes/ticket29026 @@ -0,0 +1,4 @@ + o Minor features (compilation): + - Compile correctly when OpenSSL is built with engine support + disabled, or with deprecated APIs disabled. Closes ticket + 29026. Patches from "Mangix". diff --git a/src/lib/crypt_ops/aes_openssl.c b/src/lib/crypt_ops/aes_openssl.c index 42ee924a8a..2f985d4512 100644 --- a/src/lib/crypt_ops/aes_openssl.c +++ b/src/lib/crypt_ops/aes_openssl.c @@ -43,7 +43,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "lib/log/log.h" #include "lib/ctime/di_ops.h" -#ifdef ANDROID +#ifdef OPENSSL_NO_ENGINE /* Android's OpenSSL seems to have removed all of its Engine support. */ #define DISABLE_ENGINES #endif diff --git a/src/lib/crypt_ops/crypto_hkdf.c b/src/lib/crypt_ops/crypto_hkdf.c index 6c82fa14f6..fd2e701651 100644 --- a/src/lib/crypt_ops/crypto_hkdf.c +++ b/src/lib/crypt_ops/crypto_hkdf.c @@ -18,6 +18,7 @@ #include "lib/log/util_bug.h" #ifdef ENABLE_OPENSSL +#include #include #if defined(HAVE_ERR_LOAD_KDF_STRINGS) diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.h b/src/lib/crypt_ops/crypto_openssl_mgt.h index 83fb44cadf..a3dd03aa04 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.h +++ b/src/lib/crypt_ops/crypto_openssl_mgt.h @@ -50,7 +50,7 @@ #define OPENSSL_V_SERIES(a,b,c) \ OPENSSL_VER((a),(b),(c),0,0) -#ifdef ANDROID +#ifdef OPENSSL_NO_ENGINE /* Android's OpenSSL seems to have removed all of its Engine support. */ #define DISABLE_ENGINES #endif diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 70b2965ca4..915fe0870d 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -45,6 +45,7 @@ #ifdef ENABLE_OPENSSL DISABLE_GCC_WARNING(redundant-decls) #include +#include ENABLE_GCC_WARNING(redundant-decls) #endif diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 2b977b0b9b..c9189b0dfc 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -31,6 +31,10 @@ #include #endif +#ifdef ENABLE_OPENSSL +#include +#endif + /** Return the number of bytes added by padding method padding. */ int diff --git a/src/lib/tls/x509_openssl.c b/src/lib/tls/x509_openssl.c index cf276c4240..a344279c22 100644 --- a/src/lib/tls/x509_openssl.c +++ b/src/lib/tls/x509_openssl.c @@ -31,7 +31,10 @@ DISABLE_GCC_WARNING(redundant-decls) #include #include #include +#include +#include #include +#include ENABLE_GCC_WARNING(redundant-decls)