From 685c6c830beece6989502f0352c1ffa87e00217e Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Tue, 12 Sep 2023 17:10:46 +0100 Subject: [PATCH 1/4] OpenSSL 3.1.2. Signed-off-by: Kenneth J. Shackleton --- gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 55daac619c..dddd391827 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ selekt.versionName=0.20.0 selekt.nextVersionName=0.21.0 -openssl.version=1.1.1 -openssl.version.suffix=v -openssl.sha256=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 -openssl.pgp.sha256=8f3fc7e6c7b685144373c8acdc2c9a64435076b4cfbcb4264293af8093cc5b5c +openssl.version=3.1.2 +openssl.version.suffix= +openssl.sha256=a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539 +openssl.pgp.sha256=0c14b85a86966752f1cdc2a3306497010d5fb9d405070b64cbb201d7ad1eb61a sqlcipher.versionName=4.5.5 From 292d672ae40cccf3327dc7fa99b38b436f97926c Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Tue, 12 Sep 2023 18:11:10 +0100 Subject: [PATCH 2/4] Use helper config script. Signed-off-by: Kenneth J. Shackleton --- OpenSSL/build_libraries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSSL/build_libraries.sh b/OpenSSL/build_libraries.sh index 08f10903fa..adbdf5c949 100755 --- a/OpenSSL/build_libraries.sh +++ b/OpenSSL/build_libraries.sh @@ -71,7 +71,7 @@ OPENSSL_CONFIGURE_OPTIONS="-fPIC -fstack-protector-all no-idea no-camellia \ TOOLCHAIN_BIN="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${TOOLCHAIN_SYSTEM}/bin/" PATH=${TOOLCHAIN_BIN}:${PATH} -./Configure ${ARCH} \ +./config ${ARCH} \ -D__ANDROID_API__=${ANDROID_API} \ -D_FILE_OFFSET_BITS=${OFFSET} \ ${OPENSSL_CONFIGURE_OPTIONS} From fdee60c7c4d8cf922dfd1f53fe14bc01a8dc055c Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Tue, 12 Sep 2023 18:32:42 +0100 Subject: [PATCH 3/4] Update OpenSSL license declaration. Signed-off-by: Kenneth J. Shackleton --- selekt-android-sqlcipher/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selekt-android-sqlcipher/build.gradle.kts b/selekt-android-sqlcipher/build.gradle.kts index fd928d4c54..86ddf27b76 100644 --- a/selekt-android-sqlcipher/build.gradle.kts +++ b/selekt-android-sqlcipher/build.gradle.kts @@ -65,8 +65,8 @@ components.matching { "release" == it.name }.configureEach { description.set("SQLCipher for Selekt's Android Library.") licenses { license { - name.set("Dual OpenSSL and SSLeay License") - url.set("https://www.openssl.org/source/license-openssl-ssleay.txt") + name.set("The Apache Software License, Version 2.0") + url.set("https://www.apache.org/licenses/LICENSE-2.0.txt") } license { name.set("Zetetic LLC") From f997f67a7978e09a1aee38551d6ffe60393ac847 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Wed, 13 Sep 2023 08:17:53 +0100 Subject: [PATCH 4/4] Temporarily disable some build caching. Signed-off-by: Kenneth J. Shackleton --- OpenSSL/build.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSSL/build.gradle.kts b/OpenSSL/build.gradle.kts index 93cba01ca4..15f73a4316 100644 --- a/OpenSSL/build.gradle.kts +++ b/OpenSSL/build.gradle.kts @@ -101,7 +101,7 @@ arrayOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64").forEach { outputs.files(fileTree("${openSslWorkingDir(it)}/include") { include("**/*.h") }) .withPropertyName("headers") outputs.dir("${layout.buildDirectory.get()}/libs/$it").withPropertyName("lib") - outputs.cacheIf { true } + outputs.cacheIf { false } // TODO Restore me. workingDir(projectDir) commandLine("./build_libraries.sh") args( @@ -146,7 +146,7 @@ tasks.register("configureHost") { inputs.property("version", openSslVersion()) outputs.files("$openSslWorkingDir/Makefile", "$openSslWorkingDir/configdata.pm") .withPropertyName("configure") - outputs.cacheIf { true } + outputs.cacheIf { false } // TODO Restore me. workingDir(openSslWorkingDir) commandLine("./config") } @@ -162,7 +162,7 @@ tasks.register("makeHost") { outputs.files(fileTree("$openSslWorkingDir/include") { include("**/*.h") }) .withPropertyName("headers") workingDir(openSslWorkingDir) - outputs.cacheIf { true } + outputs.cacheIf { false } // TODO Restore me. commandLine("make") args("build_libs") logging.captureStandardOutput(LogLevel.INFO) @@ -174,7 +174,7 @@ tasks.register("assembleHost") { inputs.property("version", openSslVersion()) val outputDir = "${layout.buildDirectory.get()}/libs/${targetIdentifier()}" outputs.dir(outputDir).withPropertyName("libs") - outputs.cacheIf { true } + outputs.cacheIf { false } // TODO Restore me. from(fileTree(openSslWorkingDir) { arrayOf(".a").forEach { e -> include("**/libcrypto$e")