Upgrade openssl to 1.1.1p
This commit is contained in:
parent
4b9695de1e
commit
79858b33f3
|
|
@ -0,0 +1 @@
|
||||||
|
export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf"
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
From 326909baf81a638d51fa8be1d8227518784f5cc4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
Date: Tue, 14 Sep 2021 12:18:25 +0200
|
||||||
|
Subject: [PATCH] Configure: do not tweak mips cflags
|
||||||
|
|
||||||
|
This conflicts with mips machine definitons from yocto,
|
||||||
|
e.g.
|
||||||
|
| Error: -mips3 conflicts with the other architecture options, which imply -mips64r2
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-core specific]
|
||||||
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
---
|
||||||
|
Configure | 10 ----------
|
||||||
|
1 file changed, 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Configure b/Configure
|
||||||
|
index 821e680..0387a74 100755
|
||||||
|
--- a/Configure
|
||||||
|
+++ b/Configure
|
||||||
|
@@ -1422,16 +1422,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m)
|
||||||
|
push @{$config{shared_ldflag}}, "-mno-cygwin";
|
||||||
|
}
|
||||||
|
|
||||||
|
-if ($target =~ /linux.*-mips/ && !$disabled{asm}
|
||||||
|
- && !grep { $_ !~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) {
|
||||||
|
- # minimally required architecture flags for assembly modules
|
||||||
|
- my $value;
|
||||||
|
- $value = '-mips2' if ($target =~ /mips32/);
|
||||||
|
- $value = '-mips3' if ($target =~ /mips64/);
|
||||||
|
- unshift @{$config{cflags}}, $value;
|
||||||
|
- unshift @{$config{cxxflags}}, $value if $config{CXX};
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
# If threads aren't disabled, check how possible they are
|
||||||
|
unless ($disabled{threads}) {
|
||||||
|
if ($auto_threads) {
|
||||||
|
|
@ -0,0 +1,78 @@
|
||||||
|
From 5985253f2c9025d7c127443a3a9938946f80c2a1 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>
|
||||||
|
|
||||||
|
Update to fix buildpaths qa issue for '-ffile-prefix-map'.
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
Configurations/unix-Makefile.tmpl | 12 +++++++++++-
|
||||||
|
crypto/build.info | 2 +-
|
||||||
|
2 files changed, 12 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
|
||||||
|
index f88a70f..528cdef 100644
|
||||||
|
--- a/Configurations/unix-Makefile.tmpl
|
||||||
|
+++ b/Configurations/unix-Makefile.tmpl
|
||||||
|
@@ -471,13 +471,23 @@ 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;
|
||||||
|
+ s|-ffile-prefix-map=[^ ]+|-ffile-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 efca6cc..eda433e 100644
|
||||||
|
--- a/crypto/build.info
|
||||||
|
+++ b/crypto/build.info
|
||||||
|
@@ -109,7 +109,7 @@ DEFINE[../libcrypto]=$UPLINKDEF
|
||||||
|
|
||||||
|
DEPEND[info.o]=buildinf.h
|
||||||
|
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)"
|
||||||
|
|
||||||
|
GENERATE[uplink-x86.s]=../ms/uplink-x86.pl
|
||||||
|
GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl
|
||||||
|
|
@ -0,0 +1,55 @@
|
||||||
|
From 770aea88c3888cc5cb3ebc94ffcef706c68bc1d2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomas Mraz <tomas@openssl.org>
|
||||||
|
Date: Wed, 1 Jun 2022 12:06:33 +0200
|
||||||
|
Subject: [PATCH] Update expired SCT issuer certificate
|
||||||
|
|
||||||
|
Fixes #15179
|
||||||
|
|
||||||
|
Reviewed-by: Matt Caswell <matt@openssl.org>
|
||||||
|
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
|
||||||
|
(Merged from https://github.com/openssl/openssl/pull/18444)
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
[Fixes ptest failures in OE-Core]
|
||||||
|
---
|
||||||
|
test/certs/embeddedSCTs1_issuer.pem | 30 ++++++++++++++---------------
|
||||||
|
1 file changed, 15 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/test/certs/embeddedSCTs1_issuer.pem b/test/certs/embeddedSCTs1_issuer.pem
|
||||||
|
index 1fa449d5a098..6aa9455f09ed 100644
|
||||||
|
--- a/test/certs/embeddedSCTs1_issuer.pem
|
||||||
|
+++ b/test/certs/embeddedSCTs1_issuer.pem
|
||||||
|
@@ -1,18 +1,18 @@
|
||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
-MIIC0DCCAjmgAwIBAgIBADANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJHQjEk
|
||||||
|
+MIIC0jCCAjugAwIBAgIBADANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJHQjEk
|
||||||
|
MCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENBMQ4wDAYDVQQIEwVX
|
||||||
|
-YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAeFw0xMjA2MDEwMDAwMDBaFw0yMjA2MDEw
|
||||||
|
-MDAwMDBaMFUxCzAJBgNVBAYTAkdCMSQwIgYDVQQKExtDZXJ0aWZpY2F0ZSBUcmFu
|
||||||
|
-c3BhcmVuY3kgQ0ExDjAMBgNVBAgTBVdhbGVzMRAwDgYDVQQHEwdFcncgV2VuMIGf
|
||||||
|
-MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVimhTYhCicRmTbneDIRgcKkATxtB7
|
||||||
|
-jHbrkVfT0PtLO1FuzsvRyY2RxS90P6tjXVUJnNE6uvMa5UFEJFGnTHgW8iQ8+EjP
|
||||||
|
-KDHM5nugSlojgZ88ujfmJNnDvbKZuDnd/iYx0ss6hPx7srXFL8/BT/9Ab1zURmnL
|
||||||
|
-svfP34b7arnRsQIDAQABo4GvMIGsMB0GA1UdDgQWBBRfnYgNyHPmVNT4DdjmsMEk
|
||||||
|
-tEfDVTB9BgNVHSMEdjB0gBRfnYgNyHPmVNT4DdjmsMEktEfDVaFZpFcwVTELMAkG
|
||||||
|
-A1UEBhMCR0IxJDAiBgNVBAoTG0NlcnRpZmljYXRlIFRyYW5zcGFyZW5jeSBDQTEO
|
||||||
|
-MAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0VydyBXZW6CAQAwDAYDVR0TBAUwAwEB
|
||||||
|
-/zANBgkqhkiG9w0BAQUFAAOBgQAGCMxKbWTyIF4UbASydvkrDvqUpdryOvw4BmBt
|
||||||
|
-OZDQoeojPUApV2lGOwRmYef6HReZFSCa6i4Kd1F2QRIn18ADB8dHDmFYT9czQiRy
|
||||||
|
-f1HWkLxHqd81TbD26yWVXeGJPE3VICskovPkQNJ0tU4b03YmnKliibduyqQQkOFP
|
||||||
|
-OwqULg==
|
||||||
|
+YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAgFw0yMjA2MDExMDM4MDJaGA8yMTIyMDUw
|
||||||
|
+ODEwMzgwMlowVTELMAkGA1UEBhMCR0IxJDAiBgNVBAoTG0NlcnRpZmljYXRlIFRy
|
||||||
|
+YW5zcGFyZW5jeSBDQTEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0VydyBXZW4w
|
||||||
|
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANWKaFNiEKJxGZNud4MhGBwqQBPG
|
||||||
|
+0HuMduuRV9PQ+0s7UW7Oy9HJjZHFL3Q/q2NdVQmc0Tq68xrlQUQkUadMeBbyJDz4
|
||||||
|
+SM8oMczme6BKWiOBnzy6N+Yk2cO9spm4Od3+JjHSyzqE/HuytcUvz8FP/0BvXNRG
|
||||||
|
+acuy98/fhvtqudGxAgMBAAGjga8wgawwHQYDVR0OBBYEFF+diA3Ic+ZU1PgN2Oaw
|
||||||
|
+wSS0R8NVMH0GA1UdIwR2MHSAFF+diA3Ic+ZU1PgN2OawwSS0R8NVoVmkVzBVMQsw
|
||||||
|
+CQYDVQQGEwJHQjEkMCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENB
|
||||||
|
+MQ4wDAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHRXJ3IFdlboIBADAMBgNVHRMEBTAD
|
||||||
|
+AQH/MA0GCSqGSIb3DQEBCwUAA4GBAD0aYh9OkFYfXV7kBfhrtD0PJG2U47OV/1qq
|
||||||
|
++uFpqB0S1WO06eJT0pzYf1ebUcxjBkajbJZm/FHT85VthZ1lFHsky87aFD8XlJCo
|
||||||
|
+2IOhKOkvvWKPUdFLoO/ZVXqEVKkcsS1eXK1glFvb07eJZya3JVG0KdMhV2YoDg6c
|
||||||
|
+Doud4XrO
|
||||||
|
-----END CERTIFICATE-----
|
||||||
|
|
@ -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,22 @@
|
||||||
|
Using localtime() means the output can depend on the timezone of the build machine.
|
||||||
|
Using gmtime() is safer. For complete reproducibility use SOURCE_DATE_EPOCH if set.
|
||||||
|
|
||||||
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||||
|
Upstream-Status: Pending [should be suitable]
|
||||||
|
|
||||||
|
Index: openssl-3.0.1/apps/progs.pl
|
||||||
|
===================================================================
|
||||||
|
--- openssl-3.0.1.orig/apps/progs.pl
|
||||||
|
+++ openssl-3.0.1/apps/progs.pl
|
||||||
|
@@ -21,7 +21,10 @@ die "Unrecognised option, must be -C or
|
||||||
|
my %commands = ();
|
||||||
|
my $cmdre = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/;
|
||||||
|
my $apps_openssl = shift @ARGV;
|
||||||
|
-my $YEAR = [localtime()]->[5] + 1900;
|
||||||
|
+my $YEAR = [gmtime()]->[5] + 1900;
|
||||||
|
+if (defined($ENV{SOURCE_DATE_EPOCH}) && $ENV{SOURCE_DATE_EPOCH} !~ /\D/) {
|
||||||
|
+ $YEAR = [gmtime($ENV{SOURCE_DATE_EPOCH})]->[5] + 1900;
|
||||||
|
+}
|
||||||
|
|
||||||
|
# because the program apps/openssl has object files as sources, and
|
||||||
|
# they then have the corresponding C files as source, we need to chain
|
||||||
|
|
@ -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 $* | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g'
|
||||||
|
|
@ -0,0 +1,247 @@
|
||||||
|
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://afalg.patch \
|
||||||
|
file://reproducibility.patch \
|
||||||
|
"
|
||||||
|
|
||||||
|
SRC_URI_append_class-nativesdk = " \
|
||||||
|
file://environment.d-openssl.sh \
|
||||||
|
"
|
||||||
|
|
||||||
|
SRC_URI_append_riscv32 = " \
|
||||||
|
file://0003-Add-support-for-io_pgetevents_time64-syscall.patch \
|
||||||
|
file://0004-Fixup-support-for-io_pgetevents_time64-syscall.patch \
|
||||||
|
"
|
||||||
|
|
||||||
|
SRC_URI[sha256sum] = "bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f"
|
||||||
|
|
||||||
|
inherit lib_package multilib_header 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"
|
||||||
|
PACKAGECONFIG[no-tls1] = "no-tls1"
|
||||||
|
PACKAGECONFIG[no-tls1_1] = "no-tls1_1"
|
||||||
|
|
||||||
|
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"
|
||||||
|
|
||||||
|
# Disable deprecated crypto algorithms
|
||||||
|
# Retained for compatibilty
|
||||||
|
# des (curl)
|
||||||
|
# dh (python-ssl)
|
||||||
|
# dsa (rpm)
|
||||||
|
# md4 (cyrus-sasl freeradius hostapd)
|
||||||
|
# bf (wvstreams postgresql x11vnc crda znc cfengine)
|
||||||
|
# rc4 (freerdp librtorrent ettercap xrdp transmission pam-ssh-agent-auth php)
|
||||||
|
# rc2 (mailx)
|
||||||
|
# psk (qt5)
|
||||||
|
# srp (libest)
|
||||||
|
# whirlpool (qca)
|
||||||
|
DEPRECATED_CRYPTO_FLAGS = "no-ssl no-idea no-rc5 no-md2 no-camellia no-mdc2 no-scrypt no-seed no-siphash no-sm2 no-sm3 no-sm4"
|
||||||
|
|
||||||
|
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
|
||||||
|
;;
|
||||||
|
mingw32-x86_64)
|
||||||
|
target=mingw64
|
||||||
|
;;
|
||||||
|
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} ${DEPRECATED_CRYPTO_FLAGS} --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/dasync.so ${D}${PTEST_PATH}/engines
|
||||||
|
install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines
|
||||||
|
|
||||||
|
# seems to be needed with perl 5.32.1
|
||||||
|
install -d ${D}${PTEST_PATH}/util/perl/recipes
|
||||||
|
cp ${D}${PTEST_PATH}/test/recipes/tconversion.pl ${D}${PTEST_PATH}/util/perl/recipes/
|
||||||
|
}
|
||||||
|
|
||||||
|
# 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"
|
||||||
|
# ${prefix} comes from what we pass into --prefix at configure time (which is used for INSTALLTOP)
|
||||||
|
FILES_${PN}-engines_append_mingw32_class-nativesdk = " ${prefix}${libdir}/engines-1_1"
|
||||||
|
FILES_${PN}-misc = "${libdir}/ssl-1.1/misc ${bindir}/c_rehash"
|
||||||
|
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}-misc = "perl"
|
||||||
|
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