2 files changed, 5 insertions, 5 deletions

diff --git a/src/lib/libcrypto/evp/evp_local.h b/src/lib/libcrypto/evp/evp_local.h
index eaede4409a..52fa8e1e52 100644
--- a/src/lib/libcrypto/evp/evp_local.h
+++ b/src/lib/libcrypto/evp/evp_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_local.h,v 1.11 2024/01/01 15:23:00 tb Exp $ */
+/* $OpenBSD: evp_local.h,v 1.12 2024/01/04 17:01:26 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -90,8 +90,8 @@ struct ecx_key_st {
 };
 
 struct evp_pkey_asn1_method_st {
+        const EVP_PKEY_ASN1_METHOD *base_method;
         int pkey_id;
-        int pkey_base_id;
         unsigned long pkey_flags;
 
         char *pem_str;
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c
index f46666a008..b43a0fcd5d 100644
--- a/src/lib/libcrypto/evp/p_lib.c
+++ b/src/lib/libcrypto/evp/p_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_lib.c,v 1.53 2024/01/04 16:41:56 tb Exp $ */
+/* $OpenBSD: p_lib.c,v 1.54 2024/01/04 17:01:26 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -222,7 +222,7 @@ EVP_PKEY_asn1_find(ENGINE **pe, int type)
                         break;
                 if ((mp->pkey_flags & ASN1_PKEY_ALIAS) == 0)
                         break;
-                type = mp->pkey_base_id;
+                type = mp->base_method->pkey_id;
         }
 
         return mp;
@@ -259,7 +259,7 @@ EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,
         if (ppkey_id)
                 *ppkey_id = ameth->pkey_id;
         if (ppkey_base_id)
-                *ppkey_base_id = ameth->pkey_base_id;
+                *ppkey_base_id = ameth->base_method->pkey_id;
         if (ppkey_flags)
                 *ppkey_flags = ameth->pkey_flags;
         if (pinfo)