Update to build OpenSSL 3.x #72

jasonacox · Nov 10, 2024 · 2d5e8df · 2d5e8df
1 parent 2da2146
commit 2d5e8df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/openssl/openssl-build-phase1.sh b/openssl/openssl-build-phase1.sh
@@ -207,7 +207,7 @@ buildCatalyst()
 	ARCH=$1
 
 	# disabe bitcode for openssl 3
-	if [[ "$OPENSSL_VERSION" = "openssl-3.0"* ]]; then
+	if [[ "$OPENSSL_VERSION" = "openssl-3"* ]]; then
 		CC_BITCODE_FLAG=""
 	else
 		CC_BITCODE_FLAG="-fembed-bitcode"
@@ -312,7 +312,7 @@ buildTVOS()
 		LANG=C sed -i -- 's/fork()/-1/' "./test/drbgtest.c"
 		LANG=C sed -i -- 's/!defined(OPENSSL_NO_ASYNC)/defined(HAVE_FORK)/' "./crypto/async/arch/async_posix.h"
 	fi
-	if [[ "$OPENSSL_VERSION" = "openssl-3.0"* ]]; then
+	if [[ "$OPENSSL_VERSION" = "openssl-3"* ]]; then
 		# LANG=C sed -i -- 's/!defined(OPENSSL_NO_POSIX_IO)/defined(HAVE_FORK)/' "./apps/ocsp.c"
 		LANG=C sed -i -- 's/fork()/-1/' "./apps/speed.c"
 		LANG=C sed -i -- 's/fork()/-1/' "./apps/lib/http_server.c"
@@ -393,7 +393,7 @@ buildTVOSsim()
 		LANG=C sed -i -- 's/fork()/-1/' "./test/drbgtest.c"
 		LANG=C sed -i -- 's/!defined(OPENSSL_NO_ASYNC)/defined(HAVE_FORK)/' "./crypto/async/arch/async_posix.h"
 	fi
-	if [[ "$OPENSSL_VERSION" = "openssl-3.0"* ]]; then
+	if [[ "$OPENSSL_VERSION" = "openssl-3"* ]]; then
 		# LANG=C sed -i -- 's/!defined(OPENSSL_NO_POSIX_IO)/defined(HAVE_FORK)/' "./apps/ocsp.c"
 		LANG=C sed -i -- 's/fork()/-1/' "./apps/speed.c"
 		LANG=C sed -i -- 's/fork()/-1/' "./apps/lib/http_server.c"

diff --git a/openssl/openssl-build-phase2.sh b/openssl/openssl-build-phase2.sh
@@ -151,7 +151,7 @@ buildIOS()
 	export BUILD_TOOLS="${DEVELOPER}"
 	ADDCFLAG=""
 	DSO_LDFLAGS="DSO_LDFLAGS=-fembed-bitcode"
-	if [[ "$OPENSSL_VERSION" = "openssl-3.0"* ]]; then
+	if [[ "$OPENSSL_VERSION" = "openssl-3"* ]]; then
 		# disable bitcode for openssl 3
 		export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH}"
 		DSO_LDFLAGS=""
@@ -220,7 +220,7 @@ buildIOSsim()
 	fi
 
 	# set up exports for build 
-	if [[ "$OPENSSL_VERSION" = "openssl-3.0"* ]]; then
+	if [[ "$OPENSSL_VERSION" = "openssl-3"* ]]; then
 		if [[ "${ARCH}" == "armv7" || "${ARCH}" == "armv7s" || "${ARCH}" == "i386" ]]; then
 		    # armv7 and i386 doesn't work with atomic
 			export CFLAGS=" -Os -miphoneos-version-min=${MIPHONEOS} -DBROKEN_CLANG_ATOMICS -arch ${ARCH} ${RUNTARGET} "