From 3d2c848a799ed6d2359a89a65fc0a850065db610 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Tue, 2 Jul 2024 20:45:23 +0200 Subject: [PATCH] Remove invalid return value from JVM JNA definition of sodium_bin2base64, since the actual return value is the pointer to the buffer containing encoded string, not an integer, and we don't use it in any case --- .../kotlin/com/ionspin/kotlin/crypto/JnaLibsodiumInterface.kt | 2 +- .../kotlin/com/ionspin/kotlin/crypto/util/LibsodiumUtil.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 01f7830..e1a07d9 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 @@ -161,7 +161,7 @@ interface JnaLibsodiumInterface : Library { bin: ByteArray, binLength: Int, variant: Int - ): Int + ) // int sodium_base642bin( // unsigned char * const bin, const size_t bin_maxlen, diff --git a/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/util/LibsodiumUtil.kt b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/util/LibsodiumUtil.kt index 100dda6..8c50a33 100644 --- a/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/util/LibsodiumUtil.kt +++ b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/util/LibsodiumUtil.kt @@ -71,7 +71,7 @@ actual object LibsodiumUtil { data.asByteArray(), data.size, variant.value - ).ensureLibsodiumSuccess() + ) //Drop terminating char \0 return String(result.sliceArray(0 until result.size - 1)) }