From d535a2b87597dffb2d27073fa47f4d61feb743ab Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Thu, 18 Feb 2021 17:41:59 -0500 Subject: dev-libs/openssl: sync --- dev-libs/openssl/files/gentoo.config-1.0.2 | 3 +- .../openssl/files/openssl-1.0.2a-x32-asm.patch | 43 --------------- .../files/openssl-1.1.0k-fix-test_fuzz.patch | 19 ------- .../openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch | 30 ----------- .../openssl/files/openssl-1.1.1i-riscv32.patch | 61 ++++++++++++++++++++++ 5 files changed, 63 insertions(+), 93 deletions(-) delete mode 100644 dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch delete mode 100644 dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch delete mode 100644 dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch create mode 100644 dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch (limited to 'dev-libs/openssl/files') diff --git a/dev-libs/openssl/files/gentoo.config-1.0.2 b/dev-libs/openssl/files/gentoo.config-1.0.2 index 4e88dba..68d7d0a 100644 --- a/dev-libs/openssl/files/gentoo.config-1.0.2 +++ b/dev-libs/openssl/files/gentoo.config-1.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # # Openssl doesn't play along nicely with cross-compiling @@ -104,6 +104,7 @@ linux) powerpc64*) machine=ppc64;; powerpc*le*) machine="generic32 -DL_ENDIAN";; powerpc*) machine=ppc;; + riscv32*) machine="generic32 -DL_ENDIAN";; riscv64*) machine="generic64 -DL_ENDIAN";; # sh64*) machine=elf;; sh*b*) machine="generic32 -DB_ENDIAN";; diff --git a/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch b/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch deleted file mode 100644 index 3a005c9..0000000 --- a/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest - -From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 21 Mar 2015 06:01:25 -0400 -Subject: [PATCH] crypto: use bigint in x86-64 perl - -When building on x32 systems where the default type is 32bit, make sure -we can transparently represent 64bit integers. Otherwise we end up with -build errors like: -/usr/bin/perl asm/ghash-x86_64.pl elf > ghash-x86_64.s -Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, <> line 890. -... -ghash-x86_64.s: Assembler messages: -ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression - -We don't enable this globally as there are some cases where we'd get -32bit values interpreted as unsigned when we need them as signed. - -Reported-by: Bertrand Jacquin -URL: https://bugs.gentoo.org/542618 ---- - crypto/perlasm/x86_64-xlate.pl | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl -index aae8288..0bf9774 100755 ---- a/crypto/perlasm/x86_64-xlate.pl -+++ b/crypto/perlasm/x86_64-xlate.pl -@@ -195,6 +195,10 @@ my %globals; - sub out { - my $self = shift; - -+ # When building on x32 ABIs, the expanded hex value might be too -+ # big to fit into 32bits. Enable transparent 64bit support here -+ # so we can safely print it out. -+ use bigint; - if ($gas) { - # Solaris /usr/ccs/bin/as can't handle multiplications - # in $self->{value} --- -2.3.3 - diff --git a/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch b/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch deleted file mode 100644 index 2c4cc31..0000000 --- a/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch +++ /dev/null @@ -1,19 +0,0 @@ -Test fuzz was forgotten when - - Perl: Use our own globbing wrapper rather than File::Glob::glob - -was backported to openssl-1.1.0 branch. - -Link: https://github.com/openssl/openssl/commit/b81cfa07ada850fd287d0a0c82ba280907f18ce7 - ---- a/test/recipes/90-test_fuzz.t -+++ b/test/recipes/90-test_fuzz.t -@@ -9,7 +9,7 @@ - use strict; - use warnings; - --use if $^O ne "VMS", 'File::Glob' => qw/glob/; -+use OpenSSL::Glob; - use OpenSSL::Test qw/:DEFAULT srctop_file/; - use OpenSSL::Test::Utils; - diff --git a/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch b/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch deleted file mode 100644 index 35a435d..0000000 --- a/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bcf6a94c4bc912ad313ea21abdf7e83bbae450e5 Mon Sep 17 00:00:00 2001 -From: Nicola Tuveri -Date: Thu, 12 Sep 2019 01:57:47 +0300 -Subject: [PATCH] Fix no-ec2m in ec_curve.c (1.1.0) - -I made a mistake in d4a5dac9f9242c580fb9d0a4389440eccd3494a7 and -inverted the GF2m and GFp calls in ec_point_get_affine_coordinates, this -fixes it. ---- - crypto/ec/ec_curve.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c -index 2d28d7f70bb..6a58b3a23e0 100644 ---- a/crypto/ec/ec_curve.c -+++ b/crypto/ec/ec_curve.c -@@ -3200,11 +3200,11 @@ int ec_point_get_affine_coordinates(const EC_GROUP *group, - - #ifndef OPENSSL_NO_EC2M - if (field_nid == NID_X9_62_characteristic_two_field) { -- return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); -+ return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); - } else - #endif /* !def(OPENSSL_NO_EC2M) */ - if (field_nid == NID_X9_62_prime_field) { -- return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); -+ return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); - } else { - /* this should never happen */ - return 0; diff --git a/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch b/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch new file mode 100644 index 0000000..c94b032 --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch @@ -0,0 +1,61 @@ +From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Thu, 29 Aug 2019 13:56:21 -0700 +Subject: [PATCH] Add support for io_pgetevents_time64 syscall + +32-bit architectures that are y2038 safe don't include syscalls that use +32-bit time_t. Instead these architectures have suffixed syscalls that +always use a 64-bit time_t. In the case of the io_getevents syscall the +syscall has been replaced with the io_pgetevents_time64 syscall instead. + +This patch changes the io_getevents() function to use the correct +syscall based on the avaliable syscalls and the time_t size. We will +only use the new 64-bit time_t syscall if the architecture is using a +64-bit time_t. This is to avoid having to deal with 32/64-bit +conversions and relying on a 64-bit timespec struct on 32-bit time_t +platforms. As of Linux 5.3 there are no 32-bit time_t architectures +without __NR_io_getevents. In the future if a 32-bit time_t architecture +wants to use the 64-bit syscalls we can handle the conversion. + +This fixes build failures on 32-bit RISC-V. + +Signed-off-by: Alistair Francis + +Reviewed-by: Richard Levitte +Reviewed-by: Paul Dale +(Merged from https://github.com/openssl/openssl/pull/9819) +--- + engines/e_afalg.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/engines/e_afalg.c b/engines/e_afalg.c +index dacbe358cb..99516cb1bb 100644 +--- a/engines/e_afalg.c ++++ b/engines/e_afalg.c +@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max, + struct io_event *events, + struct timespec *timeout) + { ++#if defined(__NR_io_getevents) + return syscall(__NR_io_getevents, ctx, min, max, events, timeout); ++#elif defined(__NR_io_pgetevents_time64) ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to use a 64-bit ++ * version of timespec with a 32-bit time_t and handle converting ++ * between 64-bit and 32-bit times and check for overflows. ++ */ ++ if (sizeof(timeout->tv_sec) == 8) ++ return syscall(__NR_io_pgetevents_time64, ctx, min, max, events, timeout, NULL); ++ else { ++ errno = ENOSYS; ++ return -1; ++ } ++#else ++# error "We require either the io_getevents syscall or __NR_io_pgetevents_time64." ++#endif + } + + static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key, +-- +2.26.2 + -- cgit v1.2.3-54-g00ecf