From 796c314bdba6fa3ec6a96791d690ec5c6d9d20f3 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Tue, 1 Oct 2024 00:42:03 +0000 Subject: [PATCH] Revert "FROMLIST: sign-file: Use OpenSSL provided define to compile out deprecated APIs" This reverts commit e9d39639a5297c1601f025c8fddd30a936fedc16. Collides with upstream. Bug: 135570712 Bug: 367265496 Change-Id: I93542eba7b615b8c49fbb062684b593d1f9d32ae Signed-off-by: Matthias Maennich --- scripts/sign-file.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/scripts/sign-file.c b/scripts/sign-file.c index 78d8e0407ba0..3edb156ae52c 100644 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -142,9 +142,7 @@ static int pem_pw_cb(char *buf, int len, int w, void *v) static EVP_PKEY *read_private_key(const char *private_key_name) { EVP_PKEY *private_key; - BIO *b; -#ifndef OPENSSL_NO_ENGINE if (!strncmp(private_key_name, "pkcs11:", 7)) { ENGINE *e; @@ -162,16 +160,17 @@ static EVP_PKEY *read_private_key(const char *private_key_name) private_key = ENGINE_load_private_key(e, private_key_name, NULL, NULL); ERR(!private_key, "%s", private_key_name); - return private_key; - } -#endif + } else { + BIO *b; + + b = BIO_new_file(private_key_name, "rb"); + ERR(!b, "%s", private_key_name); + private_key = PEM_read_bio_PrivateKey(b, NULL, pem_pw_cb, + NULL); + ERR(!private_key, "%s", private_key_name); + BIO_free(b); + } - b = BIO_new_file(private_key_name, "rb"); - ERR(!b, "%s", private_key_name); - private_key = PEM_read_bio_PrivateKey(b, NULL, pem_pw_cb, - NULL); - ERR(!private_key, "%s", private_key_name); - BIO_free(b); return private_key; }