summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2022-08-19 20:41:11 +0200
committerSam James <sam@gentoo.org>2022-08-19 23:52:58 +0100
commit3b94f6daf15da0b5fd7142881663030d1c1a1dd2 (patch)
treea5936fb17a560e59e05460c38afc947e912148d2 /dev-libs/openssl/files
parentapp-emulation/ski: add github upstream metadata (diff)
downloadgentoo-3b94f6daf15da0b5fd7142881663030d1c1a1dd2.tar.gz
gentoo-3b94f6daf15da0b5fd7142881663030d1c1a1dd2.tar.bz2
gentoo-3b94f6daf15da0b5fd7142881663030d1c1a1dd2.zip
dev-libs/openssl: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/26928 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/openssl/files')
-rw-r--r--dev-libs/openssl/files/openssl-3.0.4-avx512-buffer-overflow.patch34
-rw-r--r--dev-libs/openssl/files/openssl-3.0.4-fix-test-build.patch46
2 files changed, 0 insertions, 80 deletions
diff --git a/dev-libs/openssl/files/openssl-3.0.4-avx512-buffer-overflow.patch b/dev-libs/openssl/files/openssl-3.0.4-avx512-buffer-overflow.patch
deleted file mode 100644
index c72e958ff535..000000000000
--- a/dev-libs/openssl/files/openssl-3.0.4-avx512-buffer-overflow.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/openssl/openssl/commit/a1f7034bbd8f0730d360211f5ba0feeaef0b7b2c
-https://github.com/openssl/openssl/issues/18625
-
-From a1f7034bbd8f0730d360211f5ba0feeaef0b7b2c Mon Sep 17 00:00:00 2001
-From: Xi Ruoyao <xry111@xry111.site>
-Date: Wed, 22 Jun 2022 18:07:05 +0800
-Subject: [PATCH] rsa: fix bn_reduce_once_in_place call for
- rsaz_mod_exp_avx512_x2
-
-bn_reduce_once_in_place expects the number of BN_ULONG, but factor_size
-is moduli bit size.
-
-Fixes #18625.
-
-Signed-off-by: Xi Ruoyao <xry111@xry111.site>
-
-Reviewed-by: Tomas Mraz <tomas@openssl.org>
-Reviewed-by: Paul Dale <pauli@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/18626)
-
-(cherry picked from commit 4d8a88c134df634ba610ff8db1eb8478ac5fd345)
---- a/crypto/bn/rsaz_exp_x2.c
-+++ b/crypto/bn/rsaz_exp_x2.c
-@@ -220,6 +220,9 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
- from_words52(res1, factor_size, rr1_red);
- from_words52(res2, factor_size, rr2_red);
-
-+ /* bn_reduce_once_in_place expects number of BN_ULONG, not bit size */
-+ factor_size /= sizeof(BN_ULONG) * 8;
-+
- bn_reduce_once_in_place(res1, /*carry=*/0, m1, storage, factor_size);
- bn_reduce_once_in_place(res2, /*carry=*/0, m2, storage, factor_size);
-
-
diff --git a/dev-libs/openssl/files/openssl-3.0.4-fix-test-build.patch b/dev-libs/openssl/files/openssl-3.0.4-fix-test-build.patch
deleted file mode 100644
index f96e54f3127e..000000000000
--- a/dev-libs/openssl/files/openssl-3.0.4-fix-test-build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/openssl/openssl/issues/18619
-https://github.com/openssl/openssl/pull/18634
-https://github.com/openssl/openssl/commit/665ab12ed3f0d78e7cb6a55cdd2b83a2fe150232
-
-From 665ab12ed3f0d78e7cb6a55cdd2b83a2fe150232 Mon Sep 17 00:00:00 2001
-From: Bernd Edlinger <bernd.edlinger@hotmail.de>
-Date: Fri, 17 Jun 2022 10:25:24 +0200
-Subject: [PATCH] Fix compile issues in test/v3ext.c with no-rfc3779
-
-There are no ASIdentifiers if OPENSSL_NO_RFC3779 is defined,
-therefore the test cannot be compiled.
-
-Reviewed-by: Matt Caswell <matt@openssl.org>
-Reviewed-by: Tomas Mraz <tomas@openssl.org>
-Reviewed-by: Paul Dale <pauli@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/18634)
-
-(cherry picked from commit b76efe61ea9710a8f69e1cb8caf1aeb2ba6f1ebe)
---- a/test/v3ext.c
-+++ b/test/v3ext.c
-@@ -37,6 +37,7 @@ static int test_pathlen(void)
- return ret;
- }
-
-+#ifndef OPENSSL_NO_RFC3779
- static int test_asid(void)
- {
- ASN1_INTEGER *val1 = NULL, *val2 = NULL;
-@@ -113,6 +114,7 @@ static int test_asid(void)
- ASIdentifiers_free(asid4);
- return testresult;
- }
-+#endif /* OPENSSL_NO_RFC3779 */
-
- OPT_TEST_DECLARE_USAGE("cert.pem\n")
-
-@@ -127,6 +129,8 @@ int setup_tests(void)
- return 0;
-
- ADD_TEST(test_pathlen);
-+#ifndef OPENSSL_NO_RFC3779
- ADD_TEST(test_asid);
-+#endif /* OPENSSL_NO_RFC3779 */
- return 1;
- }
-