Compare commits
2 Commits
fa8add3b7e
...
4b7e593572
| Author | SHA1 | Date |
|---|---|---|
 Alarig Le Lay
|
4b7e593572
|
|
|
Alarig Le Lay
|
939f75beaa
|
|
|
@ -1,3 +0,0 @@
|
||||||
DIST openssl-1.1.1o-test-fixes-expiry.patch.xz 6180 BLAKE2B 23ef36d7bd05c98f7fab6de25681a53fa7a558d114548836b6cd90a57c4f4e45dc9fb622936053608b463320605b7df60db2d2caf3811b249f6ead3791a1c081 SHA512 577aec97fb31cd9efe3b30d82c560d3e7da57ae52c4de0f86e951b777a673830baaadcc5eb366c523024d37405531c6d32de26bbbc1e77df15c7822c72e937e6
|
|
||||||
DIST openssl-1.1.1o.tar.gz 9856386 BLAKE2B 5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641 SHA512 75b2f1499cb4640229eb6cd35d85cbff2e19db17b959ac4d04b60f1b395b73567f9003521452a0fcfeea9b31b26de0a7bccf476ecf9caae02298f3647cfb7e23
|
|
||||||
DIST openssl-1.1.1o.tar.gz.asc 488 BLAKE2B a03a967e7e2124d1a76ad7765e2f48065f40d32ba102a433be603ee8f86b26a2d246dcb97a95bd694ef3005889ce4f1951f76d39fe1d683f92da1aa3023e9c2d SHA512 da6d88de7c1cd807b6089d50f8bb102c317c0b45ca26e517e3e400c5c65f787d94a1ee522af76279e93790a7fb491348cf25ffcfd66ecb9a9d35209328cb221e
|
|
||||||
|
|
@ -1,172 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 1999-2022 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
#
|
|
||||||
# Openssl doesn't play along nicely with cross-compiling
|
|
||||||
# like autotools based projects, so let's teach it new tricks.
|
|
||||||
#
|
|
||||||
# Review the bundled 'config' script to see why kind of targets
|
|
||||||
# we can pass to the 'Configure' script.
|
|
||||||
|
|
||||||
|
|
||||||
# Testing routines
|
|
||||||
if [[ $1 == "test" ]] ; then
|
|
||||||
for c in \
|
|
||||||
"arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \
|
|
||||||
"armv5b-linux-gnu |linux-armv4 -DB_ENDIAN" \
|
|
||||||
"x86_64-pc-linux-gnu |linux-x86_64" \
|
|
||||||
"alpha-linux-gnu |linux-alpha-gcc" \
|
|
||||||
"alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \
|
|
||||||
"i686-pc-linux-gnu |linux-elf" \
|
|
||||||
"whatever-gentoo-freebsdX.Y |BSD-generic32" \
|
|
||||||
"i686-gentoo-freebsdX.Y |BSD-x86-elf" \
|
|
||||||
"sparc64-alpha-freebsdX.Y |BSD-sparc64" \
|
|
||||||
"ia64-gentoo-freebsd5.99234 |BSD-ia64" \
|
|
||||||
"x86_64-gentoo-freebsdX.Y |BSD-x86_64" \
|
|
||||||
"hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \
|
|
||||||
"powerpc-gentOO-linux-uclibc |linux-ppc" \
|
|
||||||
"powerpc64-unk-linux-gnu |linux-ppc64" \
|
|
||||||
"powerpc64le-linux-gnu |linux-ppc64le" \
|
|
||||||
"x86_64-apple-darwinX |darwin64-x86_64-cc" \
|
|
||||||
"powerpc64-apple-darwinX |darwin64-ppc-cc" \
|
|
||||||
"i686-apple-darwinX |darwin-i386-cc" \
|
|
||||||
"i386-apple-darwinX |darwin-i386-cc" \
|
|
||||||
"powerpc-apple-darwinX |darwin-ppc-cc" \
|
|
||||||
"i586-pc-winnt |winnt-parity" \
|
|
||||||
"s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \
|
|
||||||
"s390x-linux-gnu |linux64-s390x" \
|
|
||||||
;do
|
|
||||||
CHOST=${c/|*}
|
|
||||||
ret_want=${c/*|}
|
|
||||||
ret_got=$(CHOST=${CHOST} "$0")
|
|
||||||
|
|
||||||
if [[ ${ret_want} == "${ret_got}" ]] ; then
|
|
||||||
echo "PASS: ${CHOST}"
|
|
||||||
else
|
|
||||||
echo "FAIL: ${CHOST}"
|
|
||||||
echo -e "\twanted: ${ret_want}"
|
|
||||||
echo -e "\twe got: ${ret_got}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
|
|
||||||
|
|
||||||
|
|
||||||
# Detect the operating system
|
|
||||||
case ${CHOST} in
|
|
||||||
*-aix*) system="aix";;
|
|
||||||
*-darwin*) system="darwin";;
|
|
||||||
*-freebsd*) system="BSD";;
|
|
||||||
*-hpux*) system="hpux";;
|
|
||||||
*-linux*) system="linux";;
|
|
||||||
*-solaris*) system="solaris";;
|
|
||||||
*-winnt*) system="winnt";;
|
|
||||||
x86_64-*-mingw*) system="mingw64";;
|
|
||||||
*mingw*) system="mingw";;
|
|
||||||
*) exit 0;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
|
|
||||||
# Compiler munging
|
|
||||||
compiler="gcc"
|
|
||||||
if [[ ${CC} == "ccc" ]] ; then
|
|
||||||
compiler=${CC}
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# Detect target arch
|
|
||||||
machine=""
|
|
||||||
chost_machine=${CHOST%%-*}
|
|
||||||
case ${system} in
|
|
||||||
linux)
|
|
||||||
case ${chost_machine}:${ABI} in
|
|
||||||
aarch64*be*) machine="aarch64 -DB_ENDIAN";;
|
|
||||||
aarch64*) machine="aarch64 -DL_ENDIAN";;
|
|
||||||
alphaev56*|\
|
|
||||||
alphaev[678]*)machine=alpha+bwx-${compiler};;
|
|
||||||
alpha*) machine=alpha-${compiler};;
|
|
||||||
armv[4-9]*b*) machine="armv4 -DB_ENDIAN";;
|
|
||||||
armv[4-9]*) machine="armv4 -DL_ENDIAN";;
|
|
||||||
arm*b*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
arm*) machine="generic32 -DL_ENDIAN";;
|
|
||||||
avr*) machine="generic32 -DL_ENDIAN";;
|
|
||||||
bfin*) machine="generic32 -DL_ENDIAN";;
|
|
||||||
# hppa64*) machine=parisc64;;
|
|
||||||
hppa*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
i[0-9]86*|\
|
|
||||||
x86_64*:x86) machine=elf;;
|
|
||||||
ia64*) machine=ia64;;
|
|
||||||
loongarch64*) machine="generic64 -DL_ENDIAN";;
|
|
||||||
m68*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
mips*el*) machine="generic32 -DL_ENDIAN";;
|
|
||||||
mips*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
powerpc64*le*)machine=ppc64le;;
|
|
||||||
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";;
|
|
||||||
sh*) machine="generic32 -DL_ENDIAN";;
|
|
||||||
# TODO: Might want to do -mcpu probing like glibc to determine a
|
|
||||||
# better default for sparc-linux-gnu targets. This logic will
|
|
||||||
# break v7 and older systems when they use it.
|
|
||||||
sparc*v7*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
sparc64*) machine=sparcv9 system=linux64;;
|
|
||||||
sparc*v9*) machine=sparcv9;;
|
|
||||||
sparc*v8*) machine=sparcv8;;
|
|
||||||
sparc*) machine=sparcv8;;
|
|
||||||
s390x*) machine=s390x system=linux64;;
|
|
||||||
s390*) machine="generic32 -DB_ENDIAN";;
|
|
||||||
x86_64*:x32) machine=x32;;
|
|
||||||
x86_64*) machine=x86_64;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
BSD)
|
|
||||||
case ${chost_machine} in
|
|
||||||
alpha*) machine=generic64;;
|
|
||||||
i[6-9]86*) machine=x86-elf;;
|
|
||||||
ia64*) machine=ia64;;
|
|
||||||
sparc64*) machine=sparc64;;
|
|
||||||
x86_64*) machine=x86_64;;
|
|
||||||
*) machine=generic32;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
aix)
|
|
||||||
machine=${compiler}
|
|
||||||
;;
|
|
||||||
darwin)
|
|
||||||
case ${chost_machine} in
|
|
||||||
powerpc64) machine=ppc-cc; system=${system}64;;
|
|
||||||
powerpc) machine=ppc-cc;;
|
|
||||||
i?86*) machine=i386-cc;;
|
|
||||||
x86_64) machine=x86_64-cc; system=${system}64;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
hpux)
|
|
||||||
case ${chost_machine} in
|
|
||||||
ia64) machine=ia64-${compiler} ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
solaris)
|
|
||||||
case ${chost_machine} in
|
|
||||||
i386) machine=x86-${compiler} ;;
|
|
||||||
x86_64*) machine=x86_64-${compiler}; system=${system}64;;
|
|
||||||
sparcv9*) machine=sparcv9-${compiler}; system=${system}64;;
|
|
||||||
sparc*) machine=sparcv8-${compiler};;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
winnt)
|
|
||||||
machine=parity
|
|
||||||
;;
|
|
||||||
mingw*)
|
|
||||||
# special case ... no xxx-yyy style name
|
|
||||||
echo ${system}
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
|
|
||||||
# If we have something, show it
|
|
||||||
[[ -n ${machine} ]] && echo ${system}-${machine}
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
https://github.com/openssl/openssl/issues/7679
|
|
||||||
|
|
||||||
--- a/Configurations/unix-Makefile.tmpl
|
|
||||||
+++ b/Configurations/unix-Makefile.tmpl
|
|
||||||
@@ -77,8 +77,14 @@
|
|
||||||
# to. You're welcome.
|
|
||||||
sub dependmagic {
|
|
||||||
my $target = shift;
|
|
||||||
-
|
|
||||||
- return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
|
|
||||||
+ my $magic = <<"_____";
|
|
||||||
+$target: build_generated depend
|
|
||||||
+ \$(MAKE) _$target
|
|
||||||
+_$target
|
|
||||||
+_____
|
|
||||||
+ # Remove line ending
|
|
||||||
+ $magic =~ s|\R$||;
|
|
||||||
+ return $magic;
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
-}
|
|
||||||
|
|
@ -1,61 +0,0 @@
|
||||||
From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alistair Francis <alistair.francis@wdc.com>
|
|
||||||
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 <alistair.francis@wdc.com>
|
|
||||||
|
|
||||||
Reviewed-by: Richard Levitte <levitte@openssl.org>
|
|
||||||
Reviewed-by: Paul Dale <paul.dale@oracle.com>
|
|
||||||
(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
|
|
||||||
|
|
||||||
|
|
@ -1,52 +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)
|
|
||||||
---
|
|
||||||
test/v3ext.c | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/test/v3ext.c b/test/v3ext.c
|
|
||||||
index e96b6f79b58f..a2adb1a9f0ef 100644
|
|
||||||
--- 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -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);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>base-system@gentoo.org</email>
|
|
||||||
<name>Gentoo Base System</name>
|
|
||||||
</maintainer>
|
|
||||||
<use>
|
|
||||||
<flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
|
|
||||||
<flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
|
|
||||||
<flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
|
|
||||||
<flag name="tls-compression">Enable support for discouraged TLS compression</flag>
|
|
||||||
<flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag>
|
|
||||||
<flag name="weak-ssl-ciphers">Build support for SSL/TLS ciphers that are considered "weak"</flag>
|
|
||||||
</use>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="cpe">cpe:/a:openssl:openssl</remote-id>
|
|
||||||
</upstream>
|
|
||||||
<slots>
|
|
||||||
<slot name="0">For building against. This is the only slot
|
|
||||||
that provides headers and command line tools.</slot>
|
|
||||||
<slot name="0.9.8">For binary compatibility, provides libcrypto.so.0.9.8
|
|
||||||
and libssl.so.0.9.8 only.</slot>
|
|
||||||
<subslots>Reflect ABI of libcrypto.so and libssl.so.</subslots>
|
|
||||||
</slots>
|
|
||||||
</pkgmetadata>
|
|
||||||
|
|
@ -1,321 +0,0 @@
|
||||||
# Copyright 1999-2022 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="7"
|
|
||||||
|
|
||||||
inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
|
|
||||||
|
|
||||||
MY_P=${P/_/-}
|
|
||||||
|
|
||||||
DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
|
|
||||||
HOMEPAGE="https://www.openssl.org/"
|
|
||||||
SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
|
|
||||||
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-test-fixes-expiry.patch.xz
|
|
||||||
verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
|
|
||||||
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
|
|
||||||
|
|
||||||
LICENSE="openssl"
|
|
||||||
SLOT="0/1.1" # .so version of libssl/libcrypto
|
|
||||||
[[ "${PV}" = *_pre* ]] || \
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
|
|
||||||
IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 cpu_flags_x86_aes sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
RDEPEND=">=app-misc/c_rehash-1.7-r1
|
|
||||||
tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
|
|
||||||
cpu_flags_x86_aes? ( sys-kernel/cryptodev )
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
BDEPEND="
|
|
||||||
>=dev-lang/perl-5
|
|
||||||
sctp? ( >=net-misc/lksctp-tools-1.0.12 )
|
|
||||||
test? (
|
|
||||||
sys-apps/diffutils
|
|
||||||
sys-devel/bc
|
|
||||||
kernel_linux? ( sys-process/procps )
|
|
||||||
)
|
|
||||||
verify-sig? ( sec-keys/openpgp-keys-openssl )"
|
|
||||||
PDEPEND="app-misc/ca-certificates"
|
|
||||||
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
|
||||||
|
|
||||||
# force upgrade to prevent broken login, bug 696950
|
|
||||||
RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
|
|
||||||
|
|
||||||
MULTILIB_WRAPPED_HEADERS=(
|
|
||||||
usr/include/openssl/opensslconf.h
|
|
||||||
)
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
|
|
||||||
"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
|
|
||||||
"${WORKDIR}"/${P}-test-fixes-expiry.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
[[ ${MERGE_TYPE} == binary ]] && return
|
|
||||||
|
|
||||||
# must check in pkg_setup; sysctl don't work with userpriv!
|
|
||||||
if use test && use sctp; then
|
|
||||||
# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
|
|
||||||
# if sctp.auth_enable is not enabled.
|
|
||||||
local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
|
|
||||||
if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
|
|
||||||
die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
# Can delete this once test fix patch is dropped
|
|
||||||
if use verify-sig ; then
|
|
||||||
# Needed for downloaded patch (which is unsigned, which is fine)
|
|
||||||
verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
|
|
||||||
fi
|
|
||||||
|
|
||||||
default
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
# allow openssl to be cross-compiled
|
|
||||||
cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
|
|
||||||
chmod a+rx gentoo.config || die
|
|
||||||
|
|
||||||
# keep this in sync with app-misc/c_rehash
|
|
||||||
SSL_CNF_DIR="/etc/ssl"
|
|
||||||
|
|
||||||
# Make sure we only ever touch Makefile.org and avoid patching a file
|
|
||||||
# that gets blown away anyways by the Configure script in src_configure
|
|
||||||
rm -f Makefile
|
|
||||||
|
|
||||||
if ! use vanilla ; then
|
|
||||||
if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
|
|
||||||
[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
eapply_user #332661
|
|
||||||
|
|
||||||
if use test && use sctp && has network-sandbox ${FEATURES}; then
|
|
||||||
ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
|
|
||||||
rm test/recipes/80-test_ssl_new.t || die
|
|
||||||
eend $?
|
|
||||||
fi
|
|
||||||
|
|
||||||
# make sure the man pages are suffixed #302165
|
|
||||||
# don't bother building man pages if they're disabled
|
|
||||||
# Make DOCDIR Gentoo compliant
|
|
||||||
sed -i \
|
|
||||||
-e '/^MANSUFFIX/s:=.*:=ssl:' \
|
|
||||||
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
|
|
||||||
-e $(has noman FEATURES \
|
|
||||||
&& echo '/^install:/s:install_docs::' \
|
|
||||||
|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
|
|
||||||
-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
|
|
||||||
Configurations/unix-Makefile.tmpl \
|
|
||||||
|| die
|
|
||||||
|
|
||||||
# quiet out unknown driver argument warnings since openssl
|
|
||||||
# doesn't have well-split CFLAGS and we're making it even worse
|
|
||||||
# and 'make depend' uses -Werror for added fun (#417795 again)
|
|
||||||
[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
|
|
||||||
|
|
||||||
# We really, really need to build OpenSSL w/ strict aliasing disabled.
|
|
||||||
# It's filled with violations and it *will* result in miscompiled
|
|
||||||
# code. This has been in the ebuild for > 10 years but even in 2022,
|
|
||||||
# it's still relevant:
|
|
||||||
# - https://github.com/llvm/llvm-project/issues/55255
|
|
||||||
# - https://github.com/openssl/openssl/issues/18225
|
|
||||||
# Don't remove the no strict aliasing bits below!
|
|
||||||
filter-flags -fstrict-aliasing
|
|
||||||
append-flags -fno-strict-aliasing
|
|
||||||
|
|
||||||
append-cppflags -DOPENSSL_NO_BUF_FREELISTS
|
|
||||||
|
|
||||||
append-flags $(test-flags-CC -Wa,--noexecstack)
|
|
||||||
|
|
||||||
# Prefixify Configure shebang (#141906)
|
|
||||||
sed \
|
|
||||||
-e "1s,/usr/bin/env,${EPREFIX}&," \
|
|
||||||
-i Configure || die
|
|
||||||
# Remove test target when FEATURES=test isn't set
|
|
||||||
if ! use test ; then
|
|
||||||
sed \
|
|
||||||
-e '/^$config{dirs}/s@ "test",@@' \
|
|
||||||
-i Configure || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
|
|
||||||
# use GNU ld full option, not to confuse it on Solaris
|
|
||||||
sed -i \
|
|
||||||
-e 's/-Wl,-M,/-Wl,--version-script=/' \
|
|
||||||
-e 's/-Wl,-h,/-Wl,--soname=/' \
|
|
||||||
Configurations/10-main.conf || die
|
|
||||||
|
|
||||||
# fix building on Solaris 10
|
|
||||||
# https://github.com/openssl/openssl/issues/6333
|
|
||||||
sed -i \
|
|
||||||
-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
|
|
||||||
Configurations/10-main.conf || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# The config script does stupid stuff to prompt the user. Kill it.
|
|
||||||
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
|
|
||||||
./config --test-sanity || die "I AM NOT SANE"
|
|
||||||
|
|
||||||
multilib_copy_sources
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
unset APPS #197996
|
|
||||||
unset SCRIPTS #312551
|
|
||||||
unset CROSS_COMPILE #311473
|
|
||||||
|
|
||||||
tc-export CC AR RANLIB RC
|
|
||||||
|
|
||||||
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
|
|
||||||
|
|
||||||
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
|
|
||||||
|
|
||||||
# See if our toolchain supports __uint128_t. If so, it's 64bit
|
|
||||||
# friendly and can use the nicely optimized code paths. #460790
|
|
||||||
local ec_nistp_64_gcc_128
|
|
||||||
# Disable it for now though #469976
|
|
||||||
# echo "__uint128_t i;" > "${T}"/128.c
|
|
||||||
# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
|
|
||||||
# ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
|
|
||||||
# fi
|
|
||||||
|
|
||||||
local sslout=$(./gentoo.config)
|
|
||||||
einfo "Use configuration ${sslout:-(openssl knows best)}"
|
|
||||||
local config="Configure"
|
|
||||||
[[ -z ${sslout} ]] && config="config"
|
|
||||||
|
|
||||||
# "disable-deprecated" option breaks too many consumers.
|
|
||||||
# Don't set it without thorough revdeps testing.
|
|
||||||
# Make sure user flags don't get added *yet* to avoid duplicated
|
|
||||||
# flags.
|
|
||||||
CFLAGS= LDFLAGS= edo ./${config} \
|
|
||||||
${sslout} \
|
|
||||||
$(use cpu_flags_x86_sse2 || echo "no-sse2") \
|
|
||||||
$(use cpu_flags_x86_aes && echo "enable-devcryptoeng") \
|
|
||||||
enable-camellia \
|
|
||||||
enable-ec \
|
|
||||||
enable-ec2m \
|
|
||||||
enable-sm2 \
|
|
||||||
enable-srp \
|
|
||||||
$(use elibc_musl && echo "no-async") \
|
|
||||||
${ec_nistp_64_gcc_128} \
|
|
||||||
enable-idea \
|
|
||||||
enable-mdc2 \
|
|
||||||
enable-rc5 \
|
|
||||||
$(use_ssl sslv3 ssl3) \
|
|
||||||
$(use_ssl sslv3 ssl3-method) \
|
|
||||||
$(use_ssl asm) \
|
|
||||||
$(use_ssl rfc3779) \
|
|
||||||
$(use_ssl sctp) \
|
|
||||||
$(use test || echo "no-tests") \
|
|
||||||
$(use_ssl tls-compression zlib) \
|
|
||||||
$(use_ssl tls-heartbeat heartbeats) \
|
|
||||||
$(use_ssl weak-ssl-ciphers) \
|
|
||||||
--prefix="${EPREFIX}"/usr \
|
|
||||||
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
|
|
||||||
--libdir=$(get_libdir) \
|
|
||||||
shared threads
|
|
||||||
|
|
||||||
# Clean out hardcoded flags that openssl uses
|
|
||||||
local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
|
|
||||||
-e 's:^CFLAGS=::' \
|
|
||||||
-e 's:\(^\| \)-fomit-frame-pointer::g' \
|
|
||||||
-e 's:\(^\| \)-O[^ ]*::g' \
|
|
||||||
-e 's:\(^\| \)-march=[^ ]*::g' \
|
|
||||||
-e 's:\(^\| \)-mcpu=[^ ]*::g' \
|
|
||||||
-e 's:\(^\| \)-m[^ ]*::g' \
|
|
||||||
-e 's:^ *::' \
|
|
||||||
-e 's: *$::' \
|
|
||||||
-e 's: \+: :g' \
|
|
||||||
-e 's:\\:\\\\:g'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Now insert clean default flags with user flags
|
|
||||||
sed -i \
|
|
||||||
-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
|
|
||||||
-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
|
|
||||||
Makefile || die
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_compile() {
|
|
||||||
# depend is needed to use $confopts; it also doesn't matter
|
|
||||||
# that it's -j1 as the code itself serializes subdirs
|
|
||||||
emake -j1 depend
|
|
||||||
emake all
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_test() {
|
|
||||||
emake -j1 test
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install() {
|
|
||||||
# We need to create $ED/usr on our own to avoid a race condition #665130
|
|
||||||
if [[ ! -d "${ED}/usr" ]]; then
|
|
||||||
# We can only create this directory once
|
|
||||||
mkdir "${ED}"/usr || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
emake DESTDIR="${D}" install
|
|
||||||
|
|
||||||
# This is crappy in that the static archives are still built even
|
|
||||||
# when USE=static-libs. But this is due to a failing in the openssl
|
|
||||||
# build system: the static archives are built as PIC all the time.
|
|
||||||
# Only way around this would be to manually configure+compile openssl
|
|
||||||
# twice; once with shared lib support enabled and once without.
|
|
||||||
if ! use static-libs; then
|
|
||||||
rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install_all() {
|
|
||||||
# openssl installs perl version of c_rehash by default, but
|
|
||||||
# we provide a shell version via app-misc/c_rehash
|
|
||||||
rm "${ED}"/usr/bin/c_rehash || die
|
|
||||||
|
|
||||||
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
|
|
||||||
|
|
||||||
# create the certs directory
|
|
||||||
keepdir ${SSL_CNF_DIR}/certs
|
|
||||||
|
|
||||||
# Namespace openssl programs to prevent conflicts with other man pages
|
|
||||||
cd "${ED}"/usr/share/man || die
|
|
||||||
local m d s
|
|
||||||
for m in $(find . -type f | xargs grep -L '#include') ; do
|
|
||||||
d=${m%/*} ; d=${d#./} ; m=${m##*/}
|
|
||||||
[[ ${m} == openssl.1* ]] && continue
|
|
||||||
[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
|
|
||||||
mv ${d}/{,ssl-}${m}
|
|
||||||
# fix up references to renamed man pages
|
|
||||||
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
|
|
||||||
ln -s ssl-${m} ${d}/openssl-${m}
|
|
||||||
# locate any symlinks that point to this man page ... we assume
|
|
||||||
# that any broken links are due to the above renaming
|
|
||||||
for s in $(find -L ${d} -type l) ; do
|
|
||||||
s=${s##*/}
|
|
||||||
rm -f ${d}/${s}
|
|
||||||
# We don't want to "|| die" here
|
|
||||||
ln -s ssl-${m} ${d}/ssl-${s}
|
|
||||||
ln -s ssl-${s} ${d}/openssl-${s}
|
|
||||||
done
|
|
||||||
done
|
|
||||||
[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
|
|
||||||
|
|
||||||
dodir /etc/sandbox.d #254521
|
|
||||||
echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
|
|
||||||
|
|
||||||
diropts -m0700
|
|
||||||
keepdir ${SSL_CNF_DIR}/private
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
|
|
||||||
c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue