1 files changed, 9 insertions, 3 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_kiss.c b/src/lib/libcrypto/pkcs12/p12_kiss.c
index f6f09ff2de..4324201598 100644
--- a/src/lib/libcrypto/pkcs12/p12_kiss.c
+++ b/src/lib/libcrypto/pkcs12/p12_kiss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_kiss.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */
+/* $OpenBSD: p12_kiss.c,v 1.30 2026/01/27 14:14:20 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -231,11 +231,17 @@ parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey,
         ASN1_BMPSTRING *fname = NULL;
         ASN1_OCTET_STRING *lkid = NULL;
 
-        if ((attrib = PKCS12_SAFEBAG_get0_attr(bag, NID_friendlyName)))
+        if ((attrib = PKCS12_SAFEBAG_get0_attr(bag, NID_friendlyName))) {
+                if (attrib->type != V_ASN1_BMPSTRING)
+                        return 0;
                 fname = attrib->value.bmpstring;
+        }
 
-        if ((attrib = PKCS12_SAFEBAG_get0_attr(bag, NID_localKeyID)))
+        if ((attrib = PKCS12_SAFEBAG_get0_attr(bag, NID_localKeyID))) {
+                if (attrib->type != V_ASN1_OCTET_STRING)
+                        return 0;
                 lkid = attrib->value.octet_string;
+        }
 
         switch (OBJ_obj2nid(bag->type)) {
         case NID_keyBag: