update 2023-04-12 23:36:52

This commit is contained in:
github-actions[bot] 2023-04-12 23:36:52 +08:00
parent 093678ce6f
commit fd4e9525cb
5 changed files with 24 additions and 24 deletions

View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
PKG_VERSION:=4.64-1
PKG_VERSION:=4.64-2
PKG_RELEASE:=
PKG_CONFIG_DEPENDS:= \

View File

@ -100,8 +100,8 @@ Then run normal make or cmake etc.
+#endif /* MBEDTLS_ARMV8CE_AES_H */
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -72,6 +72,10 @@
#error "MBEDTLS_AESNI_C defined, but not all prerequisites"
@@ -69,6 +69,10 @@
#error "MBEDTLS_HAVE_TIME_DATE without MBEDTLS_HAVE_TIME does not make sense"
#endif
+#if defined(MBEDTLS_ARMV8CE_AES_C) && !defined(MBEDTLS_HAVE_ASM)
@ -111,9 +111,9 @@ Then run normal make or cmake etc.
#if defined(MBEDTLS_CTR_DRBG_C) && !defined(MBEDTLS_AES_C)
#error "MBEDTLS_CTR_DRBG_C defined, but not all prerequisites"
#endif
@@ -956,3 +960,4 @@
typedef int mbedtls_iso_c_forbids_empty_translation_units;
@@ -959,3 +963,4 @@ typedef int mbedtls_iso_c_forbids_empty_
/* *INDENT-ON* */
#endif /* MBEDTLS_CHECK_CONFIG_H */
+
--- a/include/mbedtls/config.h
@ -126,7 +126,7 @@ Then run normal make or cmake etc.
* library/aria.c
* library/timing.c
* include/mbedtls/bn_mul.h
@@ -2331,6 +2332,21 @@
@@ -2374,6 +2375,21 @@
#define MBEDTLS_AESNI_C
/**
@ -161,8 +161,8 @@ Then run normal make or cmake etc.
#include "mbedtls/platform.h"
#if !defined(MBEDTLS_AES_ALT)
@@ -992,6 +994,11 @@ int mbedtls_aes_crypt_ecb( mbedtls_aes_c
return( mbedtls_aesni_crypt_ecb( ctx, mode, input, output ) );
@@ -1040,6 +1042,11 @@ int mbedtls_aes_crypt_ecb(mbedtls_aes_co
}
#endif
+#if defined(MBEDTLS_ARMV8CE_AES_C)
@ -171,8 +171,8 @@ Then run normal make or cmake etc.
+#endif
+
#if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_HAVE_X86)
if( aes_padlock_ace )
{
if (aes_padlock_ace) {
return mbedtls_padlock_xcryptecb(ctx, mode, input, output);
--- /dev/null
+++ b/library/armv8ce_aes.c
@@ -0,0 +1,142 @@
@ -341,9 +341,9 @@ Then run normal make or cmake etc.
#if !defined(MBEDTLS_GCM_ALT)
/* Parameter validation macros */
@@ -79,6 +83,12 @@ static int gcm_gen_table( mbedtls_gcm_co
if( ( ret = mbedtls_cipher_update( &ctx->cipher_ctx, h, 16, h, &olen ) ) != 0 )
return( ret );
@@ -80,6 +84,12 @@ static int gcm_gen_table(mbedtls_gcm_con
return ret;
}
+#if defined(MBEDTLS_ARMV8CE_AES_C)
+ // we don't do feature testing with ARMv8 cryptography extensions
@ -354,7 +354,7 @@ Then run normal make or cmake etc.
/* pack h as two 64-bits ints, big-endian */
hi = MBEDTLS_GET_UINT32_BE(h, 0);
lo = MBEDTLS_GET_UINT32_BE(h, 4);
@@ -188,6 +198,11 @@ static void gcm_mult( mbedtls_gcm_contex
@@ -190,6 +200,11 @@ static void gcm_mult(mbedtls_gcm_context
unsigned char lo, hi, rem;
uint64_t zh, zl;
@ -363,7 +363,7 @@ Then run normal make or cmake etc.
+ return;
+#endif
+
#if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64)
#if defined(MBEDTLS_AESNI_HAVE_CODE)
if (mbedtls_aesni_has_support(MBEDTLS_AESNI_CLMUL)) {
unsigned char h[16];
--- a/library/Makefile

View File

@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=qbittorrent
PKG_VERSION:=4.4.5
PKG_VERSION:=4.5.2
PKG_RELEASE=1
PKG_SOURCE:=qBittorrent-release-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/qbittorrent/qBittorrent/tar.gz/release-$(PKG_VERSION)?
PKG_HASH:=70c2128b44fe4df4dfc8afc765a304d70cf1b042b5214bcc855d8b3bbc9ccf36
PKG_HASH:=0a3c11296b1daa6e6dd57ebb8426e0388ba7db613e54a758b201648b69702dd4
PKG_BUILD_DIR:=$(BUILD_DIR)/qBittorrent-release-$(PKG_VERSION)

View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=qtbase
PKG_BASE:=5.15
PKG_BUGFIX:=6
PKG_BUGFIX:=8
PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX)
PKG_RELEASE:=1
@ -17,7 +17,7 @@ PKG_SOURCE_URL:= \
http://master.qt.io/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
http://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
http://qt.mirror.constant.com/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules
PKG_HASH:=396bc6b0d773ac6a7c691a4c3d901999f571e3e7033d7fd6f65e4ef2b6eb7340
PKG_HASH:=bfb11126c7f3abc3fdf86425ce912988b864a7e79a606d77325cffdbacb4be9c
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-everywhere-src-$(PKG_VERSION)

View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=qttools
PKG_BASE:=5.15
PKG_BUGFIX:=6
PKG_BUGFIX:=8
PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX)
PKG_RELEASE:=1
@ -17,7 +17,7 @@ PKG_SOURCE_URL:= \
http://master.qt.io/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
http://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
http://qt.mirror.constant.com/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules
PKG_HASH:=2c1486ab7e6dad76fb34642cd4f91d533e5dfeec0ee527129c2c2ed4ab283c3b
PKG_HASH:=a3bef8de13032dae17450f5df35e8abbb4f41f71e3b628871d3da5633577e9c4
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-everywhere-src-$(PKG_VERSION)