From: Norbert Pocs <norbertp@openssl.org>
Date: Fri, 29 Aug 2025 13:12:06 +0000 (+0200)
Subject: engine/e_loader_attic: Remove OPENSSL_NO_ENGINE parts
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4becc086ec2ecaf9054476281a2c95dea722e908;p=thirdparty%2Fopenssl.git

engine/e_loader_attic: Remove OPENSSL_NO_ENGINE parts

Signed-off-by: Norbert Pocs <norbertp@openssl.org>

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28384)
---

diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c
index e7597c54ef9..5607796eabd 100644
--- a/engines/e_loader_attic.c
+++ b/engines/e_loader_attic.c
@@ -548,47 +548,6 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name,
         }
     } else {
         int i;
-#ifndef OPENSSL_NO_ENGINE
-        ENGINE *curengine = ENGINE_get_first();
-
-        while (curengine != NULL) {
-            ENGINE_PKEY_ASN1_METHS_PTR asn1meths =
-                ENGINE_get_pkey_asn1_meths(curengine);
-
-            if (asn1meths != NULL) {
-                const int *nids = NULL;
-                int nids_n = asn1meths(curengine, NULL, &nids, 0);
-
-                for (i = 0; i < nids_n; i++) {
-                    EVP_PKEY_ASN1_METHOD *ameth2 = NULL;
-                    EVP_PKEY *tmp_pkey = NULL;
-                    const unsigned char *tmp_blob = blob;
-                    int pkey_id, pkey_flags;
-
-                    if (!asn1meths(curengine, &ameth2, NULL, nids[i])
-                        || !EVP_PKEY_asn1_get0_info(&pkey_id, NULL,
-                                                    &pkey_flags, NULL, NULL,
-                                                    ameth2)
-                        || (pkey_flags & ASN1_PKEY_ALIAS) != 0)
-                        continue;
-
-                    ERR_set_mark(); /* prevent flooding error queue */
-                    tmp_pkey = d2i_PrivateKey_ex(pkey_id, NULL,
-                                                 &tmp_blob, (long)len,
-                                                 libctx, propq);
-                    if (tmp_pkey != NULL) {
-                        if (pkey != NULL)
-                            EVP_PKEY_free(tmp_pkey);
-                        else
-                            pkey = tmp_pkey;
-                        (*matchcount)++;
-                    }
-                    ERR_pop_to_mark();
-                }
-            }
-            curengine = ENGINE_get_next(curengine);
-        }
-#endif
 
         for (i = 0; i < EVP_PKEY_asn1_get_count(); i++) {
             EVP_PKEY *tmp_pkey = NULL;