Merge pull request #2391 from blshkv/master

openssl-bad
This commit is contained in:
github-actions[bot] 2025-06-14 09:18:13 +00:00 committed by GitHub
commit 043fd6c55c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 245 additions and 79 deletions

View file

@ -1,4 +1,5 @@
DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
DIST openssl-bad-1.0.2_p20220901.tar.gz 5530282 BLAKE2B 4e5311392596e40f491e36dbb79d41b20c7fc55d11396a828af23e76eb436e4eb5395cc5285f10dc14dab0be732db0eefe80beba15ecbec814da310526ce9285 SHA512 41b4e3d48e5ad090466ca90b4c6b1be1b166cd2978011f65b67502ca1b9fd0130796cc0d8c87908f0eaf342c9a1fb29f7c9f84c6f1fded8d2999099c12c227ed
DIST openssl-bad-1.0.2_p20250104.gh.tar.gz 5529207 BLAKE2B 8187086c1b566da364ffbb7d39816750445328d33a7c93d21a62219191e2de4ab3c4fa85493d421de36ef802dff540b567a22c47e0a8a176847fcdbca13cfa92 SHA512 ceaf16082f8e14bd24c6910c8d8a5f48361f02d9f9a5a471b456a91e06fabc08c81ffe71a4c5605fa9f62e927fd66626268ae49e8eb4bc5b72ae14361305934c
DIST openssl-bad-1.0.2_p20250331.gh.tar.gz 5533135 BLAKE2B 28a2e439e1121f4ed406f9d72b6d7b0163954585064b3d8b1b4b87133ff8435d9572ace3e71fa4bc9f7b81c66158bb05d088342e7f02d3a2b5cce0d45eb81de8 SHA512 de0e62e1945919256bf4d5811d4df3bf67f6e6dafb98ca9b753397833f07362333495d485c842880d785cb4767a2019415c8d319218bdb0039d9d3bac98746f6
DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9

View file

@ -0,0 +1,243 @@
# Copyright 2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic toolchain-funcs multilib-minimal
# This patch set is based on the following files from Fedora 25,
# see https://src.fedoraproject.org/rpms/openssl/blob/25/f/openssl.spec
# for more details:
# - hobble-openssl (SOURCE1)
# - ec_curve.c (SOURCE12) -- MODIFIED
# - ectest.c (SOURCE13)
# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
BINDIST_PATCH_SET="openssl-1.0.2t-bindist-1.0.tar.xz"
DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
HOMEPAGE="https://github.com/testssl/openssl-1.0.2.bad"
HASH_COMMIT="ee2d6ea7a70c01aae48269ba32f26557668fb1fe"
SRC_URI="https://github.com/drwetter/openssl-1.0.2.bad/archive/${HASH_COMMIT}.tar.gz -> ${P}.gh.tar.gz
mirror://gentoo/ec/openssl-compat-1.0.2u-versioned-symbols.patch.gz
mirror://gentoo/bb/${BINDIST_PATCH_SET}
"
S="${WORKDIR}/openssl-1.0.2.bad-${HASH_COMMIT}"
LICENSE="openssl"
SLOT="1.0.2"
KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="+asm bindist gmp +kerberos rfc3779 sctp cpu_flags_x86_sse2 +sslv2 +sslv3 static-libs test +tls-heartbeat vanilla tls-compression"
RESTRICT="!bindist? ( bindist )
test"
RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
!=dev-libs/openssl-1.0.2*:0
!dev-libs/openssl:1.0.0
!dev-libs/openssl-compat:1.0.0"
DEPEND="${RDEPEND}"
BDEPEND="
>=dev-lang/perl-5
sctp? ( >=net-misc/lksctp-tools-1.0.12 )
test? (
sys-apps/diffutils
app-alternatives/bc
)"
MULTILIB_WRAPPED_HEADERS=(
usr/include/openssl/opensslconf.h
)
src_prepare() {
# fix https://github.com/testssl/openssl-1.0.2.bad/issues/3
append-cflags -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types
#mv "${WORKDIR}"/openssl-compat-1.0.2u-versioned-symbols.patch "${WORKDIR}"/patch || die
if use bindist; then
mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
bash "${WORKDIR}"/hobble-openssl || die
cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/crypto/ec/ || die
eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
# Also see the configure parts below:
# enable-ec \
# $(use_ssl !bindist ec2m) \
# $(use_ssl !bindist srp) \
fi
# 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
eapply "${FILESDIR}"/patch/*.patch
fi
# Fix https://github.com/testssl/openssl-1.0.2.bad/issues/3
#eapply "${FILESDIR}"/4.patch
eapply_user
# disable fips in the build
# make sure the man pages are suffixed #302165
# don't bother building man pages if they're disabled
sed -i \
-e '/DIRS/s: fips : :g' \
-e '/^MANSUFFIX/s:=.*:=ssl:' \
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-e $(has noman FEATURES \
&& echo '/^install:/s:install_docs::' \
|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
Makefile.org \
|| die
# show the actual commands in the log
sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
# since we're forcing $(CC) as makedep anyway, just fix
# the conditional as always-on
# helps clang (#417795), and versioned gcc (#499818)
# this breaks build with 1.0.2p, not sure if it is needed anymore
#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || 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
# allow openssl to be cross-compiled
cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
chmod a+rx gentoo.config || die
append-flags -fno-strict-aliasing
append-flags $(test-flags-CC -Wa,--noexecstack)
append-cppflags -DOPENSSL_NO_BUF_FREELISTS
sed -i '1s,^:$,#!'"${EPREFIX}"'/usr/bin/perl,' Configure #141906
# 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
# Clean out patent-or-otherwise-encumbered code
# Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher)
# IDEA: Expired https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
# EC: ????????? ??/??/2015 https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
# MDC2: Expired https://en.wikipedia.org/wiki/MDC-2
# RC5: Expired https://en.wikipedia.org/wiki/RC5
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
echoit() { echo "$@" ; "$@" ; }
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=$(./gentoo.config)
einfo "Use configuration ${sslout:-(openssl knows best)}"
local config="Configure"
[[ -z ${sslout} ]] && config="config"
STDOPTIONS="--prefix=/usr/ --openssldir=/etc/ssl -DOPENSSL_USE_BUILD_DATE enable-zlib \
enable-ssl2 enable-ssl3 enable-ssl-trace enable-rc5 enable-rc2 \
enable-gost enable-cms enable-md2 enable-mdc2 enable-ec enable-ec2m enable-ecdh enable-ecdsa \
enable-seed enable-camellia enable-idea enable-rfc3779 experimental-jpake"
# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
# Make sure user flags don't get added *yet* to avoid duplicated
# flags.
CFLAGS= LDFLAGS= echoit \
./${config} \
${sslout} \
$(use cpu_flags_x86_sse2 || echo "no-sse2") \
enable-camellia \
enable-ec \
$(use_ssl !bindist ec2m) \
$(use_ssl !bindist srp) \
${ec_nistp_64_gcc_128} \
enable-idea \
enable-mdc2 \
enable-rc5 \
enable-tlsext \
enable-cast \
enable-ripemd \
$(use_ssl asm) \
$(use_ssl gmp gmp -lgmp) \
$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
$(use_ssl rfc3779) \
$(use_ssl sctp) \
$(use_ssl sslv2 ssl2) \
$(use_ssl sslv3 ssl3) \
$(use_ssl tls-compression zlib) \
$(use_ssl tls-heartbeat heartbeats) \
--prefix="${EPREFIX}"/usr \
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
--libdir=$(get_libdir) \
-static threads $STDOPTIONS \
|| die
# Clean out hardcoded flags that openssl uses
local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-e 's:^CFLAG=::' \
-e 's:-fomit-frame-pointer ::g' \
-e 's:-O[0-9] ::g' \
-e 's:-march=[-a-z0-9]* ::g' \
-e 's:-mcpu=[-a-z0-9]* ::g' \
-e 's:-m[a-z0-9]* ::g' \
)
# Now insert clean default flags with user flags
sed -i \
-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
Makefile || die
#why is this run in src_configure and src_compile?
emake -j1 depend
}
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 V=1 depend
emake all
# rehash is needed to prep the certs/ dir; do this
# separately to avoid parallel build issues.
#emake rehash
}
multilib_src_test() {
emake -j1 test
}
multilib_src_install() {
newbin apps/openssl openssl-bad
}

View file

@ -1,4 +1,3 @@
DIST testssl-3.0.8.tar.gz 9372229 BLAKE2B cf463236fb0812c2bc5fd5673d0d2d395fc405697817827ee8c660c96d789601a090b57febd48400e33fd9f28b23d42d432734b176b23a8e8ddf710c9b275485 SHA512 4634bc5dc57ad8910ca097b22d86511a26e855fb4dc7bef9550a795cb1f53a959b8472008756b40a670d7433ad56236b5a36fe0c88c15de99fdf586e9919b080
DIST testssl-3.0.9.tar.gz 9381651 BLAKE2B 424569411022b68f105a20ad5b60db7c8994d1170482612ae7aed741230bd3fca43cd853dfb00660d5ba7cfdc717fa887a2fe9b6c59bbcef881f8f6473ccad3e SHA512 006180d175492f1cba6d056a92a57247725d4b68cddbebeea80a5d339d542f5103ddc8226f3a554775cb83bbef836a5d5bfc1bcf4fba7b18b9541473122ff720
DIST testssl-3.2.0.tar.gz 6976478 BLAKE2B 96723724ba616dbf0e16465379e8c3c2f7ebe68102a8da6c7449c92d12bdb13b38b4cb35b023ce674f35d12eece42790e945b26238362782feab2a0d16736a47 SHA512 e1667e5273f58fac8f3a11a0a866ccc80c84e23d7508bbf9ab55b7a599326a68d385f65032600fcff0951eee4acd71df9813b093d76c1800e220b3bdd34a3ccb
DIST testssl-3.2.1.tar.gz 6978887 BLAKE2B ecbc5481b60c02ce51ccd6669880c1d755896fc67edead72e39b12046048b44799f0449267e77266c4b25fcc6ab547be6f9d715f10dd6c6704f5c9187ab02418 SHA512 d8dfe4ca6157668d2fecc72fa15dde77e557ae3230698068454aea957ff01b94c751c5f267da8b97d702b35718274726f1d520b88c5357e6ff4c9298f955ffb8
DIST testssl-3.2_rc4.gh.tar.gz 9541270 BLAKE2B 6b20b6ad5f28f7c315c98092b9f6b258478a19f5324a1db344c0dafb20233fefee211604f9d81be3c52e672c4a73e9f6ac8ef3dc09f7e31a9b54e5aabef3afc0 SHA512 079dd361aaa5bf14f2a80d77b3ffb675c27b05a974ae0af2848ee5c49c9b0e31f62cccada540a740e3ae13b6d018636f681c106bc6c53b7ccd2aee3844374ae6

View file

@ -1,77 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="Tool to check TLS/SSL cipher support"
HOMEPAGE="https://testssl.sh/"
SRC_URI="https://github.com/drwetter/testssl.sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/testssl.sh-${PV}"
LICENSE="GPL-2 bundled-openssl? ( openssl )"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
IUSE="+bundled-openssl kerberos"
REQUIRED_USE="bundled-openssl? ( || ( amd64 x86 ) )"
# openssl-bad provides 197 ciphers
# bundled-openssl has 183 ciphers
# openssl (gentoo) 80 ciphers only
RDEPEND="
app-shells/bash[net]
net-dns/bind-tools
sys-apps/util-linux
sys-libs/ncurses:0
sys-process/procps
bundled-openssl? (
kerberos? (
sys-libs/zlib
virtual/krb5
)
)
!bundled-openssl? ( dev-libs/openssl-bad )"
QA_PREBUILT="opt/${PN}/*"
pkg_setup() {
if use amd64; then
if use kerberos; then
BUNDLED_OPENSSL="openssl.Linux.x86_64.krb"
else
BUNDLED_OPENSSL="openssl.Linux.x86_64"
fi
elif use x86; then
BUNDLED_OPENSSL="openssl.Linux.i686"
fi
}
src_prepare() {
default
sed -i ${PN}.sh \
-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
#Gentoo hack find_openssl_binary(), we do it better
if use bundled-openssl; then
sed -i ${PN}.sh \
-e "s|OPENSSL=\"\$1/openssl\"|OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"|" || die
else
sed -i ${PN}.sh \
-e 's|OPENSSL="$1/openssl"|OPENSSL="$1/openssl-bad"|' || die
fi
}
src_install() {
dodoc CHANGELOG.md CREDITS.md Readme.md
dodoc openssl-iana.mapping.html
dobin ${PN}.sh
insinto /etc/${PN}
doins etc/*
if use bundled-openssl; then
exeinto /opt/${PN}
use amd64 && doexe bin/${BUNDLED_OPENSSL}
fi
}