Merge pull request #282 from evo-lua/lua-openssl-update

Update OpenSSL and LuaOpenSSL to enable using the KDF API
evo-lua · Sep 20, 2023 · 75afe2c · 75afe2c
2 parents d6b1077 + 9fe3630
commit 75afe2c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/deps/luaopenssl-unixbuild.sh b/deps/luaopenssl-unixbuild.sh
@@ -6,8 +6,7 @@ SRC_DIR=deps/zhaog/lua-openssl
 BUILD_DIR=$SRC_DIR/cmakebuild-unix
 OUT_DIR=ninjabuild-unix
 
-# Include paths must be relative to the lua-openssl directory (NOT the project root)
-LUAJIT_SRC_DIR=../../LuaJIT/LuaJIT/src
+LUAJIT_SRC_DIR=$(pwd)/deps/LuaJIT/LuaJIT/src
 
 # Need to pass the full path for Mac OS builds?
 OPENSSL_DIR=$(pwd)/$BUILD_DIR

diff --git a/deps/luaopenssl-windowsbuild.sh b/deps/luaopenssl-windowsbuild.sh
@@ -6,8 +6,7 @@ SRC_DIR=deps/zhaog/lua-openssl
 BUILD_DIR=$SRC_DIR/cmakebuild-windows
 OUT_DIR=ninjabuild-windows
 
-# Include paths must be relative to the lua-openssl directory (NOT the project root)
-LUAJIT_SRC_DIR=../../LuaJIT/LuaJIT/src
+LUAJIT_SRC_DIR=$(pwd)/deps/LuaJIT/LuaJIT/src
 
 OPENSSL_DIR=$BUILD_DIR
 OPENSSL_INCLUDE_DIR=deps/openssl/openssl/include

diff --git a/deps/openssl-unixbuild.sh b/deps/openssl-unixbuild.sh
@@ -9,7 +9,7 @@ OPENSSL_DIR=deps/openssl/openssl
 
 cd $OPENSSL_DIR
 
-./config no-tests no-shared
+./config no-tests no-shared no-dso
 
 make clean
 make -j $NUM_PARALLEL_JOBS

diff --git a/deps/openssl-windowsbuild.sh b/deps/openssl-windowsbuild.sh
@@ -10,7 +10,7 @@ OPENSSL_DIR=deps/openssl/openssl
 
 cd $OPENSSL_DIR
 
-perl Configure mingw64 no-tests no-shared
+perl Configure mingw64 no-tests no-shared no-dso
 
 make clean
 make -j $NUM_PARALLEL_JOBS

diff --git a/deps/openssl/openssl b/deps/openssl/openssl
diff --git a/deps/zhaog/lua-openssl b/deps/zhaog/lua-openssl