init repo.
This commit is contained in:
0
third_party/openssl-cmake/patches/.gitkeep
vendored
Normal file
0
third_party/openssl-cmake/patches/.gitkeep
vendored
Normal file
36
third_party/openssl-cmake/patches/0001-Fix-failing-cms-test-when-no-des-is-used.patch
vendored
Normal file
36
third_party/openssl-cmake/patches/0001-Fix-failing-cms-test-when-no-des-is-used.patch
vendored
Normal file
@ -0,0 +1,36 @@
|
||||
From 87da6db1773f7741e7f92f40907e3282586da28a Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Edlinger <bernd.edlinger@hotmail.de>
|
||||
Date: Mon, 13 Feb 2023 12:58:33 +0100
|
||||
Subject: [PATCH] Fix failing cms test when no-des is used
|
||||
|
||||
The test tries to use DES but that may not be available.
|
||||
But for the purpose of regression testing CVE-2023-0215
|
||||
the cipher is not relevant, so we use AES-128 instead.
|
||||
|
||||
Fixes #20249
|
||||
|
||||
Reviewed-by: Matt Caswell <matt@openssl.org>
|
||||
Reviewed-by: Todd Short <todd.short@me.com>
|
||||
(Merged from https://github.com/openssl/openssl/pull/20276)
|
||||
|
||||
(cherry picked from commit c400a1fe477b44a5eacbad2be8d50f2eaa92925c)
|
||||
---
|
||||
test/recipes/80-test_cms.t | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
|
||||
index abe299b6a2..cabbe3ecdf 100644
|
||||
--- a/test/recipes/80-test_cms.t
|
||||
+++ b/test/recipes/80-test_cms.t
|
||||
@@ -989,7 +989,7 @@ with({ exit_checker => sub { return shift == 6; } },
|
||||
sub {
|
||||
ok(run(app(['openssl', 'cms', '-encrypt',
|
||||
'-in', srctop_file("test", "smcont.txt"),
|
||||
- '-stream', '-recip',
|
||||
+ '-aes128', '-stream', '-recip',
|
||||
srctop_file("test/smime-certs", "badrsa.pem"),
|
||||
])),
|
||||
"Check failure during BIO setup with -stream is handled correctly");
|
||||
--
|
||||
2.35.3
|
||||
|
36
third_party/openssl-cmake/patches/0002-Fix-test_cms-if-DSA-is-not-supported.patch
vendored
Normal file
36
third_party/openssl-cmake/patches/0002-Fix-test_cms-if-DSA-is-not-supported.patch
vendored
Normal file
@ -0,0 +1,36 @@
|
||||
From 48685e37684258085532a2a62fefd08098f9a62f Mon Sep 17 00:00:00 2001
|
||||
From: Steffen Klee <steffen.klee@gmail.com>
|
||||
Date: Wed, 20 Sep 2023 00:04:18 +0200
|
||||
Subject: [PATCH] Fix test_cms if DSA is not supported
|
||||
|
||||
CLA: trivial
|
||||
---
|
||||
test/recipes/80-test_cms.t | 14 +++++++++-----
|
||||
1 file changed, 9 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
|
||||
index 21c683c404..3857916105 100644
|
||||
--- a/test/recipes/80-test_cms.t
|
||||
+++ b/test/recipes/80-test_cms.t
|
||||
@@ -1144,9 +1144,13 @@ with({ exit_checker => sub { return shift == 6; } },
|
||||
# Test case for return value mis-check reported in #21986
|
||||
with({ exit_checker => sub { return shift == 3; } },
|
||||
sub {
|
||||
- ok(run(app(['openssl', 'cms', '-sign',
|
||||
- '-in', srctop_file("test", "smcont.txt"),
|
||||
- '-signer', srctop_file("test/smime-certs", "smdsa1.pem"),
|
||||
- '-md', 'SHAKE256'])),
|
||||
- "issue#21986");
|
||||
+ SKIP: {
|
||||
+ skip "DSA is not supported in this build", 1 if $no_dsa;
|
||||
+
|
||||
+ ok(run(app(['openssl', 'cms', '-sign',
|
||||
+ '-in', srctop_file("test", "smcont.txt"),
|
||||
+ '-signer', srctop_file("test/smime-certs", "smdsa1.pem"),
|
||||
+ '-md', 'SHAKE256'])),
|
||||
+ "issue#21986");
|
||||
+ }
|
||||
});
|
||||
--
|
||||
2.42.0
|
||||
|
Reference in New Issue
Block a user