37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 48ccd81656381522d1f9ccb8705c13f0266a46ab Mon Sep 17 00:00:00 2001
|
|
From: Greg Hudson <ghudson@mit.edu>
|
|
Date: Sat, 25 Nov 2023 11:04:56 -0500
|
|
Subject: [PATCH] In PKINIT, check for null PKCS7 enveloped fields
|
|
|
|
The PKCS7 ContentInfo content field and EncryptedContentInfo
|
|
encryptedContent field are optional. Check for null values in
|
|
cms_envelopeddata_verify() before calling pkcs7_decrypt(). Reported
|
|
by Bahaa Naamneh.
|
|
|
|
ticket: 9107 (new)
|
|
tags: pullup
|
|
target_version: 1.21-next
|
|
target_version: 1.20-next
|
|
---
|
|
src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
|
|
index 453b1119a..15c6cd8c4 100644
|
|
--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
|
|
+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
|
|
@@ -2464,7 +2464,9 @@ cms_envelopeddata_verify(krb5_context context,
|
|
}
|
|
|
|
/* verify that the received message is PKCS7 EnvelopedData message */
|
|
- if (OBJ_obj2nid(p7->type) != NID_pkcs7_enveloped) {
|
|
+ if (OBJ_obj2nid(p7->type) != NID_pkcs7_enveloped ||
|
|
+ p7->d.enveloped == NULL ||
|
|
+ p7->d.enveloped->enc_data->enc_data == NULL) {
|
|
pkiDebug("Expected id-enveloped PKCS7 msg (received type = %d)\n",
|
|
OBJ_obj2nid(p7->type));
|
|
krb5_set_error_message(context, retval, "wrong oid\n");
|
|
--
|
|
2.33.0
|
|
|