Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenSSL 3.1.2. #474

Merged
merged 5 commits into from
Sep 13, 2023
Merged

OpenSSL 3.1.2. #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
685c6c8
OpenSSL 3.1.2.
kennethshackleton Sep 12, 2023
292d672
Use helper config script.
kennethshackleton Sep 12, 2023
fdee60c
Update OpenSSL license declaration.
kennethshackleton Sep 12, 2023
eb3c72b
Merge branch 'main' into openssl3
kennethshackleton Sep 13, 2023
f997f67
Temporarily disable some build caching.
kennethshackleton Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions OpenSSL/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -146,7 +146,7 @@ tasks.register<Exec>("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")
}
Expand All @@ -162,7 +162,7 @@ tasks.register<Exec>("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)
Expand All @@ -174,7 +174,7 @@ tasks.register<Copy>("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")
Expand Down
2 changes: 1 addition & 1 deletion OpenSSL/build_libraries.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions selekt-android-sqlcipher/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading