9d33580bd5
Signed-off-by: ShenYage <shenyage1@huawei.com> (cherry picked from commit d398ef925fb6ad1623786aff816455551da3c159)
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 68557991614b61629dce4a6ab4510087ff28022c Mon Sep 17 00:00:00 2001
|
|
From: Matt Caswell <matt@openssl.org>
|
|
Date: Wed, 18 Aug 2021 14:02:40 +0100
|
|
Subject: [PATCH 3/9] Fix printing of PROXY_CERT_INFO_EXTENSION to not assume
|
|
NUL terminated strings
|
|
|
|
ASN.1 strings may not be NUL terminated. Don't assume they are.
|
|
|
|
CVE-2021-3712
|
|
|
|
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
|
|
Reviewed-by: Paul Dale <pauli@openssl.org>
|
|
---
|
|
CryptoPkg/Library/OpensslLib/openssl/crypto/x509v3/v3_pci.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/CryptoPkg/Library/OpensslLib/openssl/crypto/x509v3/v3_pci.c b/CryptoPkg/Library/OpensslLib/openssl/crypto/x509v3/v3_pci.c
|
|
index 3d124fa..98b6ef2 100644
|
|
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/x509v3/v3_pci.c
|
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/x509v3/v3_pci.c
|
|
@@ -77,7 +77,8 @@ static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *pci,
|
|
i2a_ASN1_OBJECT(out, pci->proxyPolicy->policyLanguage);
|
|
BIO_puts(out, "\n");
|
|
if (pci->proxyPolicy->policy && pci->proxyPolicy->policy->data)
|
|
- BIO_printf(out, "%*sPolicy Text: %s\n", indent, "",
|
|
+ BIO_printf(out, "%*sPolicy Text: %.*s\n", indent, "",
|
|
+ pci->proxyPolicy->policy->length,
|
|
pci->proxyPolicy->policy->data);
|
|
return 1;
|
|
}
|
|
--
|
|
2.33.0
|
|
|