9d33580bd5
Signed-off-by: ShenYage <shenyage1@huawei.com> (cherry picked from commit d398ef925fb6ad1623786aff816455551da3c159)
40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
From 13213d2f8a0003e51f89732e639a7783ce82c94f Mon Sep 17 00:00:00 2001
|
|
From: Matt Caswell <matt@openssl.org>
|
|
Date: Wed, 18 Aug 2021 17:37:41 +0100
|
|
Subject: [PATCH 5/9] Fix test code 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>
|
|
---
|
|
.../Library/OpensslLib/openssl/test/x509_time_test.c | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/CryptoPkg/Library/OpensslLib/openssl/test/x509_time_test.c b/CryptoPkg/Library/OpensslLib/openssl/test/x509_time_test.c
|
|
index b6fd38a..d0993d9 100644
|
|
--- a/CryptoPkg/Library/OpensslLib/openssl/test/x509_time_test.c
|
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/test/x509_time_test.c
|
|
@@ -330,10 +330,12 @@ static int test_x509_time(int idx)
|
|
|
|
/* if t is not NULL but expected_string is NULL, it is an 'OK' case too */
|
|
if (t != NULL && x509_format_tests[idx].expected_string) {
|
|
- if (!TEST_str_eq((const char *)t->data,
|
|
- x509_format_tests[idx].expected_string)) {
|
|
- TEST_info("test_x509_time(%d) failed: expected_string %s, got %s\n",
|
|
- idx, x509_format_tests[idx].expected_string, t->data);
|
|
+ if (!TEST_mem_eq((const char *)t->data, t->length,
|
|
+ x509_format_tests[idx].expected_string,
|
|
+ strlen(x509_format_tests[idx].expected_string))) {
|
|
+ TEST_info("test_x509_time(%d) failed: expected_string %s, got %.*s\n",
|
|
+ idx, x509_format_tests[idx].expected_string, t->length,
|
|
+ t->data);
|
|
goto out;
|
|
}
|
|
}
|
|
--
|
|
2.33.0
|
|
|