Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(PA-6131) Bump openssl version #814

Merged
merged 1 commit into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions configs/components/openssl-3.0.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component 'openssl' do |pkg, settings, platform|
pkg.version '3.0.12'
pkg.sha256sum 'f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61'
pkg.version '3.0.13'
pkg.sha256sum '88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313'
pkg.url "https://openssl.org/source/openssl-#{pkg.get_version}.tar.gz"
pkg.mirror "#{settings[:buildsources_url]}/openssl-#{pkg.get_version}.tar.gz"

Expand All @@ -27,6 +27,9 @@
pkg.environment 'CYGWIN', settings[:cygwin]
pkg.environment 'MAKE', platform[:make]

# Remove this in 3.0.14 or later
pkg.apply_patch 'resources/patches/openssl/openssl-3.0.13-crypto-providers.patch'

target = platform.architecture == 'x64' ? 'mingw64' : 'mingw'
# elsif platform.is_cross_compiled_linux?
# pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH)"
Expand Down
64 changes: 64 additions & 0 deletions resources/patches/openssl/openssl-3.0.13-crypto-providers.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
From 7b3eda56d7891aceef91867de64f24b20e3db212 Mon Sep 17 00:00:00 2001
From: Richard Levitte <[email protected]>
Date: Thu, 1 Feb 2024 10:57:51 +0100
Subject: [PATCH] Fix a few incorrect paths in some build.info files

The following files referred to ../liblegacy.a when they should have
referred to ../../liblegacy.a. This cause the creation of a mysterious
directory 'crypto/providers', and because of an increased strictness
with regards to where directories are created, configuration failure
on some platforms.

Fixes #23436

Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Tom Cosgrove <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/23452)

(cherry picked from commit 667b45454a47959ce2934b74c899662e686993de)
---
crypto/aes/build.info | 2 +-
crypto/ec/build.info | 2 +-
crypto/sha/build.info | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/aes/build.info b/crypto/aes/build.info
index b250903fa6e26..271015e35e1bb 100644
--- a/crypto/aes/build.info
+++ b/crypto/aes/build.info
@@ -76,7 +76,7 @@ DEFINE[../../providers/libdefault.a]=$AESDEF
# already gets everything that the static libcrypto.a has, and doesn't need it
# added again.
IF[{- !$disabled{module} && !$disabled{shared} -}]
- DEFINE[../providers/liblegacy.a]=$AESDEF
+ DEFINE[../../providers/liblegacy.a]=$AESDEF
ENDIF

GENERATE[aes-ia64.s]=asm/aes-ia64.S
diff --git a/crypto/ec/build.info b/crypto/ec/build.info
index a511e887a9ba1..6dd98e9f4f172 100644
--- a/crypto/ec/build.info
+++ b/crypto/ec/build.info
@@ -77,7 +77,7 @@ DEFINE[../../providers/libdefault.a]=$ECDEF
# Otherwise, it already gets everything that the static libcrypto.a
# has, and doesn't need it added again.
IF[{- !$disabled{module} && !$disabled{shared} -}]
- DEFINE[../providers/liblegacy.a]=$ECDEF
+ DEFINE[../../providers/liblegacy.a]=$ECDEF
ENDIF

GENERATE[ecp_nistz256-x86.S]=asm/ecp_nistz256-x86.pl
diff --git a/crypto/sha/build.info b/crypto/sha/build.info
index d61f7de9b6bde..186ec13cc82a1 100644
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -88,7 +88,7 @@ DEFINE[../../providers/libdefault.a]=$SHA1DEF $KECCAK1600DEF
# linked with libcrypto. Otherwise, it already gets everything that
# the static libcrypto.a has, and doesn't need it added again.
IF[{- !$disabled{module} && !$disabled{shared} -}]
- DEFINE[../providers/liblegacy.a]=$SHA1DEF $KECCAK1600DEF
+ DEFINE[../../providers/liblegacy.a]=$SHA1DEF $KECCAK1600DEF
ENDIF

GENERATE[sha1-586.S]=asm/sha1-586.pl
Loading