diff --git a/packages/security/openssl/package.mk b/packages/security/openssl/package.mk index f3c1207bbd..d5a85ba5b2 100644 --- a/packages/security/openssl/package.mk +++ b/packages/security/openssl/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="openssl" -PKG_VERSION="3.1.0" -PKG_SHA256="aaa925ad9828745c4cad9d9efeb273deca820f2cdcf2c3ac7d7c1212b7c497b4" +PKG_VERSION="3.1.1" +PKG_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" PKG_LICENSE="Apache-2.0" PKG_SITE="https://www.openssl.org" PKG_URL="https://www.openssl.org/source/${PKG_NAME}-${PKG_VERSION}.tar.gz" diff --git a/packages/security/openssl/patches/openssl-0001-pr20624.patch b/packages/security/openssl/patches/openssl-0001-pr20624.patch deleted file mode 100644 index 27b83b50d5..0000000000 --- a/packages/security/openssl/patches/openssl-0001-pr20624.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d6e2c1c3282a5ca1a5846ec974c92bcea52ad838 Mon Sep 17 00:00:00 2001 -From: Tom Cosgrove -Date: Tue, 28 Mar 2023 11:53:37 +0100 -Subject: [PATCH] SM4 check should be for __aarch64__, not __ARM_MAX_ARCH__ >= - 8 - -(And then __arm__ and __arm tests are redundant) - -Fixes #20604 for 3.1 branch ---- - include/crypto/sm4_platform.h | 24 +++++++++++------------- - 1 file changed, 11 insertions(+), 13 deletions(-) - -diff --git a/include/crypto/sm4_platform.h b/include/crypto/sm4_platform.h -index 11f9b9d88b50..54bbc37df37a 100644 ---- a/include/crypto/sm4_platform.h -+++ b/include/crypto/sm4_platform.h -@@ -12,9 +12,8 @@ - # pragma once - - # if defined(OPENSSL_CPUID_OBJ) --# if (defined(__arm__) || defined(__arm) || defined(__aarch64__)) -+# if defined(__aarch64__) - # include "arm_arch.h" --# if __ARM_MAX_ARCH__>=8 - extern unsigned int OPENSSL_arm_midr; - static inline int vpsm4_capable(void) - { -@@ -22,18 +21,17 @@ static inline int vpsm4_capable(void) - (MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) || - MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1)); - } --# if defined(VPSM4_ASM) --# define VPSM4_CAPABLE vpsm4_capable() --# endif --# define HWSM4_CAPABLE (OPENSSL_armcap_P & ARMV8_SM4) --# define HWSM4_set_encrypt_key sm4_v8_set_encrypt_key --# define HWSM4_set_decrypt_key sm4_v8_set_decrypt_key --# define HWSM4_encrypt sm4_v8_encrypt --# define HWSM4_decrypt sm4_v8_decrypt --# define HWSM4_cbc_encrypt sm4_v8_cbc_encrypt --# define HWSM4_ecb_encrypt sm4_v8_ecb_encrypt --# define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks -+# if defined(VPSM4_ASM) -+# define VPSM4_CAPABLE vpsm4_capable() - # endif -+# define HWSM4_CAPABLE (OPENSSL_armcap_P & ARMV8_SM4) -+# define HWSM4_set_encrypt_key sm4_v8_set_encrypt_key -+# define HWSM4_set_decrypt_key sm4_v8_set_decrypt_key -+# define HWSM4_encrypt sm4_v8_encrypt -+# define HWSM4_decrypt sm4_v8_decrypt -+# define HWSM4_cbc_encrypt sm4_v8_cbc_encrypt -+# define HWSM4_ecb_encrypt sm4_v8_ecb_encrypt -+# define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks - # endif - # endif /* OPENSSL_CPUID_OBJ */ -