Skip to content

Commit 85b36c0

Browse files
httpstormRa2-IFV
andcommitted
openssl: Update to 3.5.0
Remove broken mirror, add Github release as mirror. Refresh patch: - 100-Configure-afalg-support.patch - 120-strip-cflags-from-binary.patch - 140-allow-prefer-chacha20.patch - 500-e_devcrypto-default-to-not-use-digests-in-engine.patch - 510-e_devcrypto-ignore-error-when-closing-session.patch Co-authored-by: Ryan Keane <the.ra2.ifv@gmail.com> Signed-off-by: Georgi Valkov <gvalkov@gmail.com>
1 parent 320cdff commit 85b36c0

6 files changed

+19
-17
lines changed

package/libs/openssl/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=openssl
11-
PKG_VERSION:=3.0.16
11+
PKG_VERSION:=3.5.0
1212
PKG_RELEASE:=1
1313
PKG_BUILD_FLAGS:=no-mips16 gc-sections no-lto
1414

@@ -17,11 +17,13 @@ PKG_BUILD_PARALLEL:=1
1717
PKG_BASE:=$(subst $(space),.,$(wordlist 1,2,$(subst .,$(space),$(PKG_VERSION))))
1818
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1919
PKG_SOURCE_URL:= \
20-
https://www.openssl.org/source/ \
21-
https://www.openssl.org/source/old/$(PKG_BASE)/ \
22-
https://github.com/openssl/openssl/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
20+
http://www.openssl.org/source/ \
21+
http://www.openssl.org/source/old/$(PKG_BASE)/ \
22+
https://github.com/openssl/openssl/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ \
23+
http://ftp.fi.muni.cz/pub/openssl/source/ \
24+
http://ftp.fi.muni.cz/pub/openssl/source/old/$(PKG_BASE)/
2325

24-
PKG_HASH:=57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86
26+
PKG_HASH:=344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
2527

2628
PKG_LICENSE:=Apache-2.0
2729
PKG_LICENSE_FILES:=LICENSE

package/libs/openssl/patches/100-Configure-afalg-support.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
1010

1111
--- a/Configure
1212
+++ b/Configure
13-
@@ -1677,7 +1677,9 @@ $config{CFLAGS} = [ map { $_ eq '--ossl-
13+
@@ -1810,7 +1810,9 @@ $config{CFLAGS} = [ map { $_ eq '--ossl-
1414

1515
unless ($disabled{afalgeng}) {
1616
$config{afalgeng}="";
1717
- if (grep { $_ eq 'afalgeng' } @{$target{enable}}) {
1818
+ if ($target =~ m/openwrt$/) {
1919
+ push @{$config{engdirs}}, "afalg";
2020
+ } elsif (grep { $_ eq 'afalgeng' } @{$target{enable}}) {
21-
my $minver = 4*10000 + 1*100 + 0;
22-
if ($config{CROSS_COMPILE} eq "") {
23-
my $verstr = `uname -r`;
21+
push @{$config{engdirs}}, "afalg";
22+
} else {
23+
disable('not-linux', 'afalgeng');

package/libs/openssl/patches/120-strip-cflags-from-binary.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
1010

1111
--- a/crypto/build.info
1212
+++ b/crypto/build.info
13-
@@ -109,7 +109,7 @@ DEFINE[../libcrypto]=$UPLINKDEF
13+
@@ -115,7 +115,7 @@ DEFINE[../libcrypto]=$UPLINKDEF
1414

1515
DEPEND[info.o]=buildinf.h
1616
DEPEND[cversion.o]=buildinf.h

package/libs/openssl/patches/140-allow-prefer-chacha20.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
1616

1717
--- a/ssl/ssl_ciph.c
1818
+++ b/ssl/ssl_ciph.c
19-
@@ -1506,11 +1506,29 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
19+
@@ -1488,11 +1488,29 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
2020
ssl_cipher_apply_rule(0, SSL_kECDHE, 0, 0, 0, 0, 0, CIPHER_DEL, -1, &head,
2121
&tail);
2222

@@ -46,7 +46,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
4646

4747
/*
4848
* ...and generally, our preferred cipher is AES.
49-
@@ -1565,7 +1583,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
49+
@@ -1547,7 +1565,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
5050
* Within each group, ciphers remain sorted by strength and previous
5151
* preference, i.e.,
5252
* 1) ECDHE > DHE
@@ -55,7 +55,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
5555
* 3) AES > rest
5656
* 4) TLS 1.2 > legacy
5757
*
58-
@@ -2236,7 +2254,13 @@ const char *OSSL_default_cipher_list(voi
58+
@@ -2246,7 +2264,13 @@ const char *OSSL_default_cipher_list(voi
5959
*/
6060
const char *OSSL_default_ciphersuites(void)
6161
{
@@ -71,7 +71,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
7171
}
7272
--- a/include/openssl/ssl.h.in
7373
+++ b/include/openssl/ssl.h.in
74-
@@ -195,9 +195,15 @@ extern "C" {
74+
@@ -199,9 +199,15 @@ extern "C" {
7575
* DEPRECATED IN 3.0.0, in favor of OSSL_default_ciphersuites()
7676
* Update both macro and function simultaneously
7777
*/

package/libs/openssl/patches/500-e_devcrypto-default-to-not-use-digests-in-engine.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2121

2222
--- a/engines/e_devcrypto.c
2323
+++ b/engines/e_devcrypto.c
24-
@@ -905,7 +905,7 @@ static void prepare_digest_methods(void)
24+
@@ -906,7 +906,7 @@ static void prepare_digest_methods(void)
2525
for (i = 0, known_digest_nids_amount = 0; i < OSSL_NELEM(digest_data);
2626
i++) {
2727

@@ -30,7 +30,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
3030

3131
/*
3232
* Check that the digest is usable
33-
@@ -1119,7 +1119,7 @@ static const ENGINE_CMD_DEFN devcrypto_c
33+
@@ -1120,7 +1120,7 @@ static const ENGINE_CMD_DEFN devcrypto_c
3434
#ifdef IMPLEMENT_DIGEST
3535
{DEVCRYPTO_CMD_DIGESTS,
3636
"DIGESTS",

package/libs/openssl/patches/510-e_devcrypto-ignore-error-when-closing-session.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
1010

1111
--- a/engines/e_devcrypto.c
1212
+++ b/engines/e_devcrypto.c
13-
@@ -211,9 +211,8 @@ static int cipher_init(EVP_CIPHER_CTX *c
13+
@@ -212,9 +212,8 @@ static int cipher_init(EVP_CIPHER_CTX *c
1414
int ret;
1515

1616
/* cleanup a previous session */

0 commit comments

Comments
 (0)