openssl: update to 3.0.13

This commit is contained in:
DHDAXCW 2024-02-10 10:32:56 +08:00
parent d92b97a26c
commit 2518e1a5fa
4 changed files with 10 additions and 7 deletions

View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=openssl PKG_NAME:=openssl
PKG_VERSION:=3.0.12 PKG_VERSION:=3.0.13
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_BUILD_FLAGS:=gc-sections no-lto PKG_BUILD_FLAGS:=gc-sections no-lto
@ -27,7 +27,7 @@ PKG_SOURCE_URL:= \
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/old/$(PKG_BASE)/ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/old/$(PKG_BASE)/
PKG_HASH:=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 PKG_HASH:=88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

View File

@ -10,7 +10,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
--- a/Configure --- a/Configure
+++ b/Configure +++ b/Configure
@@ -1674,7 +1674,9 @@ $config{CFLAGS} = [ map { $_ eq '--ossl- @@ -1677,7 +1677,9 @@ $config{CFLAGS} = [ map { $_ eq '--ossl-
unless ($disabled{afalgeng}) { unless ($disabled{afalgeng}) {
$config{afalgeng}=""; $config{afalgeng}="";

View File

@ -9,7 +9,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
--- /dev/null --- /dev/null
+++ b/Configurations/25-openwrt.conf +++ b/Configurations/25-openwrt.conf
@@ -0,0 +1,56 @@ @@ -0,0 +1,59 @@
+## Openwrt "CONFIG_ARCH" matching targets. +## Openwrt "CONFIG_ARCH" matching targets.
+ +
+# The targets need to end in '-openwrt' for the AFALG patch to work +# The targets need to end in '-openwrt' for the AFALG patch to work
@ -34,6 +34,9 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
+ "linux-i386-openwrt" => { + "linux-i386-openwrt" => {
+ inherit_from => [ "linux-x86", "openwrt" ], + inherit_from => [ "linux-x86", "openwrt" ],
+ }, + },
+ "linux-loongarch64-openwrt" => {
+ inherit_from => [ "linux64-loongarch64", "openwrt" ],
+ },
+ "linux-mips-openwrt" => { + "linux-mips-openwrt" => {
+ inherit_from => [ "linux-mips32", "openwrt" ], + inherit_from => [ "linux-mips32", "openwrt" ],
+ }, + },

View File

@ -16,7 +16,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
--- a/ssl/ssl_ciph.c --- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c
@@ -1505,11 +1505,29 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ @@ -1506,11 +1506,29 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
ssl_cipher_apply_rule(0, SSL_kECDHE, 0, 0, 0, 0, 0, CIPHER_DEL, -1, &head, ssl_cipher_apply_rule(0, SSL_kECDHE, 0, 0, 0, 0, 0, CIPHER_DEL, -1, &head,
&tail); &tail);
@ -46,7 +46,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
/* /*
* ...and generally, our preferred cipher is AES. * ...and generally, our preferred cipher is AES.
@@ -1564,7 +1582,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ @@ -1565,7 +1583,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
* Within each group, ciphers remain sorted by strength and previous * Within each group, ciphers remain sorted by strength and previous
* preference, i.e., * preference, i.e.,
* 1) ECDHE > DHE * 1) ECDHE > DHE
@ -55,7 +55,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
* 3) AES > rest * 3) AES > rest
* 4) TLS 1.2 > legacy * 4) TLS 1.2 > legacy
* *
@@ -2235,7 +2253,13 @@ const char *OSSL_default_cipher_list(voi @@ -2236,7 +2254,13 @@ const char *OSSL_default_cipher_list(voi
*/ */
const char *OSSL_default_ciphersuites(void) const char *OSSL_default_ciphersuites(void)
{ {