Skip to content

Commit 55a88f8

Browse files
reaperhulkwebknjaz
authored andcommitted
openssl 3.3.2 (#612)
* openssl 3.3.2 * fix paths for mac/win as well * vendor a patch to work around the openssl 3.3.2 perl issue (cherry picked from commit 3a92c5cba96d920617d9c586ebc64abc96ac08ac)
1 parent f0a799b commit 55a88f8

File tree

4 files changed

+57
-3
lines changed

4 files changed

+57
-3
lines changed

build-scripts/manylinux-container-image/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ADD install_libffi.sh /root/install_libffi.sh
1212
RUN ./install_libffi.sh "${RELEASE}"
1313
ADD install_openssl.sh /root/install_openssl.sh
1414
ADD openssl-version.sh /root/openssl-version.sh
15+
ADD list-util-pairs-25367.patch /root/list-util-pairs-25367.patch
1516
RUN ./install_openssl.sh "${RELEASE}"
1617

1718
ADD install_virtualenv.sh /root/install_virtualenv.sh

build-scripts/manylinux-container-image/install_openssl.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ MY_DIR=$(dirname "${BASH_SOURCE[0]}")
88

99
# Get build utilities
1010
source $MY_DIR/build_utils.sh
11+
12+
OPENSSL_URL="https://github.com/openssl/openssl/releases/download"
1113
source /root/openssl-version.sh
1214

13-
fetch_source "openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/"
15+
curl -#LO "${OPENSSL_URL}/${OPENSSL_VERSION}/${OPENSSL_VERSION}.tar.gz"
1416
check_sha256sum "openssl-${OPENSSL_VERSION}.tar.gz" ${OPENSSL_SHA256}
1517
tar zxf openssl-${OPENSSL_VERSION}.tar.gz
1618

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
diff --git a/util/mkinstallvars.pl b/util/mkinstallvars.pl
2+
index 52a3d607bd..b67a1c477f 100644
3+
--- a/util/mkinstallvars.pl
4+
+++ b/util/mkinstallvars.pl
5+
@@ -10,8 +10,14 @@
6+
# form, or passed as variable assignments on the command line.
7+
# The result is a Perl module creating the package OpenSSL::safe::installdata.
8+
9+
+use 5.10.0;
10+
+use strict;
11+
+use warnings;
12+
+use Carp;
13+
+
14+
use File::Spec;
15+
-use List::Util qw(pairs);
16+
+#use List::Util qw(pairs);
17+
+sub _pairs (@);
18+
19+
# These are expected to be set up as absolute directories
20+
my @absolutes = qw(PREFIX libdir);
21+
@@ -19,9 +25,9 @@ my @absolutes = qw(PREFIX libdir);
22+
# as subdirectories to PREFIX or LIBDIR. The order of the pairs is important,
23+
# since the LIBDIR subdirectories depend on the calculation of LIBDIR from
24+
# PREFIX.
25+
-my @subdirs = pairs (PREFIX => [ qw(BINDIR LIBDIR INCLUDEDIR APPLINKDIR) ],
26+
- LIBDIR => [ qw(ENGINESDIR MODULESDIR PKGCONFIGDIR
27+
- CMAKECONFIGDIR) ]);
28+
+my @subdirs = _pairs (PREFIX => [ qw(BINDIR LIBDIR INCLUDEDIR APPLINKDIR) ],
29+
+ LIBDIR => [ qw(ENGINESDIR MODULESDIR PKGCONFIGDIR
30+
+ CMAKECONFIGDIR) ]);
31+
# For completeness, other expected variables
32+
my @others = qw(VERSION LDLIBS);
33+
34+
@@ -151,3 +157,17 @@ our \@LDLIBS =
35+
36+
1;
37+
_____
38+
+
39+
+######## Helpers
40+
+
41+
+sub _pairs (@) {
42+
+ croak "Odd number of arguments" if @_ & 1;
43+
+
44+
+ my @pairlist = ();
45+
+
46+
+ while (@_) {
47+
+ my $x = [ shift, shift ];
48+
+ push @pairlist, $x;
49+
+ }
50+
+ return @pairlist;
51+
+}

build-scripts/manylinux-container-image/openssl-version.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
export OPENSSL_VERSION="1.1.1k"
2-
export OPENSSL_SHA256="892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5"
1+
export OPENSSL_VERSION="openssl-3.3.2"
2+
export OPENSSL_SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281"
33
# We need a base set of flags because on Windows using MSVC
44
# enable-ec_nistp_64_gcc_128 doesn't work since there's no 128-bit type
55
export OPENSSL_BUILD_FLAGS_WINDOWS="no-ssl3 no-ssl3-method no-zlib no-shared no-module no-comp no-dynamic-engine no-apps no-docs no-sm2-precomp no-atexit"

0 commit comments

Comments
 (0)