af0e739346
openssl-devel-engine is now needed on rawhide to have engine header present. Make it enabled by default, but possible to disable built support for it easy way. https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine Resolves: RHEL-22408
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From b487bd340ae1b635ce5cffe76f748ddc97f301f7 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
|
|
Date: Sat, 3 Aug 2024 01:28:36 +0200
|
|
Subject: [PATCH] Remove unused <openssl/{hmac,engine}.h> headers from OpenSSL
|
|
shims
|
|
|
|
The <openssl/{hmac,engine}.h> headers were unused and including the
|
|
<openssl/engine.h> header might cause build failure when OpenSSL
|
|
doesn't have Engines support enabled.
|
|
|
|
See https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine
|
|
---
|
|
lib/isc/openssl_shim.c | 2 --
|
|
lib/isc/openssl_shim.h | 2 --
|
|
2 files changed, 4 deletions(-)
|
|
|
|
diff --git a/lib/isc/openssl_shim.c b/lib/isc/openssl_shim.c
|
|
index c39ba8c6827..02d0105eb9e 100644
|
|
--- a/lib/isc/openssl_shim.c
|
|
+++ b/lib/isc/openssl_shim.c
|
|
@@ -16,9 +16,7 @@
|
|
#include <string.h>
|
|
|
|
#include <openssl/crypto.h>
|
|
-#include <openssl/engine.h>
|
|
#include <openssl/evp.h>
|
|
-#include <openssl/hmac.h>
|
|
#include <openssl/opensslv.h>
|
|
#include <openssl/ssl.h>
|
|
|
|
diff --git a/lib/isc/openssl_shim.h b/lib/isc/openssl_shim.h
|
|
index b2916e20a90..95b2f08e231 100644
|
|
--- a/lib/isc/openssl_shim.h
|
|
+++ b/lib/isc/openssl_shim.h
|
|
@@ -14,9 +14,7 @@
|
|
#pragma once
|
|
|
|
#include <openssl/crypto.h>
|
|
-#include <openssl/engine.h>
|
|
#include <openssl/evp.h>
|
|
-#include <openssl/hmac.h>
|
|
#include <openssl/opensslv.h>
|
|
#include <openssl/ssl.h>
|
|
|
|
--
|
|
2.46.2
|
|
|