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

Browse Source

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:
  3437e90d15 sign-file,extract-cert: move common SSL helper functions to a header
  6e3319a2e0 sign-file,extract-cert: avoid using deprecated ERR_get_error_line()
  f331105699 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: Greg Kroah-Hartman <gregkh@google.com>

...

This commit is contained in:

Greg Kroah-Hartman

2025-05-06 06:55:12 +00:00

parent 816b54a70d f331105699

commit fcf8d4d8b3

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