summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-06-08 13:18:39 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-11-16 09:57:17 +0100
commitd37dfb9357e935c8701e80429f5f7c416fb946a3 (patch)
tree5471431270cf1c534718d3ce837666d3df2e4f72
parentf8e0edeaa0f2b860bdbbf0aafb4492533043d650 (diff)
downloadlinux-stable-d37dfb9357e935c8701e80429f5f7c416fb946a3.tar.gz
linux-stable-d37dfb9357e935c8701e80429f5f7c416fb946a3.tar.bz2
linux-stable-d37dfb9357e935c8701e80429f5f7c416fb946a3.zip
cert host tools: Stop complaining about deprecated OpenSSL functions
commit 6bfb56e93bcef41859c2d5ab234ffd80b691be35 upstream. OpenSSL 3.0 deprecated the OpenSSL's ENGINE API. That is as may be, but the kernel build host tools still use it. Disable the warning about deprecated declarations until somebody who cares fixes it. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--scripts/extract-cert.c7
-rw-r--r--scripts/sign-file.c7
2 files changed, 14 insertions, 0 deletions
diff --git a/scripts/extract-cert.c b/scripts/extract-cert.c
index 3bc48c726c41..79ecbbfe37cd 100644
--- a/scripts/extract-cert.c
+++ b/scripts/extract-cert.c
@@ -23,6 +23,13 @@
#include <openssl/err.h>
#include <openssl/engine.h>
+/*
+ * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API.
+ *
+ * Remove this if/when that API is no longer used
+ */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
#define PKEY_ID_PKCS7 2
static __attribute__((noreturn))
diff --git a/scripts/sign-file.c b/scripts/sign-file.c
index fbd34b8e8f57..7434e9ea926e 100644
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c
@@ -30,6 +30,13 @@
#include <openssl/engine.h>
/*
+ * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API.
+ *
+ * Remove this if/when that API is no longer used
+ */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+/*
* Use CMS if we have openssl-1.0.0 or newer available - otherwise we have to
* assume that it's not available and its header file is missing and that we
* should use PKCS#7 instead. Switching to the older PKCS#7 format restricts