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

Browse Source

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:

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

Change-Id: Ia6b70d1ae4e441cdee7e2e206e3a1b98b36ea989
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

...

This commit is contained in:

Greg Kroah-Hartman

2025-05-01 09:14:56 +00:00

parent f8bfb03c95 2eb70f54ad

commit 30f955d0bc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available