openssl: update to v1.1.1l
This fixes the following CVEs:
* CVE-2021-3711
* CVE-2021-3712
Port the recipe and patches from the dunfell poky branch, since the hardknott
version contains additional changes aside from the revision update.
https://onedigi.atlassian.net/browse/DEL-7647
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar
parent
96f54105d3
commit
4876bc07b6
|
|
@ -0,0 +1 @@
|
|||
export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf"
|
||||
|
|
@ -0,0 +1,76 @@
|
|||
From 3e1d00481093e10775eaf69d619c45b32a4aa7dc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
|
||||
Date: Tue, 6 Nov 2018 14:50:47 +0100
|
||||
Subject: [PATCH] buildinfo: strip sysroot and debug-prefix-map from compiler
|
||||
info
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The openssl build system generates buildinf.h containing the full
|
||||
compiler command line used to compile objects. This breaks
|
||||
reproducibility, as the compile command is baked into libcrypto, where
|
||||
it is used when running `openssl version -f`.
|
||||
|
||||
Add stripped build variables for the compiler and cflags lines, and use
|
||||
those when generating buildinfo.h.
|
||||
|
||||
This is based on a similar patch for older openssl versions:
|
||||
https://patchwork.openembedded.org/patch/147229/
|
||||
|
||||
Upstream-Status: Inappropriate [OE specific]
|
||||
Signed-off-by: Martin Hundebøll <martin@geanix.com>
|
||||
|
||||
|
||||
Update to fix buildpaths qa issue for '-fmacro-prefix-map'.
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
---
|
||||
Configurations/unix-Makefile.tmpl | 10 +++++++++-
|
||||
crypto/build.info | 2 +-
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
|
||||
index 16af4d2087..54c162784c 100644
|
||||
--- a/Configurations/unix-Makefile.tmpl
|
||||
+++ b/Configurations/unix-Makefile.tmpl
|
||||
@@ -317,13 +317,22 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (),
|
||||
'$(CNF_LDFLAGS)', '$(LDFLAGS)') -}
|
||||
BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)
|
||||
|
||||
-# CPPFLAGS_Q is used for one thing only: to build up buildinf.h
|
||||
+# *_Q variables are used for one thing only: to build up buildinf.h
|
||||
CPPFLAGS_Q={- $cppflags1 =~ s|([\\"])|\\$1|g;
|
||||
$cppflags2 =~ s|([\\"])|\\$1|g;
|
||||
$lib_cppflags =~ s|([\\"])|\\$1|g;
|
||||
join(' ', $lib_cppflags || (), $cppflags2 || (),
|
||||
$cppflags1 || ()) -}
|
||||
|
||||
+CFLAGS_Q={- for (@{$config{CFLAGS}}) {
|
||||
+ s|-fdebug-prefix-map=[^ ]+|-fdebug-prefix-map=|g;
|
||||
+ s|-fmacro-prefix-map=[^ ]+|-fmacro-prefix-map=|g;
|
||||
+ }
|
||||
+ join(' ', @{$config{CFLAGS}}) -}
|
||||
+
|
||||
+CC_Q={- $config{CC} =~ s|--sysroot=[^ ]+|--sysroot=recipe-sysroot|g;
|
||||
+ join(' ', $config{CC}) -}
|
||||
+
|
||||
PERLASM_SCHEME= {- $target{perlasm_scheme} -}
|
||||
|
||||
# For x86 assembler: Set PROCESSOR to 386 if you want to support
|
||||
diff --git a/crypto/build.info b/crypto/build.info
|
||||
index b515b7318e..8c9cee2a09 100644
|
||||
--- a/crypto/build.info
|
||||
+++ b/crypto/build.info
|
||||
@@ -10,7 +10,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \
|
||||
ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl
|
||||
|
||||
DEPEND[cversion.o]=buildinf.h
|
||||
-GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)"
|
||||
+GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC_Q) $(CFLAGS_Q) $(CPPFLAGS_Q)" "$(PLATFORM)"
|
||||
DEPEND[buildinf.h]=../configdata.pm
|
||||
|
||||
GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME)
|
||||
--
|
||||
2.19.1
|
||||
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
From a9401b2289656c5a36dd1b0ecebf0d23e291ce70 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Tue, 2 Oct 2018 23:58:24 +0800
|
||||
Subject: [PATCH] skip test_symbol_presence
|
||||
|
||||
We cannot skip `01-test_symbol_presence.t' by configuring option `no-shared'
|
||||
as INSTALL told us the shared libraries will not be built.
|
||||
|
||||
[INSTALL snip]
|
||||
Notes on shared libraries
|
||||
-------------------------
|
||||
|
||||
For most systems the OpenSSL Configure script knows what is needed to
|
||||
build shared libraries for libcrypto and libssl. On these systems
|
||||
the shared libraries will be created by default. This can be suppressed and
|
||||
only static libraries created by using the "no-shared" option. On systems
|
||||
where OpenSSL does not know how to build shared libraries the "no-shared"
|
||||
option will be forced and only static libraries will be created.
|
||||
[INSTALL snip]
|
||||
|
||||
Hence directly modification the case to skip it.
|
||||
|
||||
Upstream-Status: Inappropriate [OE Specific]
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
test/recipes/01-test_symbol_presence.t | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
|
||||
index 7f2a2d7..0b93745 100644
|
||||
--- a/test/recipes/01-test_symbol_presence.t
|
||||
+++ b/test/recipes/01-test_symbol_presence.t
|
||||
@@ -14,8 +14,7 @@ use OpenSSL::Test::Utils;
|
||||
|
||||
setup("test_symbol_presence");
|
||||
|
||||
-plan skip_all => "Only useful when building shared libraries"
|
||||
- if disabled("shared");
|
||||
+plan skip_all => "The case needs debug symbols then we just disable it";
|
||||
|
||||
my @libnames = ("crypto", "ssl");
|
||||
my $testcount = scalar @libnames;
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
Don't refuse to build afalgeng if cross-compiling or the host kernel is too old.
|
||||
|
||||
Upstream-Status: Submitted [hhttps://github.com/openssl/openssl/pull/7688]
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
diff --git a/Configure b/Configure
|
||||
index 3baa8ce..9ef52ed 100755
|
||||
--- a/Configure
|
||||
+++ b/Configure
|
||||
@@ -1550,20 +1550,7 @@ unless ($disabled{"crypto-mdebug-backtrace"})
|
||||
unless ($disabled{afalgeng}) {
|
||||
$config{afalgeng}="";
|
||||
if (grep { $_ eq 'afalgeng' } @{$target{enable}}) {
|
||||
- my $minver = 4*10000 + 1*100 + 0;
|
||||
- if ($config{CROSS_COMPILE} eq "") {
|
||||
- my $verstr = `uname -r`;
|
||||
- my ($ma, $mi1, $mi2) = split("\\.", $verstr);
|
||||
- ($mi2) = $mi2 =~ /(\d+)/;
|
||||
- my $ver = $ma*10000 + $mi1*100 + $mi2;
|
||||
- if ($ver < $minver) {
|
||||
- disable('too-old-kernel', 'afalgeng');
|
||||
- } else {
|
||||
- push @{$config{engdirs}}, "afalg";
|
||||
- }
|
||||
- } else {
|
||||
- disable('cross-compiling', 'afalgeng');
|
||||
- }
|
||||
+ push @{$config{engdirs}}, "afalg";
|
||||
} else {
|
||||
disable('not-linux', 'afalgeng');
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
The value for perl_archname can vary depending on the host, e.g.
|
||||
x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which
|
||||
makes the ptest package non-reproducible. Its unused other than
|
||||
these references so drop it.
|
||||
|
||||
RP 2020/2/6
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
|
||||
Index: openssl-1.1.1d/Configure
|
||||
===================================================================
|
||||
--- openssl-1.1.1d.orig/Configure
|
||||
+++ openssl-1.1.1d/Configure
|
||||
@@ -286,7 +286,7 @@ if (defined env($local_config_envname))
|
||||
# Save away perl command information
|
||||
$config{perl_cmd} = $^X;
|
||||
$config{perl_version} = $Config{version};
|
||||
-$config{perl_archname} = $Config{archname};
|
||||
+#$config{perl_archname} = $Config{archname};
|
||||
|
||||
$config{prefix}="";
|
||||
$config{openssldir}="";
|
||||
@@ -2517,7 +2517,7 @@ _____
|
||||
@{$config{perlargv}}), "\n";
|
||||
print "\nPerl information:\n\n";
|
||||
print ' ',$config{perl_cmd},"\n";
|
||||
- print ' ',$config{perl_version},' for ',$config{perl_archname},"\n";
|
||||
+ print ' ',$config{perl_version},"\n";
|
||||
}
|
||||
if ($dump || $options) {
|
||||
my $longest = 0;
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
# Optional arguments are 'list' to lists all tests, or the test name (base name
|
||||
# ie test_evp, not 03_test_evp.t).
|
||||
|
||||
export TOP=.
|
||||
# OPENSSL_ENGINES is relative from the test binaries
|
||||
export OPENSSL_ENGINES=../engines
|
||||
|
||||
perl ./test/run_tests.pl $* | perl -0pe 's#(.*) \.*.ok#PASS: \1#g; s#(.*) \.*.skipped: (.*)#SKIP: \1 (\2)#g; s#(.*) \.*.\nDubious#FAIL: \1#;'
|
||||
|
|
@ -0,0 +1,217 @@
|
|||
SUMMARY = "Secure Socket Layer"
|
||||
DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools."
|
||||
HOMEPAGE = "http://www.openssl.org/"
|
||||
BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html"
|
||||
SECTION = "libs/network"
|
||||
|
||||
# "openssl" here actually means both OpenSSL and SSLeay licenses apply
|
||||
# (see meta/files/common-licenses/OpenSSL to which "openssl" is SPDXLICENSEMAPped)
|
||||
LICENSE = "openssl"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=d343e62fc9c833710bbbed25f27364c8"
|
||||
|
||||
DEPENDS = "hostperl-runtime-native"
|
||||
|
||||
SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
|
||||
file://run-ptest \
|
||||
file://0001-skip-test_symbol_presence.patch \
|
||||
file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
|
||||
file://afalg.patch \
|
||||
file://reproducible.patch \
|
||||
"
|
||||
|
||||
SRC_URI_append_class-nativesdk = " \
|
||||
file://environment.d-openssl.sh \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1"
|
||||
|
||||
inherit lib_package multilib_header multilib_script ptest
|
||||
MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
|
||||
|
||||
PACKAGECONFIG ?= ""
|
||||
PACKAGECONFIG_class-native = ""
|
||||
PACKAGECONFIG_class-nativesdk = ""
|
||||
|
||||
PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module"
|
||||
|
||||
B = "${WORKDIR}/build"
|
||||
do_configure[cleandirs] = "${B}"
|
||||
|
||||
#| ./libcrypto.so: undefined reference to `getcontext'
|
||||
#| ./libcrypto.so: undefined reference to `setcontext'
|
||||
#| ./libcrypto.so: undefined reference to `makecontext'
|
||||
EXTRA_OECONF_append_libc-musl = " no-async"
|
||||
EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm"
|
||||
|
||||
# adding devrandom prevents openssl from using getrandom() which is not available on older glibc versions
|
||||
# (native versions can be built with newer glibc, but then relocated onto a system with older glibc)
|
||||
EXTRA_OECONF_class-native = "--with-rand-seed=os,devrandom"
|
||||
EXTRA_OECONF_class-nativesdk = "--with-rand-seed=os,devrandom"
|
||||
|
||||
# Relying on hardcoded built-in paths causes openssl-native to not be relocateable from sstate.
|
||||
CFLAGS_append_class-native = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin"
|
||||
CFLAGS_append_class-nativesdk = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin"
|
||||
|
||||
do_configure () {
|
||||
os=${HOST_OS}
|
||||
case $os in
|
||||
linux-gnueabi |\
|
||||
linux-gnuspe |\
|
||||
linux-musleabi |\
|
||||
linux-muslspe |\
|
||||
linux-musl )
|
||||
os=linux
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
target="$os-${HOST_ARCH}"
|
||||
case $target in
|
||||
linux-arm*)
|
||||
target=linux-armv4
|
||||
;;
|
||||
linux-aarch64*)
|
||||
target=linux-aarch64
|
||||
;;
|
||||
linux-i?86 | linux-viac3)
|
||||
target=linux-x86
|
||||
;;
|
||||
linux-gnux32-x86_64 | linux-muslx32-x86_64 )
|
||||
target=linux-x32
|
||||
;;
|
||||
linux-gnu64-x86_64)
|
||||
target=linux-x86_64
|
||||
;;
|
||||
linux-mips | linux-mipsel)
|
||||
# specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags
|
||||
target="linux-mips32 ${TARGET_CC_ARCH}"
|
||||
;;
|
||||
linux-gnun32-mips*)
|
||||
target=linux-mips64
|
||||
;;
|
||||
linux-*-mips64 | linux-mips64 | linux-*-mips64el | linux-mips64el)
|
||||
target=linux64-mips64
|
||||
;;
|
||||
linux-microblaze* | linux-nios2* | linux-sh3 | linux-sh4 | linux-arc*)
|
||||
target=linux-generic32
|
||||
;;
|
||||
linux-powerpc)
|
||||
target=linux-ppc
|
||||
;;
|
||||
linux-powerpc64)
|
||||
target=linux-ppc64
|
||||
;;
|
||||
linux-powerpc64le)
|
||||
target=linux-ppc64le
|
||||
;;
|
||||
linux-riscv32)
|
||||
target=linux-generic32
|
||||
;;
|
||||
linux-riscv64)
|
||||
target=linux-generic64
|
||||
;;
|
||||
linux-sparc | linux-supersparc)
|
||||
target=linux-sparcv9
|
||||
;;
|
||||
esac
|
||||
|
||||
useprefix=${prefix}
|
||||
if [ "x$useprefix" = "x" ]; then
|
||||
useprefix=/
|
||||
fi
|
||||
# WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the
|
||||
# environment variables set by bitbake. Adjust the environment variables instead.
|
||||
HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \
|
||||
perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target
|
||||
perl ${B}/configdata.pm --dump
|
||||
}
|
||||
|
||||
do_install () {
|
||||
oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
|
||||
|
||||
oe_multilib_header openssl/opensslconf.h
|
||||
|
||||
# Create SSL structure for packages such as ca-certificates which
|
||||
# contain hard-coded paths to /etc/ssl. Debian does the same.
|
||||
install -d ${D}${sysconfdir}/ssl
|
||||
mv ${D}${libdir}/ssl-1.1/certs \
|
||||
${D}${libdir}/ssl-1.1/private \
|
||||
${D}${libdir}/ssl-1.1/openssl.cnf \
|
||||
${D}${sysconfdir}/ssl/
|
||||
|
||||
# Although absolute symlinks would be OK for the target, they become
|
||||
# invalid if native or nativesdk are relocated from sstate.
|
||||
ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl-1.1/certs
|
||||
ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl-1.1/private
|
||||
ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-1.1/openssl.cnf
|
||||
}
|
||||
|
||||
do_install_append_class-native () {
|
||||
create_wrapper ${D}${bindir}/openssl \
|
||||
OPENSSL_CONF=${libdir}/ssl-1.1/openssl.cnf \
|
||||
SSL_CERT_DIR=${libdir}/ssl-1.1/certs \
|
||||
SSL_CERT_FILE=${libdir}/ssl-1.1/cert.pem \
|
||||
OPENSSL_ENGINES=${libdir}/engines-1.1
|
||||
}
|
||||
|
||||
do_install_append_class-nativesdk () {
|
||||
mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
|
||||
install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
|
||||
sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
|
||||
}
|
||||
|
||||
PTEST_BUILD_HOST_FILES += "configdata.pm"
|
||||
PTEST_BUILD_HOST_PATTERN = "perl_version ="
|
||||
do_install_ptest () {
|
||||
# Prune the build tree
|
||||
rm -f ${B}/fuzz/*.* ${B}/test/*.*
|
||||
|
||||
cp ${S}/Configure ${B}/configdata.pm ${D}${PTEST_PATH}
|
||||
cp -r ${S}/external ${B}/test ${S}/test ${B}/fuzz ${S}/util ${B}/util ${D}${PTEST_PATH}
|
||||
|
||||
# For test_shlibload
|
||||
ln -s ${libdir}/libcrypto.so.1.1 ${D}${PTEST_PATH}/
|
||||
ln -s ${libdir}/libssl.so.1.1 ${D}${PTEST_PATH}/
|
||||
|
||||
install -d ${D}${PTEST_PATH}/apps
|
||||
ln -s ${bindir}/openssl ${D}${PTEST_PATH}/apps
|
||||
install -m644 ${S}/apps/*.pem ${S}/apps/*.srl ${S}/apps/openssl.cnf ${D}${PTEST_PATH}/apps
|
||||
install -m755 ${B}/apps/CA.pl ${D}${PTEST_PATH}/apps
|
||||
|
||||
install -d ${D}${PTEST_PATH}/engines
|
||||
install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines
|
||||
}
|
||||
|
||||
# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
|
||||
# package RRECOMMENDS on this package. This will enable the configuration
|
||||
# file to be installed for both the openssl-bin package and the libcrypto
|
||||
# package since the openssl-bin package depends on the libcrypto package.
|
||||
|
||||
PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc"
|
||||
|
||||
FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
|
||||
FILES_libssl = "${libdir}/libssl${SOLIBS}"
|
||||
FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf \
|
||||
${libdir}/ssl-1.1/openssl.cnf* \
|
||||
"
|
||||
FILES_${PN}-engines = "${libdir}/engines-1.1"
|
||||
FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
|
||||
FILES_${PN} =+ "${libdir}/ssl-1.1/*"
|
||||
FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
|
||||
|
||||
CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
|
||||
|
||||
RRECOMMENDS_libcrypto += "openssl-conf"
|
||||
RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash"
|
||||
|
||||
RDEPENDS_${PN}-bin += "openssl-conf"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
CVE_PRODUCT = "openssl:openssl"
|
||||
|
||||
CVE_VERSION_SUFFIX = "alphabetical"
|
||||
|
||||
# Only affects OpenSSL >= 1.1.1 in combination with Apache < 2.4.37
|
||||
# Apache in meta-webserver is already recent enough
|
||||
CVE_CHECK_WHITELIST += "CVE-2019-0190"
|
||||
Loading…
Reference in New Issue