From c2887184e0b67f93bcd03853dc3eed92322e182c Mon Sep 17 00:00:00 2001
From: Ugljesa Jovanovic <ugljesa.jovanovic@ionspin.com>
Date: Fri, 4 Mar 2022 12:13:41 +0100
Subject: [PATCH] ed25519PkToCurve25519 was calling libsodium sk_to_curve in
 both native and jvm platforms. Fixed so it calls appropriate pk_to_curve.
 Fixes #20

---
 buildSrc/src/main/kotlin/Deps.kt                             | 5 ++---
 .../com/ionspin/kotlin/crypto/signature/SignatureJvm.kt      | 2 +-
 .../kotlin/com/ionspin/kotlin/crypto/signature/Signature.kt  | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
index e3f0851..ad01b2d 100644
--- a/buildSrc/src/main/kotlin/Deps.kt
+++ b/buildSrc/src/main/kotlin/Deps.kt
@@ -24,14 +24,13 @@ object Versions {
     val dokkaPlugin = "1.5.0"
     val taskTreePlugin = "1.5"
     val kotlinBigNumVersion = "0.2.8"
-    val jna = "5.7.0"
+    val jna = "5.10.0"
     val kotlinPoet = "1.6.0"
     val sampleLibsodiumBindings = "0.8.5-SNAPSHOT"
     val ktor = "1.3.2"
     val timber = "4.7.1"
     val kodeinVersion = "7.1.0"
-
-    val resourceLoader = "2.0.1"
+    val resourceLoader = "2.0.2"
 
 
 
diff --git a/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/signature/SignatureJvm.kt b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/signature/SignatureJvm.kt
index 7ce7b93..a5cf3e9 100644
--- a/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/signature/SignatureJvm.kt
+++ b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/signature/SignatureJvm.kt
@@ -159,7 +159,7 @@ actual object Signature {
      */
     actual fun ed25519PkToCurve25519(ed25519PublicKey: UByteArray) : UByteArray {
         val x25519PublicKey = UByteArray(crypto_scalarmult_curve25519_BYTES)
-        sodiumJna.crypto_sign_ed25519_sk_to_curve25519(
+        sodiumJna.crypto_sign_ed25519_pk_to_curve25519(
             x25519PublicKey.asByteArray(),
             ed25519PublicKey.asByteArray()
         )
diff --git a/multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/com/ionspin/kotlin/crypto/signature/Signature.kt b/multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/com/ionspin/kotlin/crypto/signature/Signature.kt
index 722ec37..7dd0a98 100644
--- a/multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/com/ionspin/kotlin/crypto/signature/Signature.kt
+++ b/multiplatform-crypto-libsodium-bindings/src/nativeMain/kotlin/com/ionspin/kotlin/crypto/signature/Signature.kt
@@ -207,7 +207,7 @@ actual object Signature {
         val x25519PublicKey = UByteArray(crypto_scalarmult_curve25519_BYTES)
         val x25519PublicKeyPinned = x25519PublicKey.pin()
         val ed25519PublicKeyPinned = ed25519PublicKey.pin()
-        crypto_sign_ed25519_sk_to_curve25519(
+        crypto_sign_ed25519_pk_to_curve25519(
             x25519PublicKeyPinned.toPtr(),
             ed25519PublicKeyPinned.toPtr()
         )
@@ -272,4 +272,4 @@ actual object Signature {
         return publicKey
     }
 
-}
\ No newline at end of file
+}