diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-06-28 00:59:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-06-28 01:01:42 +0200 |
| commit | 0c4852c7bc40747e734a84a0d234105a4d5c146f (patch) | |
| tree | 5c2b405a15000226ce13ea33b69ad69fff7f4826 /pkgs | |
| parent | 1b3082280540b1a06cf9adf9712a8b1e94d62116 (diff) | |
| parent | c59d1ebd6eeb2c9a2889e22a2249ad5a1a341375 (diff) | |
Merge #179333: openssl_3_0: fix apparent x86_64 AVX512 RCE
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch | 34 | ||||
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 4 |
2 files changed, 38 insertions, 0 deletions
diff --git a/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch b/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch new file mode 100644 index 0000000000000..e144a7188897e --- /dev/null +++ b/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch @@ -0,0 +1,34 @@ +From 4d8a88c134df634ba610ff8db1eb8478ac5fd345 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) +--- + crypto/bn/rsaz_exp_x2.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/crypto/bn/rsaz_exp_x2.c b/crypto/bn/rsaz_exp_x2.c +index 6b04486e3f56..f979cebd6fb7 100644 +--- a/crypto/bn/rsaz_exp_x2.c ++++ b/crypto/bn/rsaz_exp_x2.c +@@ -257,6 +257,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/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 8f586a033aef9..db6e0101fec78 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -210,6 +210,10 @@ in { # This patch disables build-time detection. ./3.0/openssl-disable-kernel-detection.patch + # https://guidovranken.com/2022/06/27/notes-on-openssl-remote-memory-corruption/ + # https://github.com/openssl/openssl/commit/4d8a88c134df634ba610ff8db1eb8478ac5fd345.patch + 3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch + (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) |