PKG_NAME:=openssl
PKG_BASE:=1.1.1
-PKG_BUGFIX:=s
+PKG_BUGFIX:=t
PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
PKG_USE_MIPS16:=0
PKG_BUILD_PARALLEL:=1
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/old/$(PKG_BASE)/
-PKG_HASH:=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa
+PKG_HASH:=8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
PKG_LICENSE:=OpenSSL
PKG_LICENSE_FILES:=LICENSE
+++ /dev/null
-From 2bcf8e69bd92e33d84c48e7d108d3d46b22f8a6d Mon Sep 17 00:00:00 2001
-From: ValdikSS <iam@valdikss.org.ru>
-Date: Wed, 18 Jan 2023 20:14:48 +0300
-Subject: [PATCH] Padlock: fix byte swapping assembly for AES-192 and 256
-
-Byte swapping code incorrectly uses the number of AES rounds to swap expanded
-AES key, while swapping only a single dword in a loop, resulting in swapped
-key and partially swapped expanded keys, breaking AES encryption and
-decryption on VIA Padlock hardware.
-
-This commit correctly sets the number of swapping loops to be done.
-
-Fixes #20073
-
-CLA: trivial
-
-Reviewed-by: Hugo Landau <hlandau@openssl.org>
-Reviewed-by: Tomas Mraz <tomas@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/20077)
-
-(cherry picked from commit 7331e7ef79fe4499d81cc92249e9c97e9ff9291a)
----
- engines/asm/e_padlock-x86.pl | 2 ++
- engines/asm/e_padlock-x86_64.pl | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/engines/asm/e_padlock-x86.pl b/engines/asm/e_padlock-x86.pl
-index 5b097ce3ef9b..07f7000fd38a 100644
---- a/engines/asm/e_padlock-x86.pl
-+++ b/engines/asm/e_padlock-x86.pl
-@@ -116,6 +116,8 @@
- &function_begin_B("padlock_key_bswap");
- &mov ("edx",&wparam(0));
- &mov ("ecx",&DWP(240,"edx"));
-+ &inc ("ecx");
-+ &shl ("ecx",2);
- &set_label("bswap_loop");
- &mov ("eax",&DWP(0,"edx"));
- &bswap ("eax");
-diff --git a/engines/asm/e_padlock-x86_64.pl b/engines/asm/e_padlock-x86_64.pl
-index 09b0aaa48dfe..dfd2ae656375 100644
---- a/engines/asm/e_padlock-x86_64.pl
-+++ b/engines/asm/e_padlock-x86_64.pl
-@@ -92,6 +92,8 @@
- .align 16
- padlock_key_bswap:
- mov 240($arg1),%edx
-+ inc %edx
-+ shl \$2,%edx
- .Lbswap_loop:
- mov ($arg1),%eax
- bswap %eax