commit: a2a8c4d5e3dbfa27c94f5ef9de5649f14e34f9fc Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Feb 23 17:00:34 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 23 17:00:34 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2a8c4d5
dev-libs/openssl: backport two ppc64 fixes Closes: https://bugs.gentoo.org/969389 Signed-off-by: Sam James <sam <AT> gentoo.org> .../openssl/files/openssl-3.5.5-ppc64-be.patch | 45 +++ dev-libs/openssl/files/openssl-3.5.5-ppc64.patch | 45 +++ dev-libs/openssl/openssl-3.5.5-r2.ebuild | 341 +++++++++++++++++++++ 3 files changed, 431 insertions(+) diff --git a/dev-libs/openssl/files/openssl-3.5.5-ppc64-be.patch b/dev-libs/openssl/files/openssl-3.5.5-ppc64-be.patch new file mode 100644 index 000000000000..fa28166a4601 --- /dev/null +++ b/dev-libs/openssl/files/openssl-3.5.5-ppc64-be.patch @@ -0,0 +1,45 @@ +https://github.com/openssl/openssl/issues/29845 +https://github.com/openssl/openssl/commit/b02b04fbad809c82efbf1e3274e6a22caf997b8d + +From b02b04fbad809c82efbf1e3274e6a22caf997b8d Mon Sep 17 00:00:00 2001 +From: Neil Horman <[email protected]> +Date: Mon, 9 Feb 2026 12:55:50 -0500 +Subject: [PATCH] don't use asm accelerated path on big endian power9 + +https://github.com/openssl/openssl/issues/29845 + +Found that our hardware accelerated path doesn't work on big endian +systems, so make sure that we only use it when little endian is defined + +We also noted that PPC_AES_GCM_CAPABLE gets defined to zero when the +capabilities register notes that the hardware isn't capable of the +needed instructions, but that still includes the asm path as +PPC_AES_GCM_CAPABLE is still defined. + +Fix both issues + +Fixes #29845 + +Reviewed-by: Tomas Mraz <[email protected]> +Reviewed-by: Tom Cosgrove <[email protected]> +MergeDate: Tue Feb 17 14:11:46 2026 +(Merged from https://github.com/openssl/openssl/pull/29968) +--- + include/crypto/aes_platform.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h +index 496b08f46d5ce..95d13d22e191b 100644 +--- a/include/crypto/aes_platform.h ++++ b/include/crypto/aes_platform.h +@@ -77,7 +77,9 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len, + #define HWAES_xts_decrypt aes_p8_xts_decrypt + #endif /* OPENSSL_SYS_MACOSX */ + #if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX) ++#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + #define PPC_AES_GCM_CAPABLE (OPENSSL_ppccap_P & PPC_MADD300) ++#endif + #define AES_GCM_ENC_BYTES 128 + #define AES_GCM_DEC_BYTES 128 + size_t ppc_aes_gcm_encrypt(const unsigned char *in, unsigned char *out, + diff --git a/dev-libs/openssl/files/openssl-3.5.5-ppc64.patch b/dev-libs/openssl/files/openssl-3.5.5-ppc64.patch new file mode 100644 index 000000000000..2d4e7a133410 --- /dev/null +++ b/dev-libs/openssl/files/openssl-3.5.5-ppc64.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/969389 +https://github.com/openssl/openssl/issues/29815 +--- a/crypto/modes/asm/aes-gcm-ppc.pl ++++ b/crypto/modes/asm/aes-gcm-ppc.pl +@@ -409,7 +409,6 @@ + ################################################################################ + .align 4 + aes_gcm_crypt_1x: +-.localentry aes_gcm_crypt_1x,0 + + cmpdi 5, 16 + bge __More_1x +@@ -492,7 +491,6 @@ + ################################################################################ + .align 4 + __Process_partial: +-.localentry __Process_partial,0 + + # create partial mask + vspltisb 16, -1 +@@ -564,7 +562,6 @@ + .global ppc_aes_gcm_encrypt + .align 5 + ppc_aes_gcm_encrypt: +-.localentry ppc_aes_gcm_encrypt,0 + + SAVE_REGS + LOAD_HASH_TABLE +@@ -752,7 +749,6 @@ + .global ppc_aes_gcm_decrypt + .align 5 + ppc_aes_gcm_decrypt: +-.localentry ppc_aes_gcm_decrypt, 0 + + SAVE_REGS + LOAD_HASH_TABLE +@@ -1032,7 +1028,6 @@ + .size ppc_aes_gcm_decrypt,.-ppc_aes_gcm_decrypt + + aes_gcm_out: +-.localentry aes_gcm_out,0 + + mr 3, 11 # return count + + diff --git a/dev-libs/openssl/openssl-3.5.5-r2.ebuild b/dev-libs/openssl/openssl-3.5.5-r2.ebuild new file mode 100644 index 000000000000..ae7ed6ef47df --- /dev/null +++ b/dev-libs/openssl/openssl-3.5.5-r2.ebuild @@ -0,0 +1,341 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc +inherit edo flag-o-matic linux-info sysroot toolchain-funcs +inherit multibuild multilib multilib-build multiprocessing preserve-libs + +DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" +HOMEPAGE="https://openssl-library.org/"; + +MY_P=${P/_/-} + +if [[ ${PV} == *9999 ]] ; then + [[ ${PV} == *.*.9999 ]] && EGIT_BRANCH="openssl-${PV%%.9999}" + EGIT_REPO_URI="https://github.com/openssl/openssl.git"; + + inherit git-r3 +else + inherit verify-sig + SRC_URI=" + https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz + verify-sig? ( + https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc + ) + " + + if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" + fi + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )" +fi + +S="${WORKDIR}"/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto +IUSE="+asm cpu_flags_x86_sse2 fips ktls +quic rfc3779 sctp static-libs test tls-compression vanilla weak-ssl-ciphers" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + !<net-misc/openssh-9.2_p1-r3 + tls-compression? ( >=virtual/zlib-1.2.8-r1:=[static-libs(+)?,${MULTILIB_USEDEP}] ) +" +BDEPEND+=" + >=dev-lang/perl-5 + sctp? ( >=net-misc/lksctp-tools-1.0.12 ) + test? ( + sys-apps/diffutils + app-alternatives/bc + sys-process/procps + ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +PDEPEND="app-misc/ca-certificates" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/openssl/configuration.h +) + +PATCHES=( + "${FILESDIR}"/${PN}-3.5.5-ppc64.patch + "${FILESDIR}"/${PN}-3.5.5-ppc64-be.patch +) + +pkg_setup() { + if use ktls ; then + if kernel_is -lt 4 18 ; then + ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" + else + CONFIG_CHECK="~TLS ~TLS_DEVICE" + ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" + ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" + use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" + + linux-info_pkg_setup + fi + fi + + [[ ${MERGE_TYPE} == binary ]] && return + + # must check in pkg_setup; sysctl doesn'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_prepare() { + # 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 || die + + if ! use vanilla ; then + PATCHES+=( + # Add patches which are Gentoo-specific customisations here + ) + fi + + default + + if use test && use sctp && has network-sandbox ${FEATURES} ; then + einfo "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 + fi + + # Test fails depending on kernel configuration, bug #699134 + rm test/recipes/30-test_afalg.t || die +} + +_openssl_variant() { + local OPENSSL_VARIANT=${MULTIBUILD_VARIANT} + mkdir -p "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + "$@" + popd >/dev/null || die +} + +openssl_foreach_variant() { + local MULTIBUILD_VARIANTS=( "${OPENSSL_VARIANTS[@]}" ) + multibuild_foreach_variant _openssl_variant "$@" +} + +openssl_run_phase() { + multilib_foreach_abi openssl_foreach_variant "$@" +} + +openssl_is_default_variant() { + [[ ${OPENSSL_VARIANT} == shared ]] && multilib_is_native_abi +} + +src_configure() { + # Keep this in sync with app-misc/c_rehash + SSL_CNF_DIR="/etc/ssl" + + # 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 (bug #417795 again) + tc-is-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/12247 + # - https://github.com/openssl/openssl/issues/18225 + # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 + # Don't remove the no strict aliasing bits below! + filter-flags -fstrict-aliasing + append-flags -fno-strict-aliasing + # The OpenSSL developers don't test with LTO right now, it leads to various + # warnings/errors (which may or may not be false positives), it's considered + # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663. + filter-lto + + append-flags $(test-flags-CC -Wa,--noexecstack) + + # bug #895308 -- check inserts GNU ld-compatible arguments + [[ ${CHOST} == *-darwin* ]] || append-atomic-flags + # Configure doesn't respect LIBS + export LDLIBS="${LIBS}" + + # bug #197996 + unset APPS + # bug #312551 + unset SCRIPTS + # bug #311473 + unset CROSS_COMPILE + + tc-export AR CC CXX RANLIB RC + + OPENSSL_VARIANTS=( shared ) + use static-libs && OPENSSL_VARIANTS+=( static ) + + openssl_run_phase openssl_src_configure +} + +openssl_src_configure() { + 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, bug #460790. + #local ec_nistp_64_gcc_128 + # + # Disable it for now though (bug #469976) + # Do NOT re-enable without substantial discussion first! + # + #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=$(bash "${FILESDIR}/gentoo.config-1.0.4") + einfo "Using configuration: ${sslout:-(openssl knows best)}" + + # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features + local myeconfargs=( + ${sslout} + + $(openssl_is_default_variant || echo "no-docs") + $(use cpu_flags_x86_sse2 || echo "no-sse2") + enable-camellia + enable-ec + enable-ec2m + enable-sm2 + enable-srp + $(use elibc_musl && echo "no-async") + enable-idea + enable-mdc2 + enable-rc5 + $(use fips && echo "enable-fips") + $(use quic && echo "enable-quic") + $(use_ssl asm) + $(use_ssl ktls) + $(use_ssl rfc3779) + $(use_ssl sctp) + $(use test || echo "no-tests") + $(use_ssl tls-compression zlib) + $(use_ssl weak-ssl-ciphers) + + --prefix="${EPREFIX}"/usr + --openssldir="${EPREFIX}"${SSL_CNF_DIR} + --libdir=$(get_libdir) + + threads + ) + + if [[ ${OPENSSL_VARIANT} == static ]]; then + myeconfargs+=( no-module no-shared ) + fi + + edo perl "${S}/Configure" "${myeconfargs[@]}" +} + +src_compile() { + openssl_run_phase openssl_src_compile +} + +openssl_src_compile() { + emake build_sw + if openssl_is_default_variant; then + emake build_docs + fi +} + +src_test() { + openssl_run_phase openssl_src_test +} + +openssl_src_test() { + # See https://github.com/openssl/openssl/blob/master/test/README.md for options. + # + # VFP = show subtests verbosely and show failed tests verbosely + # Normal V=1 would show everything verbosely but this slows things down. + # + # -j1 here for https://github.com/openssl/openssl/issues/21999, but it + # shouldn't matter as tests were already built earlier, and HARNESS_JOBS + # controls running the tests. + emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test +} + +openssl_src_install() { + if [[ ${OPENSSL_VARIANT} == static ]]; then + dolib.a libcrypto.a libssl.a + return + fi + + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake DESTDIR="${D}" -j1 install_sw + rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die + + if use fips; then + emake DESTDIR="${D}" -j1 install_fips + # Regen this in pkg_preinst, bug 900625 + rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die + fi + + if openssl_is_default_variant; then + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs + fi + + multilib_prepare_wrappers + multilib_check_headers +} + +src_install() { + openssl_run_phase openssl_src_install + multilib_install_wrappers + + # 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 {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el + + # Create the certs directory + keepdir ${SSL_CNF_DIR}/certs + + # bug #254521 + dodir /etc/sandbox.d + echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl + + diropts -m0700 + keepdir ${SSL_CNF_DIR}/private +} + +pkg_preinst() { + if use fips; then + # Regen fipsmodule.cnf, bug 900625 + einfo "Running openssl fipsinstall" + LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ + sysroot_run_prefixed "${ED}/usr/bin/openssl" fipsinstall \ + -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ + -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" \ + || die "fipsinstall failed" + fi + + preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ + /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) +} + +pkg_postinst() { + ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" + openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" + eend $? + + preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ + /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) +}
