forked from pool/openssl-1_1
d7adac4e7f
- Rename engines directories to the same name like in SLE:
/etc/ssl/engines1_1.d -> /etc/ssl/engines1.1.d
/etc/ssl/engdef1_1.d -> /etc/ssl/engdef1.1.d
* Add migration script to move files (bsc#1219562)
/etc/ssl/engines.d/* -> /etc/ssl/engines1.1.d
/etc/ssl/engdef.d/* -> /etc/ssl/engdef1.1.d
- Security fix: [bsc#1219243, CVE-2024-0727]
* Add NULL checks where ContentInfo data can be NULL
* Add openssl-CVE-2024-0727.patch
OBS-URL: https://build.opensuse.org/request/show/1144565
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-1_1?expand=0&rev=156
159 lines
6.2 KiB
Diff
159 lines
6.2 KiB
Diff
From 09df4395b5071217b76dc7d3d2e630eb8c5a79c2 Mon Sep 17 00:00:00 2001
|
|
From: Matt Caswell <matt@openssl.org>
|
|
Date: Fri, 19 Jan 2024 11:28:58 +0000
|
|
Subject: [PATCH] Add NULL checks where ContentInfo data can be NULL
|
|
|
|
PKCS12 structures contain PKCS7 ContentInfo fields. These fields are
|
|
optional and can be NULL even if the "type" is a valid value. OpenSSL
|
|
was not properly accounting for this and a NULL dereference can occur
|
|
causing a crash.
|
|
|
|
CVE-2024-0727
|
|
|
|
Reviewed-by: Tomas Mraz <tomas@openssl.org>
|
|
Reviewed-by: Hugo Landau <hlandau@openssl.org>
|
|
Reviewed-by: Neil Horman <nhorman@openssl.org>
|
|
(Merged from https://github.com/openssl/openssl/pull/23362)
|
|
|
|
(cherry picked from commit d135eeab8a5dbf72b3da5240bab9ddb7678dbd2c)
|
|
---
|
|
crypto/pkcs12/p12_add.c | 18 ++++++++++++++++++
|
|
crypto/pkcs12/p12_mutl.c | 5 +++++
|
|
crypto/pkcs12/p12_npas.c | 5 +++--
|
|
crypto/pkcs7/pk7_mime.c | 7 +++++--
|
|
4 files changed, 31 insertions(+), 4 deletions(-)
|
|
|
|
Index: openssl-1.1.1w/crypto/pkcs12/p12_add.c
|
|
===================================================================
|
|
--- openssl-1.1.1w.orig/crypto/pkcs12/p12_add.c
|
|
+++ openssl-1.1.1w/crypto/pkcs12/p12_add.c
|
|
@@ -76,6 +76,12 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_
|
|
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 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_
|
|
{
|
|
if (!PKCS7_type_is_encrypted(p7))
|
|
return NULL;
|
|
+
|
|
+ if (p7->d.encrypted == NULL) {
|
|
+ PKCS12err(PKCS12_F_PKCS12_UNPACK_P7ENCDATA, 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,13 @@ STACK_OF(PKCS7) *PKCS12_unpack_authsafes
|
|
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));
|
|
}
|
|
Index: openssl-1.1.1w/crypto/pkcs12/p12_mutl.c
|
|
===================================================================
|
|
--- openssl-1.1.1w.orig/crypto/pkcs12/p12_mutl.c
|
|
+++ openssl-1.1.1w/crypto/pkcs12/p12_mutl.c
|
|
@@ -93,6 +93,11 @@ static int pkcs12_gen_mac(PKCS12 *p12, c
|
|
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)
|
|
Index: openssl-1.1.1w/crypto/pkcs12/p12_npas.c
|
|
===================================================================
|
|
--- openssl-1.1.1w.orig/crypto/pkcs12/p12_npas.c
|
|
+++ openssl-1.1.1w/crypto/pkcs12/p12_npas.c
|
|
@@ -78,8 +78,9 @@ static int newpass_p12(PKCS12 *p12, cons
|
|
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;
|
|
Index: openssl-1.1.1w/crypto/pkcs7/pk7_mime.c
|
|
===================================================================
|
|
--- openssl-1.1.1w.orig/crypto/pkcs7/pk7_mime.c
|
|
+++ openssl-1.1.1w/crypto/pkcs7/pk7_mime.c
|
|
@@ -30,10 +30,13 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p
|
|
{
|
|
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;
|
|
|
|
Index: openssl-1.1.1w/crypto/err/openssl.txt
|
|
===================================================================
|
|
--- openssl-1.1.1w.orig/crypto/err/openssl.txt
|
|
+++ openssl-1.1.1w/crypto/err/openssl.txt
|
|
@@ -1079,6 +1079,7 @@ PKCS12_F_PKCS12_SETUP_MAC:122:PKCS12_set
|
|
PKCS12_F_PKCS12_SET_MAC:123:PKCS12_set_mac
|
|
PKCS12_F_PKCS12_UNPACK_AUTHSAFES:130:PKCS12_unpack_authsafes
|
|
PKCS12_F_PKCS12_UNPACK_P7DATA:131:PKCS12_unpack_p7data
|
|
+PKCS12_F_PKCS12_UNPACK_P7ENCDATA:233:PKCS12_unpack_p7encdata
|
|
PKCS12_F_PKCS12_VERIFY_MAC:126:PKCS12_verify_mac
|
|
PKCS12_F_PKCS8_ENCRYPT:125:PKCS8_encrypt
|
|
PKCS12_F_PKCS8_SET0_PBE:132:PKCS8_set0_pbe
|
|
Index: openssl-1.1.1w/crypto/pkcs12/pk12err.c
|
|
===================================================================
|
|
--- openssl-1.1.1w.orig/crypto/pkcs12/pk12err.c
|
|
+++ openssl-1.1.1w/crypto/pkcs12/pk12err.c
|
|
@@ -58,6 +58,8 @@ static const ERR_STRING_DATA PKCS12_str_
|
|
"PKCS12_unpack_authsafes"},
|
|
{ERR_PACK(ERR_LIB_PKCS12, PKCS12_F_PKCS12_UNPACK_P7DATA, 0),
|
|
"PKCS12_unpack_p7data"},
|
|
+ {ERR_PACK(ERR_LIB_PKCS12, PKCS12_F_PKCS12_UNPACK_P7ENCDATA, 0),
|
|
+ "PKCS12_unpack_p7encdata"},
|
|
{ERR_PACK(ERR_LIB_PKCS12, PKCS12_F_PKCS12_VERIFY_MAC, 0),
|
|
"PKCS12_verify_mac"},
|
|
{ERR_PACK(ERR_LIB_PKCS12, PKCS12_F_PKCS8_ENCRYPT, 0), "PKCS8_encrypt"},
|
|
Index: openssl-1.1.1w/include/openssl/pkcs12err.h
|
|
===================================================================
|
|
--- openssl-1.1.1w.orig/include/openssl/pkcs12err.h
|
|
+++ openssl-1.1.1w/include/openssl/pkcs12err.h
|
|
@@ -49,6 +49,7 @@ int ERR_load_PKCS12_strings(void);
|
|
# define PKCS12_F_PKCS12_SET_MAC 123
|
|
# define PKCS12_F_PKCS12_UNPACK_AUTHSAFES 130
|
|
# define PKCS12_F_PKCS12_UNPACK_P7DATA 131
|
|
+# define PKCS12_F_PKCS12_UNPACK_P7ENCDATA 233
|
|
# define PKCS12_F_PKCS12_VERIFY_MAC 126
|
|
# define PKCS12_F_PKCS8_ENCRYPT 125
|
|
# define PKCS12_F_PKCS8_SET0_PBE 132
|