summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/ameth_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/asn1/ameth_lib.c')
-rw-r--r--src/lib/libcrypto/asn1/ameth_lib.c29
1 files changed, 1 insertions, 28 deletions
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c
index 153ad21a81..42f2f6fd52 100644
--- a/src/lib/libcrypto/asn1/ameth_lib.c
+++ b/src/lib/libcrypto/asn1/ameth_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ameth_lib.c,v 1.32 2023/07/07 19:37:52 beck Exp $ */ 1/* $OpenBSD: ameth_lib.c,v 1.33 2023/11/19 15:46:09 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -64,10 +64,6 @@
64#include <openssl/asn1t.h> 64#include <openssl/asn1t.h>
65#include <openssl/x509.h> 65#include <openssl/x509.h>
66 66
67#ifndef OPENSSL_NO_ENGINE
68#include <openssl/engine.h>
69#endif
70
71#include "asn1_local.h" 67#include "asn1_local.h"
72#include "evp_local.h" 68#include "evp_local.h"
73 69
@@ -170,15 +166,6 @@ EVP_PKEY_asn1_find(ENGINE **pe, int type)
170 type = mp->pkey_base_id; 166 type = mp->pkey_base_id;
171 } 167 }
172 if (pe) { 168 if (pe) {
173#ifndef OPENSSL_NO_ENGINE
174 ENGINE *e;
175 /* type will contain the final unaliased type */
176 e = ENGINE_get_pkey_asn1_meth_engine(type);
177 if (e) {
178 *pe = e;
179 return ENGINE_get_pkey_asn1_meth(e, type);
180 }
181#endif
182 *pe = NULL; 169 *pe = NULL;
183 } 170 }
184 return mp; 171 return mp;
@@ -193,20 +180,6 @@ EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len)
193 if (len == -1) 180 if (len == -1)
194 len = strlen(str); 181 len = strlen(str);
195 if (pe) { 182 if (pe) {
196#ifndef OPENSSL_NO_ENGINE
197 ENGINE *e;
198 ameth = ENGINE_pkey_asn1_find_str(&e, str, len);
199 if (ameth) {
200 /* Convert structural into
201 * functional reference
202 */
203 if (!ENGINE_init(e))
204 ameth = NULL;
205 ENGINE_free(e);
206 *pe = e;
207 return ameth;
208 }
209#endif
210 *pe = NULL; 183 *pe = NULL;
211 } 184 }
212 for (i = EVP_PKEY_asn1_get_count() - 1; i >= 0; i--) { 185 for (i = EVP_PKEY_asn1_get_count() - 1; i >= 0; i--) {