| Message ID | CAJ2ouayJe146Gpu18T3a=-aMXB7FhG9V0dDpmrn0sgWSsaM6XQ@mail.gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v3] Fix building against OpenSSL 3 | expand |
On Mon, Jan 15, 2024 at 06:57:52PM +0100, Jouke Witteveen wrote: > Smartcard support uses the ENGINE API of OpenSSL, which has been > deprecated as of OpenSSL 3. Rather than migrating the code to the new API > or pretending that we do not support OpenSSL 3, accept that we use > deprecated functionality. Thanks, applied.
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c index 5aff0d161..17283f998 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c @@ -19,14 +19,16 @@ #endif #endif +#ifndef OPENSSL_NO_ENGINE +/* OpenSSL 3.0 has moved away from the engine API */ +#define OPENSSL_SUPPRESS_DEPRECATED +#include <openssl/engine.h> +#endif /* OPENSSL_NO_ENGINE */ #include <openssl/ssl.h> #include <openssl/err.h> #include <openssl/opensslv.h> #include <openssl/pkcs12.h> #include <openssl/x509v3.h> -#ifndef OPENSSL_NO_ENGINE -#include <openssl/engine.h> -#endif /* OPENSSL_NO_ENGINE */ #if OPENSSL_VERSION_NUMBER >= 0x30000000L #include <openssl/core_names.h> #include <openssl/decoder.h>
Smartcard support uses the ENGINE API of OpenSSL, which has been deprecated as of OpenSSL 3. Rather than migrating the code to the new API or pretending that we do not support OpenSSL 3, accept that we use deprecated functionality. Signed-off-by: Jouke Witteveen <j.witteveen@gmail.com> --- Thanks, Jouni! src/crypto/tls_openssl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)