29 lines
928 B
Diff
29 lines
928 B
Diff
From 0a2ecb95993b588d2156dd6527459cc3983aabd5 Mon Sep 17 00:00:00 2001
|
|
From: Andrew Dinh <andrewd@openssl.org>
|
|
Date: Thu, 8 Jan 2026 01:24:30 +0900
|
|
Subject: [PATCH] Add NULL check to PKCS12_item_decrypt_d2i_ex
|
|
|
|
Address CVE-2025-69421
|
|
|
|
Add NULL check for oct parameter
|
|
---
|
|
crypto/pkcs12/p12_decr.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
|
|
index 606713b9ee9..1614da44042 100644
|
|
--- a/crypto/pkcs12/p12_decr.c
|
|
+++ b/crypto/pkcs12/p12_decr.c
|
|
@@ -146,6 +146,11 @@ void *PKCS12_item_decrypt_d2i_ex(const X509_ALGOR *algor, const ASN1_ITEM *it,
|
|
void *ret;
|
|
int outlen = 0;
|
|
|
|
+ if (oct == NULL) {
|
|
+ ERR_raise(ERR_LIB_PKCS12, ERR_R_PASSED_NULL_PARAMETER);
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
if (!PKCS12_pbe_crypt_ex(algor, pass, passlen, oct->data, oct->length,
|
|
&out, &outlen, 0, libctx, propq))
|
|
return NULL;
|