1 files changed, 6 insertions, 1 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c
index 8466e92415..3090781eba 100644
--- a/src/lib/libcrypto/pkcs12/p12_decr.c
+++ b/src/lib/libcrypto/pkcs12/p12_decr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_decr.c,v 1.27 2025/05/10 05:54:38 tb Exp $ */
+/* $OpenBSD: p12_decr.c,v 1.28 2026/01/27 14:03:01 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -130,6 +130,11 @@ PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
         void *ret;
         int outlen;
 
+        if (oct == NULL) {
+                PKCS12error(ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+        }
+
         if (!PKCS12_pbe_crypt(algor, pass, passlen, oct->data, oct->length,
             &out, &outlen, 0)) {
                 PKCS12error(PKCS12_R_PKCS12_PBE_CRYPT_ERROR);