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

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


Merge f3311056 ("sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3") into android14-6.1-lts

Steps on the way to 6.1.135

Resolves merge conflicts in:
	certs/extract-cert.c
	scripts/sign-file.c

by merging around the following commits:
  3437e90d sign-file,extract-cert: move common SSL helper functions to a header
  6e3319a2 sign-file,extract-cert: avoid using deprecated ERR_get_error_line()
  f3311056 sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3

As signing needs to stay the same in the android14-6.1-lts branch.

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