download.lst | 4 ++-- external/openssl/0001-const-up-ERR_str_libraries.patch | 4 ++-- external/openssl/0001-const-up-various-low-hanging-things.patch | 8 ++++---- external/openssl/openssl-no-multilib.patch.0 | 8 ++++---- external/openssl/system-cannot-find-path-for-move.patch.0 | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-)
New commits: commit b63f8cd8df978c402683f7730562fb3c980eb893 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Nov 6 18:39:38 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 6 21:02:43 2025 +0100 Reapply "openssl: upgrade to 3.5.4 (master only)" This reverts commit 708abf24664a9a1aaeac452bcc8436026030e74e. Reason for revert: Probably it works with --with-visual-studio=2022 now Change-Id: Ibcfe74f9c7b0a460c527f1d8c121246081dcbb43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193544 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/download.lst b/download.lst index 85979d17c58f..e7b59b111a57 100644 --- a/download.lst +++ b/download.lst @@ -549,8 +549,8 @@ OPENLDAP_TARBALL := openldap-2.6.10.tgz # three static lines # so that git cherry-pick # will not run into conflicts -OPENSSL_SHA256SUM := d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b -OPENSSL_TARBALL := openssl-3.0.18.tar.gz +OPENSSL_SHA256SUM := 967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99 +OPENSSL_TARBALL := openssl-3.5.4.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/openssl/0001-const-up-ERR_str_libraries.patch b/external/openssl/0001-const-up-ERR_str_libraries.patch index d0e76b1b70fc..1ec8c60da8ab 100644 --- a/external/openssl/0001-const-up-ERR_str_libraries.patch +++ b/external/openssl/0001-const-up-ERR_str_libraries.patch @@ -12,9 +12,9 @@ diff --git a/crypto/err/err.c b/crypto/err/err.c index 167b66ed6b..e9228d66a3 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c -@@ -35,7 +35,7 @@ +@@ -34,7 +34,7 @@ + #endif - static void ERR_STATE_free(ERR_STATE *s); #ifndef OPENSSL_NO_ERR -static ERR_STRING_DATA ERR_str_libraries[] = { +static const ERR_STRING_DATA ERR_str_libraries[] = { diff --git a/external/openssl/0001-const-up-various-low-hanging-things.patch b/external/openssl/0001-const-up-various-low-hanging-things.patch index ac0831884144..93ca76d83768 100644 --- a/external/openssl/0001-const-up-various-low-hanging-things.patch +++ b/external/openssl/0001-const-up-various-low-hanging-things.patch @@ -122,10 +122,10 @@ diff --git a/crypto/rsa/rsa_ossl.c b/crypto/rsa/rsa_ossl.c index 1e56c6d38c..4f2af3167c 100644 --- a/crypto/rsa/rsa_ossl.c +++ b/crypto/rsa/rsa_ossl.c -@@ -30,7 +30,7 @@ - BN_CTX *ctx); - static int rsa_ossl_init(RSA *rsa); - static int rsa_ossl_finish(RSA *rsa); +@@ -36,7 +36,7 @@ + #ifdef S390X_MOD_EXP + static int rsa_ossl_s390x_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa, + BN_CTX *ctx); -static RSA_METHOD rsa_pkcs1_ossl_meth = { +static const RSA_METHOD rsa_pkcs1_ossl_meth = { "OpenSSL PKCS#1 RSA", diff --git a/external/openssl/openssl-no-multilib.patch.0 b/external/openssl/openssl-no-multilib.patch.0 index da9adf35785a..8b77beaae9c0 100644 --- a/external/openssl/openssl-no-multilib.patch.0 +++ b/external/openssl/openssl-no-multilib.patch.0 @@ -4,19 +4,19 @@ my $orig_death_handler = $SIG{__DIE__}; $SIG{__DIE__} = \&death_handler; --my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags] "; -+my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [no-multilib] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags] "; +-my $usage="Usage: Configure [no-<feature> ...] [enable-<feature> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]thread-pool] [[no-]default-thread-pool] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags] "; ++my $usage="Usage: Configure [no-<feature> ...] [enable-<feature> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]thread-pool] [[no-]default-thread-pool] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [no-multilib] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags] "; my $banner = <<"EOF"; -@@ -86,6 +86,7 @@ +@@ -99,6 +99,7 @@ # If disabled, it also disables shared and dynamic-engine. # no-asm do not use assembler # no-egd do not compile support for the entropy-gathering daemon APIs +# no-multilib exclude multilib identifier from library name # [no-]zlib [don't] compile support for zlib compression. # zlib-dynamic Like "zlib", but the zlib library is expected to be a shared - # library and will be loaded in run-time by the OpenSSL library. + # library and will be loaded at run-time by the OpenSSL library. @@ -458,6 +459,7 @@ "module", "msan", diff --git a/external/openssl/system-cannot-find-path-for-move.patch.0 b/external/openssl/system-cannot-find-path-for-move.patch.0 index 421d6b8df2be..2e7815dfee9c 100644 --- a/external/openssl/system-cannot-find-path-for-move.patch.0 +++ b/external/openssl/system-cannot-find-path-for-move.patch.0 @@ -1,9 +1,9 @@ --- Configurations/windows-makefile.tmpl 2022-09-09 15:18:35.849924899 +0100 +++ Configurations/windows-makefile.tmpl 2022-09-09 15:20:28.895825331 +0100 -@@ -790,7 +790,7 @@ +@@ -792,7 +792,7 @@ return <<"EOF"; $target: "$gen0" $deps - \$(CPP) $incs $cppflags $defs "$gen0" > \[email protected] + \$(CPP) /D__ASSEMBLER__ $incs $cppflags $defs "$gen0" > \[email protected] - move /Y \[email protected] \$@ + mv -f \[email protected] \$@ EOF
