Commit 171860c9 authored by Linus Torvalds's avatar Linus Torvalds Committed by sanglipeng
Browse files

cert host tools: Stop complaining about deprecated OpenSSL functions 

stable inclusion
from stable-v5.10.155
commit d37dfb9357e935c8701e80429f5f7c416fb946a3
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7M5F4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d37dfb9357e935c8701e80429f5f7c416fb946a3



--------------------------------

commit 6bfb56e9 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent e7116d4a

scripts/extract-cert.c

+7 −0
Original line number Diff line number Diff line
@@ -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))

scripts/sign-file.c

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,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"



/*

 * 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