YoungBlood/libsodium_wasm_experimental
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forgot to add files

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2020-06-01 20:38:33 +02:00 committed by Ugljesa Jovanovic
parent 293fd37bad
commit 8a4eb512c4
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
7 changed files with 102 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buildSrc/src/main/kotlin/Utils.kt
View File

@ -86,4 +86,14 @@ fun NamedDomainObjectContainer<KotlinSourceSet>.createWorkaroundNativeMainSource
}
}
}
fun NamedDomainObjectContainer<KotlinSourceSet>.createWorkaround32bitNativeMainSourceSet(name : String, nativeDeps : KotlinDependencyHandler.() -> Unit) : KotlinSourceSet {
return create("${name}Workaround") {
kotlin.srcDir("src/native32Main/kotlin")
dependencies {
nativeDeps.invoke(this)
}
}
}

112
multiplatform-crypto-delegated/build.gradle.kts
View File

@ -76,7 +76,7 @@ kotlin {
}
}
linuxX64("linux") {
linuxX64() {
binaries {
staticLib {
}
@ -171,6 +171,15 @@ kotlin {
optimized = true
}
}
compilations.getByName("main") {
val libsodiumCinterop by cinterops.creating {
defFile(project.file("src/nativeInterop/cinterop/libsodium.def"))
compilerOpts.add("-I${project.rootDir}/sodiumWrapper/static-macos-x86-64/include/")
}
kotlinOptions.freeCompilerArgs = listOf(
"-include-binary", "${project.rootDir}/sodiumWrapper/static-macos-x86-64/lib/libsodium.a"
)
}
}
tvosX64() {
binaries {
@ -220,6 +229,15 @@ kotlin {
optimized = true
}
}
compilations.getByName("main") {
val libsodiumCinterop by cinterops.creating {
defFile(project.file("src/nativeInterop/cinterop/libsodium.def"))
compilerOpts.add("-I${project.rootDir}/sodiumWrapper/static-mingw-x86-64/include/")
}
kotlinOptions.freeCompilerArgs = listOf(
"-include-binary", "${project.rootDir}/sodiumWrapper/static-mingw-x86-64/lib/libsodium.a"
)
}
}
}
@ -275,34 +293,42 @@ kotlin {
}
//Set up shared source sets
//linux, linuxArm32Hfp, linuxArm64
val linux64Bit = setOf(
"linuxX64", "linuxArm64"
)
val linux32Bit = setOf(
"linuxArm32Hfp"
)
//iosArm32, iosArm64, iosX64, macosX64, metadata, tvosArm64, tvosX64, watchosArm32, watchosArm64, watchosX86
val macos64Bit = setOf(
"macosX64"
)
val ios64Bit = setOf(
"iosArm64", "iosX64", "tvosArm64", "tvosX64", "watchosArm64"
)
val ios32Bit = setOf(
"iosArm32", "watchosX86"
)
val mingw64Bit = setOf(
"mingwX64"
)
targets.withType<KotlinNativeTarget> {
println("Target $name")
compilations.getByName("main") {
when(this@withType.name) {
}
if ((this@withType.name.contains("ios") || this@withType.name.contains("tvos") || this@withType.name.contains("watchos")).not()) {
compilations.getByName("main") {
if (linux64Bit.contains(this@withType.name)) {
defaultSourceSet.dependsOn(createWorkaroundNativeMainSourceSet(this@withType.name, nativeDependencies))
// println("Setting cinterop for $this")
// if (this@withType.name.contains("arm64")) {
// val libsodiumCinterop by cinterops.creating {
// defFile(project.file("src/nativeInterop/cinterop/libsodium.def"))
// compilerOpts.add("-I${project.rootDir}/sodiumWrapper/libsodium-arm64/include/")
// }
// kotlinOptions.freeCompilerArgs = listOf(
// "-include-binary", "${project.rootDir}/sodiumWrapper/libsodium-arm64/lib/libsodium.a"
// )
// } else {
// val libsodiumCinterop by cinterops.creating {
// defFile(project.file("src/nativeInterop/cinterop/libsodium.def"))
// compilerOpts.add("-I${project.rootDir}/sodiumWrapper/include/")
// }
// kotlinOptions.freeCompilerArgs = listOf(
// "-include-binary", "${project.rootDir}/sodiumWrapper/lib/libsodium.a"
// )
// }
}
if (this@withType.name.contains("ios") || this@withType.name.contains("tvos") || this@withType.name.contains("watchos")) {
if (linux32Bit.contains(this@withType.name)) {
defaultSourceSet.dependsOn(createWorkaround32bitNativeMainSourceSet(this@withType.name, nativeDependencies))
}
if (macos64Bit.contains(this@withType.name)) {
defaultSourceSet.dependsOn(createWorkaroundNativeMainSourceSet(this@withType.name, nativeDependencies))
}
//All ioses share the same static library
if (ios64Bit.contains(this@withType.name)) {
defaultSourceSet.dependsOn(createWorkaroundNativeMainSourceSet(this@withType.name, nativeDependencies))
println("Setting ios cinterop for $this")
val libsodiumCinterop by cinterops.creating {
@ -314,11 +340,28 @@ kotlin {
)
}
if (ios32Bit.contains(this@withType.name)) {
defaultSourceSet.dependsOn(createWorkaround32bitNativeMainSourceSet(this@withType.name, nativeDependencies))
println("Setting ios cinterop for $this")
val libsodiumCinterop by cinterops.creating {
defFile(project.file("src/nativeInterop/cinterop/libsodium.def"))
compilerOpts.add("-I${project.rootDir}/sodiumWrapper/static-ios/")
}
kotlinOptions.freeCompilerArgs = listOf(
"-include-binary", "${project.rootDir}/sodiumWrapper/static-ios/libsodium.a"
)
}
}
compilations.getByName("test") {
println("Setting native test dep for $this@withType.name")
defaultSourceSet.dependsOn(nativeTest)
if (linux64Bit.contains(this@withType.name) ||
macos64Bit.contains(this@withType.name) ||
mingw64Bit.contains(this@withType.name)) {
defaultSourceSet.dependsOn(nativeTest)
} else {
defaultSourceSet.dependsOn(native32Test)
}
}
@ -360,18 +403,31 @@ kotlin {
implementation(npm(Deps.Js.Npm.libsodium.first, Deps.Js.Npm.libsodium.second))
}
}
val linuxMain by getting {
val linuxX64Main by getting {
dependsOn(nativeMain)
isRunningInIdea {
kotlin.srcDir("src/nativeMain/kotlin")
}
}
val linuxTest by getting {
val linuxX64Test by getting {
dependsOn(nativeTest)
isRunningInIdea {
kotlin.srcDir("src/nativeTest/kotlin")
}
}
val linuxArm32HfpMain by getting {
dependsOn(native32Main)
isRunningInIdea {
kotlin.srcDir("src/native32Main/kotlin")
}
}
val linuxArm32HfpTest by getting {
dependsOn(native32Test)
isRunningInIdea {
kotlin.srcDir("src/native32Test/kotlin")
}
}
}
runningOnMacos {
@ -478,7 +534,7 @@ tasks {
}
}
val linuxTest by getting(KotlinNativeTest::class) {
val linuxX64Test by getting(KotlinNativeTest::class) {
testLogging {
events("PASSED", "FAILED", "SKIPPED")

0
multiplatform-crypto-delegated/src/linuxMain/kotlin/com/ionspin/kotlin/crypto/Placeholder → multiplatform-crypto-delegated/src/linuxX64Main/kotlin/com/ionspin/kotlin/crypto/Placeholder
View File

0
multiplatform-crypto-delegated/src/linuxTest/kotlin/com/ionspin/kotlin/crypto/Placeholder → multiplatform-crypto-delegated/src/linuxX64Test/kotlin/com/ionspin/kotlin/crypto/Placeholder
View File

2
multiplatform-crypto-delegated/src/native32Main/kotlin/com/ionspin/kotlin/crypto/SRNG.kt
View File

@ -31,7 +31,7 @@ actual object SRNG {
actual fun getRandomBytes(amount: Int): UByteArray {
memScoped {
val array = allocArray<UByteVar>(amount)
randombytes_buf(array, amount.toULong())
randombytes_buf(array, amount.toUInt())
return UByteArray(amount) {
array[it]
}

8
multiplatform-crypto-delegated/src/native32Main/kotlin/com/ionspin/kotlin/crypto/hash/blake2b/Blake2bDelegated.kt
View File

@ -38,11 +38,11 @@ actual object Blake2bStateless : Blake2bStatelessInterface {
val hashResultPinned = hashResult.pin()
crypto_generichash(
hashResultPinned.addressOf(0),
hashLength.toULong(),
hashLength.toUInt(),
inputString.encodeToByteArray().toUByteArray().toCValues(),
inputString.length.toULong(),
key?.run { this.encodeToByteArray().toUByteArray().toCValues() },
key?.length?.toULong() ?: 0UL
key?.length?.toUInt() ?: 0U
)
println("HashPointer: ${hashResult.toHexString()}")
println(hashResult.toHexString())
@ -54,11 +54,11 @@ actual object Blake2bStateless : Blake2bStatelessInterface {
crypto_generichash(
StableRef.create(hashResult).asCPointer().reinterpret(),
hashLength.toULong(),
hashLength.toUInt(),
inputMessage.toCValues(),
inputMessage.size.toULong(),
key.toCValues(),
key.size.toULong() ?: 0UL
key.size.toUInt() ?: 0U
)
println("HashPointer: ${hashResult.toHexString()}")
println(hashResult.toHexString())

7
sodiumWrapper/configureLinuxArm64.sh
View File

@ -1,9 +1,8 @@
#! /bin/sh
export PREFIX="$(pwd)/static-arm64"
export CC=/usr/bin/aarch64-linux-gnu-gcc
export TARGET_ARCH=armv8-a
export CFLAGS="-Os -march=${TARGET_ARCH}"
export SYSROOT="$HOME/.konan/dependencies/target-sysroot-1-linux-glibc-arm64/"
export CFLAGS="-O3"
export SYSROOT=$HOME/.konan/dependencies/target-sysroot-1-linux-glibc-arm64/
cd libsodium
./configure --prefix=$PREFIX --host=aarch64-linux-gnu-gcc --with-sysroot=$SYSROOT "$@"
./configure --prefix=$PREFIX --host=aarch64-linux-gnu-gcc --with-sysroot=$SYSROOT "$@"