From b7032026cef94a0a8f24a0e5176f00fa7d111c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E5=AE=8F=E5=8D=9A?= <xdhbj0022@163.com>
Date: Sun, 4 Feb 2024 11:22:24 +0800
Subject: [PATCH] fix cve-2024-0727

---
 dependency/openssl/CVE-2024-0727.patch | 92 ++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 dependency/openssl/CVE-2024-0727.patch

diff --git a/dependency/openssl/CVE-2024-0727.patch b/dependency/openssl/CVE-2024-0727.patch
new file mode 100644
index 000000000..9a53a4f78
--- /dev/null
+++ b/dependency/openssl/CVE-2024-0727.patch
@@ -0,0 +1,92 @@
+diff -Naur a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
+--- a/crypto/pkcs12/p12_add.c	2024-02-04 10:55:19.252070922 +0800
++++ b/crypto/pkcs12/p12_add.c	2024-02-04 10:53:27.906106687 +0800
+@@ -76,6 +76,12 @@
+                   PKCS12_R_CONTENT_TYPE_NOT_DATA);
+         return NULL;
+     }
++    
++    if (p7->d.data == NULL) {
++        PKCS12err(PKCS12_F_PKCS12_UNPACK_P7DATA, PKCS12_R_DECODE_ERROR);
++        return NULL;
++    }
++
+     return ASN1_item_unpack(p7->d.data, ASN1_ITEM_rptr(PKCS12_SAFEBAGS));
+ }
+ 
+@@ -132,6 +138,12 @@
+ {
+     if (!PKCS7_type_is_encrypted(p7))
+         return NULL;
++
++    if (p7->d.data == NULL) {
++        PKCS12err(PKCS12_F_PKCS12_UNPACK_P7DATA, PKCS12_R_DECODE_ERROR);
++        return NULL;
++    }
++
+     return PKCS12_item_decrypt_d2i(p7->d.encrypted->enc_data->algorithm,
+                                    ASN1_ITEM_rptr(PKCS12_SAFEBAGS),
+                                    pass, passlen,
+@@ -159,6 +171,11 @@
+                   PKCS12_R_CONTENT_TYPE_NOT_DATA);
+         return NULL;
+     }
++    if (p12->authsafes->d.data == NULL) {
++        PKCS12err(PKCS12_F_PKCS12_UNPACK_AUTHSAFES, PKCS12_R_DECODE_ERROR);
++        return NULL;
++    }
++
+     return ASN1_item_unpack(p12->authsafes->d.data,
+                             ASN1_ITEM_rptr(PKCS12_AUTHSAFES));
+ }
+diff -Naur a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
+--- a/crypto/pkcs12/p12_mutl.c	2024-02-04 10:55:19.252070922 +0800
++++ b/crypto/pkcs12/p12_mutl.c	2024-02-04 10:53:27.906106687 +0800
+@@ -93,6 +93,11 @@
+         return 0;
+     }
+ 
++    if (p12->authsafes->d.data == NULL) {
++        PKCS12err(PKCS12_F_PKCS12_GEN_MAC, PKCS12_R_DECODE_ERROR);
++        return 0;
++    }
++
+     salt = p12->mac->salt->data;
+     saltlen = p12->mac->salt->length;
+     if (!p12->mac->iter)
+diff -Naur a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c
+--- a/crypto/pkcs12/p12_npas.c	2024-02-04 10:55:19.252070922 +0800
++++ b/crypto/pkcs12/p12_npas.c	2024-02-04 10:53:27.906106687 +0800
+@@ -78,8 +78,9 @@
+             bags = PKCS12_unpack_p7data(p7);
+         } else if (bagnid == NID_pkcs7_encrypted) {
+             bags = PKCS12_unpack_p7encdata(p7, oldpass, -1);
+-            if (!alg_get(p7->d.encrypted->enc_data->algorithm,
+-                         &pbe_nid, &pbe_iter, &pbe_saltlen))
++            if (p7->d.encrypted == NULL
++                    || !alg_get(p7->d.encrypted->enc_data->algorithm,
++                                &pbe_nid, &pbe_iter, &pbe_saltlen))
+                 goto err;
+         } else {
+             continue;
+diff -Naur a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
+--- a/crypto/pkcs7/pk7_mime.c	2024-02-04 10:55:19.245070861 +0800
++++ b/crypto/pkcs7/pk7_mime.c	2024-02-04 10:53:27.898106618 +0800
+@@ -30,11 +30,14 @@
+ {
+     STACK_OF(X509_ALGOR) *mdalgs;
+     int ctype_nid = OBJ_obj2nid(p7->type);
+-    if (ctype_nid == NID_pkcs7_signed)
++
++    if (ctype_nid == NID_pkcs7_signed) {
++        if (p7->d.sign == NULL)
++            return 0;
+         mdalgs = p7->d.sign->md_algs;
+-    else
++    } else {
+         mdalgs = NULL;
+-
++    }
+     flags ^= SMIME_OLDMIME;
+ 
+     return SMIME_write_ASN1(bio, (ASN1_VALUE *)p7, data, flags,
-- 
Gitee