Commit 30f955d0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 2eb70f54 ("sign-file,extract-cert: use pkcs11 provider for OPENSSL...


Merge 2eb70f54 ("sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3") into android15-6.6-lts

Steps on the way to 6.6.88

Resolves conflicts in the following files:
	certs/extract-cert.c
	scripts/sign-file.c
by merging around the following upstream commits as openssl is not being
used for Android15 kernel builds, as the toolchain is stable and not
changing:

	* 2eb70f54 - sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3
	* f8dafdaf - sign-file,extract-cert: avoid using deprecated ERR_get_error_line()
	* 1e2d849e - sign-file,extract-cert: move common SSL helper functions to a header

Change-Id: Ia6b70d1ae4e441cdee7e2e206e3a1b98b36ea989
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents f8bfb03c 2eb70f54
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment