openssl: version bump 1.1.1d -> 1.1.1f

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 32 insertions, 84 deletions

diff --git a/patches/openssl-1.1.1d/0004-Define-AESNI_ASM-if-AESNI-assembler-is-included-and-.patch b/patches/openssl-1.1.1d/0004-Define-AESNI_ASM-if-AESNI-assembler-is-included-and-.patch
deleted file mode 100644
index 88b45af84..000000000
--- a/patches/openssl-1.1.1d/0004-Define-AESNI_ASM-if-AESNI-assembler-is-included-and-.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Richard Levitte <levitte@openssl.org>
-Date: Thu, 3 Oct 2019 08:28:31 +0200
-Subject: [PATCH] Define AESNI_ASM if AESNI assembler is included, and use it
-
-[ Upstream commit 61cc715240d2d3f9511ca88043a3e9797c11482f ]
-
-Because we have cases where basic assembler support isn't present, but
-AESNI asssembler support is, we need a separate macro that indicates
-that, and use it.
-
-Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
-Reviewed-by: Paul Dale <paul.dale@oracle.com>
-(Merged from https://github.com/openssl/openssl/pull/10080)
-
-Imported from openssl_1.1.1d-2.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Configure                          | 1 +
- crypto/evp/e_aes_cbc_hmac_sha1.c   | 2 +-
- crypto/evp/e_aes_cbc_hmac_sha256.c | 4 ++--
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/Configure b/Configure
-index 5a699836f32a..482914afb92f 100755
---- a/Configure
-+++ b/Configure
-@@ -1375,6 +1375,7 @@ unless ($disabled{asm}) {
-     }
-     if ($target{aes_asm_src}) {
-         push @{$config{lib_defines}}, "AES_ASM" if ($target{aes_asm_src} =~ m/\baes-/);;
-+        push @{$config{lib_defines}}, "AESNI_ASM" if ($target{aes_asm_src} =~ m/\baesni-/);;
-         # aes-ctr.fake is not a real file, only indication that assembler
-         # module implements AES_ctr32_encrypt...
-         push @{$config{lib_defines}}, "AES_CTR_ASM" if ($target{aes_asm_src} =~ s/\s*aes-ctr\.fake//);
-diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
-index 09d24dc3d02a..cb1136c42e5b 100644
---- a/crypto/evp/e_aes_cbc_hmac_sha1.c
-+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
-@@ -33,7 +33,7 @@ typedef struct {
- 
- #define NO_PAYLOAD_LENGTH       ((size_t)-1)
- 
--#if     defined(AES_ASM) &&     ( \
-+#if     defined(AESNI_ASM) &&     ( \
-         defined(__x86_64)       || defined(__x86_64__)  || \
-         defined(_M_AMD64)       || defined(_M_X64)      )
- 
-diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
-index caac0c9d3da2..b329ba997132 100644
---- a/crypto/evp/e_aes_cbc_hmac_sha256.c
-+++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
-@@ -34,7 +34,7 @@ typedef struct {
- 
- # define NO_PAYLOAD_LENGTH       ((size_t)-1)
- 
--#if     defined(AES_ASM) &&     ( \
-+#if     defined(AESNI_ASM) &&   ( \
-         defined(__x86_64)       || defined(__x86_64__)  || \
-         defined(_M_AMD64)       || defined(_M_X64)      )
- 
-@@ -947,4 +947,4 @@ const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void)
- {
-     return NULL;
- }
--#endif
-+#endif  /* AESNI_ASM */
diff --git a/patches/openssl-1.1.1d/series b/patches/openssl-1.1.1d/series
deleted file mode 100644
index 0460eb6ca..000000000
--- a/patches/openssl-1.1.1d/series
+++ /dev/null
@@ -1,9 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:debian --start-number 1
-0001-debian-targets.patch
-0002-pic.patch
-0003-Set-systemwide-default-settings-for-libssl-users.patch
-0004-Define-AESNI_ASM-if-AESNI-assembler-is-included-and-.patch
-#tag:ptx --start-number 100
-# 3b0de81e154756880195504a5bccf40e  - git-ptx-patches magic
diff --git a/patches/openssl-1.1.1d/0001-debian-targets.patch b/patches/openssl-1.1.1f/0001-debian-targets.patch
index 6db3c49a8..ec8b80889 100644
--- a/patches/openssl-1.1.1d/0001-debian-targets.patch
+++ b/patches/openssl-1.1.1f/0001-debian-targets.patch
@@ -2,20 +2,20 @@ From: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
 Date: Sun, 5 Nov 2017 15:09:09 +0100
 Subject: [PATCH] debian-targets
 
-Imported from openssl_1.1.1d-2.debian.tar.xz
+Imported from openssl_1.1.1f-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- Configurations/20-debian.conf | 192 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 192 insertions(+)
+ Configurations/20-debian.conf | 210 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 210 insertions(+)
  create mode 100644 Configurations/20-debian.conf
 
 diff --git a/Configurations/20-debian.conf b/Configurations/20-debian.conf
 new file mode 100644
-index 000000000000..71215d94dfc1
+index 000000000000..a3d5f68d36aa
 --- /dev/null
 +++ b/Configurations/20-debian.conf
-@@ -0,0 +1,192 @@
+@@ -0,0 +1,210 @@
 +my %targets = (
 +	"debian" => {
 +		cflags => add("-Wa,--noexecstack -Wall"),
@@ -150,6 +150,24 @@ index 000000000000..71215d94dfc1
 +		cflags => add("-DL_ENDIAN"),
 +	},
 +
++	"debian-musl-linux-arm64" => {
++		inherit_from => [ "linux-aarch64", "debian" ],
++	},
++	"debian-musl-linux-armhf" => {
++		inherit_from => [ "linux-armv4", "debian" ],
++	},
++	"debian-musl-linux-i386" => {
++		inherit_from => [ "linux-elf", "debian" ],
++	},
++	"debian-musl-linux-mips" => {
++		inherit_from => [ "linux-mips32", "debian" ],
++		cflags => add("-DB_ENDIAN"),
++	},
++	"debian-musl-linux-mipsel" => {
++		inherit_from => [ "linux-mips32", "debian" ],
++		cflags => add("-DL_ENDIAN"),
++	},
++
 +	"debian-nios2" => {
 +		inherit_from => [ "linux-generic32", "debian" ],
 +	},
diff --git a/patches/openssl-1.1.1d/0002-pic.patch b/patches/openssl-1.1.1f/0002-pic.patch
index bdc08eb3c..f49dd6f69 100644
--- a/patches/openssl-1.1.1d/0002-pic.patch
+++ b/patches/openssl-1.1.1f/0002-pic.patch
@@ -2,7 +2,7 @@ From: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
 Date: Sun, 5 Nov 2017 15:09:09 +0100
 Subject: [PATCH] pic
 
-Imported from openssl_1.1.1d-2.debian.tar.xz
+Imported from openssl_1.1.1f-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -146,7 +146,7 @@ index 5c7ea3880e4d..7e49b55e97c7 100644
      elsif ($::coff)
      {   $initseg.=<<___;	# applies to both Cygwin and Mingw
 diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
-index d43dda4d935c..d72a36fbf0c5 100644
+index ba4fd80fb32e..18c124707587 100644
 --- a/crypto/x86cpuid.pl
 +++ b/crypto/x86cpuid.pl
 @@ -18,6 +18,8 @@ open OUT,">$output";
diff --git a/patches/openssl-1.1.1d/0003-Set-systemwide-default-settings-for-libssl-users.patch b/patches/openssl-1.1.1f/0003-Set-systemwide-default-settings-for-libssl-users.patch
index 166879509..c2be2d9ab 100644
--- a/patches/openssl-1.1.1d/0003-Set-systemwide-default-settings-for-libssl-users.patch
+++ b/patches/openssl-1.1.1f/0003-Set-systemwide-default-settings-for-libssl-users.patch
@@ -10,7 +10,7 @@ security level to the 112 bit security level.
 
 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 
-Imported from openssl_1.1.1d-2.debian.tar.xz
+Imported from openssl_1.1.1f-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.1.1f/series b/patches/openssl-1.1.1f/series
new file mode 100644
index 000000000..2bfca5ade
--- /dev/null
+++ b/patches/openssl-1.1.1f/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-debian-targets.patch
+0002-pic.patch
+0003-Set-systemwide-default-settings-for-libssl-users.patch
+# 0312ece60c710f114a26383fdd75ddcb  - git-ptx-patches magic