diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-05-17-openssl-3.0.3.md b/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-05-17-openssl-3.0.3.md new file mode 100644 index 0000000000..9a7855c46c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-05-17-openssl-3.0.3.md @@ -0,0 +1 @@ +- openssl ([CVE-2022-1292](https://nvd.nist.gov/vuln/detail/CVE-2022-1292), [CVE-2022-1343](https://nvd.nist.gov/vuln/detail/CVE-2022-1343), [CVE-2022-1434](https://nvd.nist.gov/vuln/detail/CVE-2022-1434), [CVE-2022-1473](https://nvd.nist.gov/vuln/detail/CVE-2022-1473)) diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-05-17-openssl-3.0.3.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-05-17-openssl-3.0.3.md new file mode 100644 index 0000000000..70dac55522 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-05-17-openssl-3.0.3.md @@ -0,0 +1 @@ +- openssl ([3.0.3](https://www.openssl.org/news/changelog.html#openssl-30)) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/Manifest index a1a7a98a06..0f681d0af1 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/Manifest @@ -1 +1,2 @@ -DIST openssl-3.0.2.tar.gz 15038141 BLAKE2B 140c4c80a0cad89cb0059fef6a4cd421460e6af9a3973f7a3eb5e39f64c0d44794d46e7a869e5235fced139f2249351e37a9ee5ebaa17f2708d63141ebebf919 SHA512 f986850d5be908b4d6b5fd7091bc4652d7378c9bccebfbc5becd7753843c04c1eb61a1749c432139d263dfac33df0b1f6c773664b485cad47542266823a4eb03 +DIST openssl-3.0.3.tar.gz 15058905 BLAKE2B 8141d13dbea2f1febdd4e46aa404e9f3bac51e1fdc0c9b0df8bf3bf6852e18b09201a2a8cbee99f72e8d6de660834093449b7a14a3fbdda8511286ca3b6743e7 SHA512 949472025211fabdaf2564122f0a9a3baef0facb6373e90cf6c4485164a50898050b179722d0b358c4d8cf1787384ea30d5fd03b98757634631d3e8978509b1a +DIST openssl-3.0.3.tar.gz.asc 488 BLAKE2B 3f31e3a73706b69683220e05b1b4ddc75dc3e7e12652dca711e4aa0eb3c023ef736aee9ade15172d7f28e1e1af03e86d4854ec6c3d167cad42882f483c5e56d4 SHA512 04afe65c6af1ae43a9967462383a6a4f567f5acff19ec1952cd6fce2dc3c3d4dfb3cb54126562724c148f40dcb66668abf727282d35730bbf36f82b5c6bacace diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-1.0.2 b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-1.0.2 index 68d7d0ac1f..caa569588f 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-1.0.2 +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-1.0.2 @@ -97,6 +97,7 @@ linux) 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";; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/metadata.xml index e0b7df7365..7aeb3cfc9e 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/metadata.xml @@ -15,6 +15,7 @@ Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https Enable support for discouraged TLS compression Enable the Heartbeat Extension in TLS and DTLS + Build support for SSL/TLS ciphers that are considered "weak" cpe:/a:openssl:openssl diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-3.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-3.0.3.ebuild similarity index 75% rename from sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-3.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-3.0.3.ebuild index 2bb7672f7a..a5dfd07325 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-3.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-3.0.3.ebuild @@ -4,33 +4,35 @@ EAPI="7" TMPFILES_OPTIONAL=1 -inherit flag-o-matic linux-info toolchain-funcs multilib-minimal systemd tmpfiles - -MY_P=${P/_/-} +inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig systemd tmpfiles DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" HOMEPAGE="https://www.openssl.org/" -if [[ ${PV} == "9999" ]] ; then +MY_P=${P/_/-} + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/openssl/openssl.git" inherit git-r3 else - SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" + SRC_URI="mirror://openssl/source/${MY_P}.tar.gz + verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" fi +S="${WORKDIR}"/${MY_P} + LICENSE="Apache-2.0" SLOT="0/3" # .so version of libssl/libcrypto - -IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla" +IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" RESTRICT="!test? ( test )" COMMON_DEPEND=" >=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) " - BDEPEND=" >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) @@ -38,20 +40,22 @@ BDEPEND=" sys-apps/diffutils sys-devel/bc sys-process/procps - )" + ) + verify-sig? ( sec-keys/openpgp-keys-openssl )" DEPEND="${COMMON_DEPEND}" - RDEPEND="${COMMON_DEPEND}" - PDEPEND="app-misc/ca-certificates" -S="${WORKDIR}/${MY_P}" - MULTILIB_WRAPPED_HEADERS=( /usr/include/openssl/configuration.h ) +PATCHES=( + # General patches which are suitable to always apply + # If they're Gentoo specific, add to USE=-vanilla logic in src_prepare! +) + pkg_setup() { if use ktls ; then if kernel_is -lt 4 18 ; then @@ -67,7 +71,7 @@ pkg_setup() { [[ ${MERGE_TYPE} == binary ]] && return - # must check in pkg_setup; sysctl don't work with userpriv! + # 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. @@ -79,11 +83,11 @@ pkg_setup() { } src_prepare() { - # allow openssl to be cross-compiled + # 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 + # 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 @@ -91,21 +95,21 @@ src_prepare() { rm -f Makefile if ! use vanilla ; then - if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then - [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" - fi + PATCHES+=( + # Add patches which are Gentoo-specific customisations here + ) fi - eapply_user + 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 - # make sure the man pages are suffixed #302165 - # don't bother building man pages if they're disabled - # Make DOCDIR Gentoo compliant + # - Make sure the man pages are suffixed (bug #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):' \ @@ -116,15 +120,15 @@ src_prepare() { Configurations/unix-Makefile.tmpl \ || die - # quiet out unknown driver argument warnings since openssl + # 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 + # and 'make depend' uses -Werror for added fun (bug #417795 again) + tc-is-clang && append-flags -Qunused-arguments append-flags -fno-strict-aliasing append-flags $(test-flags-CC -Wa,--noexecstack) - # Prefixify Configure shebang (#141906) + # Prefixify Configure shebang (bug #141906) sed \ -e "1s,/usr/bin/env,${EPREFIX}&," \ -i Configure || die @@ -136,7 +140,7 @@ src_prepare() { -i Configure || die fi - # The config script does stupid stuff to prompt the user. Kill it. + # 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" @@ -144,24 +148,28 @@ src_prepare() { } multilib_src_configure() { - unset APPS #197996 - unset SCRIPTS #312551 - unset CROSS_COMPILE #311473 + # bug #197996 + unset APPS + # bug #312551 + unset SCRIPTS + # bug #311473 + unset CROSS_COMPILE tc-export AR CC CXX RANLIB RC 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") local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" + einfo "Using configuration: ${sslout:-(openssl knows best)}" local config="Configure" [[ -z ${sslout} ]] && config="config" + # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features local myeconfargs=( ${sslout} + $(use cpu_flags_x86_sse2 || echo "no-sse2") enable-camellia enable-ec @@ -177,18 +185,21 @@ multilib_src_configure() { $(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) + shared threads ) - CFLAGS= LDFLAGS= echoit \ + CFLAGS= LDFLAGS= edo \ ./${config} \ - "${myeconfargs[@]}" \ - || die + "${myeconfargs[@]}" # Clean out hardcoded flags that openssl uses local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ @@ -216,24 +227,24 @@ 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 + # VFP = show subtests verbosely and show failed tests verbosely + # Normal V=1 would show everything verbosely but this slows things down. + emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 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 + # We need to create ${ED}/usr on our own to avoid a race condition (bug #665130) + dodir /usr 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 + # 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. @@ -261,15 +272,16 @@ multilib_src_install_all() { mv ${d}/{,ssl-}${m} || die - # fix up references to renamed man pages + # Fix up references to renamed man pages sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die ln -s ssl-${m} ${d}/openssl-${m} || die - # locate any symlinks that point to this man page ... - # we assume that any broken links are due to the above renaming + # 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} @@ -277,7 +289,8 @@ multilib_src_install_all() { done [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - dodir /etc/sandbox.d #254521 + # bug #254521 + dodir /etc/sandbox.d echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl # flatcar changes: do not keep the sample CA files in `/etc`