From 1ff01d0fdd61677b5456ec353aa4c334527a18c7 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Tue, 2 Jul 2024 18:50:22 +0200 Subject: [PATCH] Fix shortHashKeygen, which doesn't have a return value, but was defined as returing Int in JNA defintion --- .../kotlin/com/ionspin/kotlin/crypto/JnaLibsodiumInterface.kt | 2 +- .../com/ionspin/kotlin/crypto/shortinputhash/ShortHash.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/JnaLibsodiumInterface.kt b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/JnaLibsodiumInterface.kt index 96db8cd..01f7830 100644 --- a/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/JnaLibsodiumInterface.kt +++ b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/JnaLibsodiumInterface.kt @@ -274,7 +274,7 @@ interface JnaLibsodiumInterface : Library { fun crypto_shorthash(out: ByteArray, input: ByteArray, inlen: Long, key: ByteArray): Int // void crypto_shorthash_keygen(unsigned char k[crypto_shorthash_KEYBYTES]) - fun crypto_shorthash_keygen(key: ByteArray): Int + fun crypto_shorthash_keygen(key: ByteArray) // // ---- Short hash end ---- diff --git a/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/shortinputhash/ShortHash.kt b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/shortinputhash/ShortHash.kt index 4c609da..2b89f88 100644 --- a/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/shortinputhash/ShortHash.kt +++ b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/shortinputhash/ShortHash.kt @@ -20,7 +20,7 @@ actual object ShortHash { actual fun shortHashKeygen(): UByteArray { val key = UByteArray(crypto_shorthash_KEYBYTES) - sodiumJna.crypto_shorthash_keygen(key.asByteArray()).ensureLibsodiumSuccess() + sodiumJna.crypto_shorthash_keygen(key.asByteArray()) return key }