Skip to content

Commit 58792e4

Browse files
jasonacoxjasonacox
committed
Add OpenSSL 3.0 support
1 parent 68f8c06 commit 58792e4

File tree

4 files changed

+84
-48
lines changed

4 files changed

+84
-48
lines changed

‎build.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ set -e
1313
# EDIT this section to Select Default Versions #
1414
################################################
1515

16-
OPENSSL="1.1.1t" # https://www.openssl.org/source/
17-
LIBCURL="8.0.1" # https://curl.haxx.se/download.html
18-
NGHTTP2="1.52.0" # https://nghttp2.org/
16+
#OPENSSL="1.1.1u" # https://www.openssl.org/source/
17+
OPENSSL="3.0.9" # https://www.openssl.org/source/
18+
LIBCURL="8.1.2" # https://curl.haxx.se/download.html
19+
NGHTTP2="1.55.1" # https://nghttp2.org/
1920

2021
################################################
2122

@@ -26,7 +27,7 @@ BUILD_CMD=$*
2627
# Set minimum OS versions for target
2728
MACOS_X86_64_VERSION="" # Empty = use host version
2829
MACOS_ARM64_VERSION="" # Min supported is MacOS 11.0 Big Sur
29-
CATALYST_IOS="15.0" # Min supported is iOS 15.0 for Mac Catalyst
30+
CATALYST_IOS="15.0" # Min supported is iOS 15.0 for Mac Catalyst
3031
IOS_MIN_SDK_VERSION="8.0"
3132
TVOS_MIN_SDK_VERSION="9.0"
3233

‎clean.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22
echo "Cleaning Build-OpenSSL-cURL"
3-
rm -fr curl/curl-* curl/include curl/lib openssl/openssl-1* openssl/openssl-ios* openssl/Mac openssl/iOS* openssl/tvOS* openssl/Catalyst nghttp2/nghttp2-1* nghttp2/Mac nghttp2/iOS* nghttp2/tvOS* nghttp2/lib nghttp2/Catalyst example/iOS\ Test\ App/build/* *.tgz *.pkg nghttp2/pkg-config* /tmp/curl /tmp/openssl /tmp/pkg_config
3+
rm -fr curl/curl-* curl/include curl/lib openssl/openssl-1* openssl/openssl-3* openssl/openssl-ios* openssl/Mac openssl/iOS* openssl/tvOS* openssl/Catalyst nghttp2/nghttp2-1* nghttp2/Mac nghttp2/iOS* nghttp2/tvOS* nghttp2/lib nghttp2/Catalyst example/iOS\ Test\ App/build/* *.tgz *.pkg nghttp2/pkg-config* /tmp/curl /tmp/openssl /tmp/pkg_config

‎openssl/openssl-build-phase1.sh

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ buildMac()
176176

177177
pushd . > /dev/null
178178
cd "${OPENSSL_VERSION}"
179-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
180-
./Configure no-asm ${TARGET} -no-shared --prefix="/tmp/${OPENSSL_VERSION}-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-${ARCH}.log"
181-
else
179+
if [[ "$OPENSSL_VERSION" = "openssl-1.0"* ]]; then
182180
./Configure no-asm ${TARGET} -no-shared --openssldir="/tmp/${OPENSSL_VERSION}-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-${ARCH}.log"
181+
else
182+
./Configure no-asm ${TARGET} -no-shared --prefix="/tmp/${OPENSSL_VERSION}-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-${ARCH}.log"
183183
fi
184184
make -j${CORES} >> "/tmp/${OPENSSL_VERSION}-${ARCH}.log" 2>&1
185185
make install_sw >> "/tmp/${OPENSSL_VERSION}-${ARCH}.log" 2>&1
@@ -249,10 +249,10 @@ buildCatalyst()
249249

250250
echo -e "${subbold}Building ${OPENSSL_VERSION} for ${archbold}${ARCH}${dim} (MacOS ${MACOS_VER} Catalyst iOS ${CATALYST_IOS})"
251251

252-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
253-
./Configure no-asm ${TARGET} -no-shared --prefix="/tmp/${OPENSSL_VERSION}-catalyst-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-catalyst-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-catalyst-${ARCH}.log"
254-
else
252+
if [[ "$OPENSSL_VERSION" = "openssl-1.0"* ]]; then
255253
./Configure no-asm ${TARGET} -no-shared --openssldir="/tmp/${OPENSSL_VERSION}-catalyst-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-catalyst-${ARCH}.log"
254+
else
255+
./Configure no-asm ${TARGET} -no-shared --prefix="/tmp/${OPENSSL_VERSION}-catalyst-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-catalyst-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-catalyst-${ARCH}.log"
256256
fi
257257

258258
#if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
@@ -305,30 +305,37 @@ buildTVOS()
305305
LANG=C sed -i -- 's/fork()/-1/' "./test/drbgtest.c"
306306
LANG=C sed -i -- 's/!defined(OPENSSL_NO_ASYNC)/defined(HAVE_FORK)/' "./crypto/async/arch/async_posix.h"
307307
fi
308+
if [[ "$OPENSSL_VERSION" = "openssl-3.0"* ]]; then
309+
# LANG=C sed -i -- 's/!defined(OPENSSL_NO_POSIX_IO)/defined(HAVE_FORK)/' "./apps/ocsp.c"
310+
LANG=C sed -i -- 's/fork()/-1/' "./apps/speed.c"
311+
LANG=C sed -i -- 's/fork()/-1/' "./apps/lib/http_server.c"
312+
LANG=C sed -i -- 's/fork()/-1/' "./test/drbgtest.c"
313+
LANG=C sed -i -- 's/undef NO_FORK/define NO_FORK/' "./crypto/async/arch/async_posix.h"
314+
export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH}"
315+
fi
308316

309317
# Patch Configure to build for tvOS, not iOS
310318
LANG=C sed -i -- 's/D\_REENTRANT\:iOS/D\_REENTRANT\:tvOS/' "./Configure"
311319
chmod u+x ./Configure
312320

313321
if [[ "${ARCH}" == "x86_64" ]]; then
314-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
315-
./Configure no-asm darwin64-x86_64-cc -no-shared --prefix="/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}.log"
316-
else
322+
if [[ "$OPENSSL_VERSION" = "openssl-1.0"* ]]; then
317323
./Configure no-asm darwin64-x86_64-cc --openssldir="/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}.log"
324+
else
325+
./Configure no-asm darwin64-x86_64-cc -no-shared --prefix="/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}.log"
318326
fi
319327
else
320-
export CC="${BUILD_TOOLS}/usr/bin/gcc -fembed-bitcode -arch ${ARCH}"
321-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
322-
./Configure iphoneos-cross DSO_LDFLAGS=-fembed-bitcode --prefix="/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}" -no-shared --openssldir="/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}.log"
323-
else
328+
if [[ "$OPENSSL_VERSION" = "openssl-1.0"* ]]; then
324329
./Configure iphoneos-cross --openssldir="/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}.log"
330+
else
331+
./Configure iphoneos-cross DSO_LDFLAGS=-fembed-bitcode --prefix="/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}" -no-shared --openssldir="/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}.log"
325332
fi
326333
fi
327334
# add -isysroot to CC=
328-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
329-
sed -ie "s!^CFLAGS=!CFLAGS=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -mtvos-version-min=${TVOS_MIN_SDK_VERSION} !" "Makefile"
330-
else
335+
if [[ "$OPENSSL_VERSION" = "openssl-1.0"* ]]; then
331336
sed -ie "s!^CFLAG=!CFLAG=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -mtvos-version-min=${TVOS_MIN_SDK_VERSION} !" "Makefile"
337+
else
338+
sed -ie "s!^CFLAGS=!CFLAGS=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -mtvos-version-min=${TVOS_MIN_SDK_VERSION} !" "Makefile"
332339
fi
333340

334341
make -j${CORES} >> "/tmp/${OPENSSL_VERSION}-tvOS-${ARCH}.log" 2>&1
@@ -377,22 +384,31 @@ buildTVOSsim()
377384
LANG=C sed -i -- 's/fork()/-1/' "./test/drbgtest.c"
378385
LANG=C sed -i -- 's/!defined(OPENSSL_NO_ASYNC)/defined(HAVE_FORK)/' "./crypto/async/arch/async_posix.h"
379386
fi
387+
if [[ "$OPENSSL_VERSION" = "openssl-3.0"* ]]; then
388+
# LANG=C sed -i -- 's/!defined(OPENSSL_NO_POSIX_IO)/defined(HAVE_FORK)/' "./apps/ocsp.c"
389+
LANG=C sed -i -- 's/fork()/-1/' "./apps/speed.c"
390+
LANG=C sed -i -- 's/fork()/-1/' "./apps/lib/http_server.c"
391+
LANG=C sed -i -- 's/fork()/-1/' "./test/drbgtest.c"
392+
LANG=C sed -i -- 's/undef NO_FORK/define NO_FORK/' "./crypto/async/arch/async_posix.h"
393+
export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH}"
394+
export CFLAGS=" -Os -arch ${ARCH} ${RUNTARGET} "
395+
fi
380396

381397
# Patch Configure to build for tvOS, not iOS
382398
LANG=C sed -i -- 's/D\_REENTRANT\:iOS/D\_REENTRANT\:tvOS/' "./Configure"
383399
chmod u+x ./Configure
384400

385-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
386-
./Configure no-asm ${TARGET} -no-shared --prefix="/tmp/${OPENSSL_VERSION}-tvOS-Simulator-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-tvOS-Simulator-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-tvOS-Simulator-${ARCH}.log"
387-
else
401+
if [[ "$OPENSSL_VERSION" = "openssl-1.0"* ]]; then
388402
./Configure no-asm --openssldir="/tmp/${OPENSSL_VERSION}-tvOS-Simulator-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-tvOS-Simulator-${ARCH}.log"
403+
else
404+
./Configure no-asm ${TARGET} -no-shared --prefix="/tmp/${OPENSSL_VERSION}-tvOS-Simulator-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-tvOS-Simulator-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-tvOS-Simulator-${ARCH}.log"
389405
fi
390406

391407
# add -isysroot to CC=
392-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
393-
sed -ie "s!^CFLAGS=!CFLAGS=-isysroot ${SYSROOT} -mtvos-version-min=${TVOS_MIN_SDK_VERSION} !" "Makefile"
394-
else
408+
if [[ "$OPENSSL_VERSION" = "openssl-1.0"* ]]; then
395409
sed -ie "s!^CFLAG=!CFLAG=-isysroot ${SYSROOT} -mtvos-version-min=${TVOS_MIN_SDK_VERSION} !" "Makefile"
410+
else
411+
sed -ie "s!^CFLAGS=!CFLAGS=-isysroot ${SYSROOT} -mtvos-version-min=${TVOS_MIN_SDK_VERSION} !" "Makefile"
396412
fi
397413

398414
make -j${CORES} >> "/tmp/${OPENSSL_VERSION}-tvOS-Simulator-${ARCH}.log" 2>&1
@@ -440,11 +456,11 @@ else
440456
echo "Using ${OPENSSL_VERSION}.tar.gz"
441457
fi
442458

443-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
444-
echo "** Building OpenSSL 1.1.1 **"
459+
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* || "$OPENSSL_VERSION" = "openssl-3"* ]]; then
460+
echo "** Building OpenSSL ${OPENSSL_VERSION} **"
445461
else
446462
if [[ "$OPENSSL_VERSION" = "openssl-1.0."* ]]; then
447-
echo "** Building OpenSSL 1.0.x ** "
463+
echo "** Building OpenSSL ${OPENSSL_VERSION} ** "
448464
echo -e "${alert}** WARNING: End of Life Version - Upgrade to 1.1.1 **${dim}"
449465
else
450466
echo -e "${alert}** WARNING: This build script has not been tested with $OPENSSL_VERSION **${dim}"

‎openssl/openssl-build-phase2.sh

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,16 @@ buildIOS()
149149
export CROSS_TOP="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer"
150150
export CROSS_SDK="${PLATFORM}${IOS_SDK_VERSION}.sdk"
151151
export BUILD_TOOLS="${DEVELOPER}"
152-
export CC="${BUILD_TOOLS}/usr/bin/gcc -fembed-bitcode -arch ${ARCH}"
152+
ADDCFLAG=""
153+
if [[ "$OPENSSL_VERSION" = "openssl-3.0"* ]]; then
154+
export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH}"
155+
if [[ "${ARCH}" == "armv7" || "${ARCH}" == "armv7s" ]]; then
156+
# armv7 doesn't work with atomic
157+
ADDCFLAG="-DBROKEN_CLANG_ATOMICS "
158+
fi
159+
else
160+
export CC="${BUILD_TOOLS}/usr/bin/gcc -fembed-bitcode -arch ${ARCH}"
161+
fi
153162

154163
echo -e "${subbold}Building ${OPENSSL_VERSION} for ${PLATFORM} ${IOS_SDK_VERSION} ${archbold}${ARCH}${dim} (iOS ${IOS_MIN_SDK_VERSION})"
155164

@@ -158,24 +167,24 @@ buildIOS()
158167
if [[ $ARCH == "x86_64" ]]; then
159168
TARGET="darwin64-x86_64-cc"
160169
fi
161-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
162-
./Configure no-asm ${TARGET} -no-shared --prefix="/tmp/${OPENSSL_VERSION}-iOS-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-iOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-iOS-${ARCH}.log"
163-
else
170+
if [[ "$OPENSSL_VERSION" = "openssl-1.0"* ]]; then
164171
./Configure no-asm ${TARGET} -no-shared --openssldir="/tmp/${OPENSSL_VERSION}-iOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-iOS-${ARCH}.log"
172+
else
173+
./Configure no-asm ${TARGET} -no-shared --prefix="/tmp/${OPENSSL_VERSION}-iOS-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-iOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-iOS-${ARCH}.log"
165174
fi
166175
else
167-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
176+
if [[ "$OPENSSL_VERSION" = "openssl-1.0"* ]]; then
168177
# export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH}"
169-
./Configure iphoneos-cross DSO_LDFLAGS=-fembed-bitcode --prefix="/tmp/${OPENSSL_VERSION}-iOS-${ARCH}" -no-shared --openssldir="/tmp/${OPENSSL_VERSION}-iOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-iOS-${ARCH}.log"
170-
else
171178
./Configure iphoneos-cross -no-shared --openssldir="/tmp/${OPENSSL_VERSION}-iOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-iOS-${ARCH}.log"
179+
else
180+
./Configure iphoneos-cross DSO_LDFLAGS=-fembed-bitcode --prefix="/tmp/${OPENSSL_VERSION}-iOS-${ARCH}" -no-shared --openssldir="/tmp/${OPENSSL_VERSION}-iOS-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-iOS-${ARCH}.log"
172181
fi
173182
fi
174183
# add -isysroot to CC=
175-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
176-
sed -ie "s!^CFLAGS=!CFLAGS=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -miphoneos-version-min=${IOS_MIN_SDK_VERSION} !" "Makefile"
177-
else
184+
if [[ "$OPENSSL_VERSION" = "openssl-1.0"* ]]; then
178185
sed -ie "s!^CFLAG=!CFLAG=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -miphoneos-version-min=${IOS_MIN_SDK_VERSION} !" "Makefile"
186+
else
187+
sed -ie "s!^CFLAGS=!CFLAGS=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -miphoneos-version-min=${IOS_MIN_SDK_VERSION} ${ADDCFLAG} !" "Makefile"
179188
fi
180189

181190
make -j${CORES} >> "/tmp/${OPENSSL_VERSION}-iOS-${ARCH}.log" 2>&1
@@ -218,9 +227,18 @@ buildIOSsim()
218227
# fi
219228
#fi
220229
fi
221-
230+
222231
# set up exports for build
223-
export CFLAGS=" -Os -miphoneos-version-min=${MIPHONEOS} -fembed-bitcode -arch ${ARCH} ${RUNTARGET} "
232+
if [[ "$OPENSSL_VERSION" = "openssl-3.0"* ]]; then
233+
if [[ "${ARCH}" == "armv7" || "${ARCH}" == "armv7s" || "${ARCH}" == "i386" ]]; then
234+
# armv7 and i386 doesn't work with atomic
235+
export CFLAGS=" -Os -miphoneos-version-min=${MIPHONEOS} -DBROKEN_CLANG_ATOMICS -arch ${ARCH} ${RUNTARGET} "
236+
else
237+
export CFLAGS=" -Os -miphoneos-version-min=${MIPHONEOS} ${ADDCFLAG} -arch ${ARCH} ${RUNTARGET} "
238+
fi
239+
else
240+
export CFLAGS=" -Os -miphoneos-version-min=${MIPHONEOS} -fembed-bitcode -arch ${ARCH} ${RUNTARGET} "
241+
fi
224242
export LDFLAGS=" -arch ${ARCH} -isysroot ${DEVELOPER}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk "
225243
export CPPFLAGS=" -I.. -isysroot ${DEVELOPER}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk "
226244
export CROSS_TOP="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer"
@@ -232,10 +250,10 @@ buildIOSsim()
232250
echo -e "${subbold}Building ${OPENSSL_VERSION} for ${PLATFORM} ${iOS_SDK_VERSION} ${archbold}${ARCH}${dim} (iOS ${MIPHONEOS})"
233251

234252
# configure
235-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
236-
./Configure no-asm ${TARGET} -no-shared --prefix="/tmp/${OPENSSL_VERSION}-iOS-Simulator-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-iOS-Simulator-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-iOS-Simulator-${ARCH}.log"
237-
else
253+
if [[ "$OPENSSL_VERSION" = "openssl-1.0"* ]]; then
238254
./Configure no-asm ${TARGET} -no-shared --openssldir="/tmp/${OPENSSL_VERSION}-iOS-Simulator-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-iOS-Simulator-${ARCH}.log"
255+
else
256+
./Configure no-asm ${TARGET} -no-shared --prefix="/tmp/${OPENSSL_VERSION}-iOS-Simulator-${ARCH}" --openssldir="/tmp/${OPENSSL_VERSION}-iOS-Simulator-${ARCH}" $CUSTOMCONFIG &> "/tmp/${OPENSSL_VERSION}-iOS-Simulator-${ARCH}.log"
239257
fi
240258

241259
# add -isysroot to CC=
@@ -292,11 +310,11 @@ else
292310
echo "Using ${OPENSSL_VERSION}.tar.gz"
293311
fi
294312

295-
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* ]]; then
296-
echo "** Building OpenSSL 1.1.1 **"
313+
if [[ "$OPENSSL_VERSION" = "openssl-1.1.1"* || "$OPENSSL_VERSION" = "openssl-3"* ]]; then
314+
echo "** Building OpenSSL ${OPENSSL_VERSION} **"
297315
else
298316
if [[ "$OPENSSL_VERSION" = "openssl-1.0."* ]]; then
299-
echo "** Building OpenSSL 1.0.x ** "
317+
echo "** Building OpenSSL ${OPENSSL_VERSION} ** "
300318
echo -e "${alert}** WARNING: End of Life Version - Upgrade to 1.1.1 **${dim}"
301319
else
302320
echo -e "${alert}** WARNING: This build script has not been tested with $OPENSSL_VERSION **${dim}"
@@ -312,6 +330,7 @@ if [ "$engine" == "1" ]; then
312330
fi
313331

314332
echo -e "${bold}Building iOS libraries${dim}"
333+
315334
buildIOS "armv7"
316335
buildIOS "armv7s"
317336
buildIOS "arm64"

0 commit comments

Comments
 (0)