WIP: Fix build/test issues

multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/JsSodiumInterface.kt

@@ -375,6 +375,12 @@ external object JsSodiumInterface {
     @JsName("crypto_core_ristretto255_from_hash")
     fun crypto_core_ristretto255_from_hash(r: Uint8Array): Uint8Array
 
+    @JsName("crypto_core_ristretto255_from_string")
+    fun crypto_core_ed25519_from_string(ctx: String?, message: Uint8Array, hashAlg: Int): Uint8Array
+
+    @JsName("crypto_core_ristretto255_from_string_ro")
+    fun crypto_core_ed25519_from_string_ro(ctx: String?, message: Uint8Array, hashAlg: Int): Uint8Array
+
     @JsName("crypto_core_ristretto255_add")
     fun crypto_core_ristretto255_add(p: Uint8Array, q: Uint8Array): Uint8Array
 
@@ -424,8 +430,11 @@ external object JsSodiumInterface {
     @JsName("crypto_core_ed25519_random")
     fun crypto_core_ed25519_random(): Uint8Array
 
-    @JsName("crypto_core_ed25519_from_hash")
-    fun crypto_core_ed25519_from_hash(r: Uint8Array): Uint8Array
+    @JsName("crypto_core_ed25519_from_string")
+    fun crypto_core_ed25519_from_string(ctx: String, message: Uint8Array, hashAlg: Int): Uint8Array
+
+    @JsName("crypto_core_ed25519_from_string_ro")
+    fun crypto_core_ed25519_from_string_ro(ctx: String, message: Uint8Array, hashAlg: Int): Uint8Array
 
     @JsName("crypto_core_ed25519_from_uniform")
     fun crypto_core_ed25519_from_uniform(r: Uint8Array): Uint8Array

multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/ed25519/Ed25519LowLevel.kt

@@ -6,28 +6,34 @@ import ext.libsodium.com.ionspin.kotlin.crypto.toUInt8Array
 
 actual abstract class Ed25519LowLevel actual constructor() {
   actual fun isValidPoint(encoded: UByteArray): Boolean =
-    getSodium().crypto_core_ed25519_is_valid_point(encoded.toUint8Array())
+    getSodium().crypto_core_ed25519_is_valid_point(encoded.toUInt8Array())
 
   actual fun addPoints(p: UByteArray, q: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ed25519_add(p.toUint8Array(), q.toUint8Array())
+    val result = getSodium().crypto_core_ed25519_add(p.toUInt8Array(), q.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun subtractPoints(p: UByteArray, q: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ed25519_sub(p.toUint8Array(), q.toUint8Array())
+    val result = getSodium().crypto_core_ed25519_sub(p.toUInt8Array(), q.toUInt8Array())
 
-    return result
+    return result.toUByteArray()
   }
 
-  actual fun encodedPointFromHash(hash: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ed25519_from_hash(hash.toUint8Array())
+  actual fun encodedPointFromString(ctx: String?, msg: UByteArray, hashAlg: HashToCurveAlgorithm): UByteArray {
+    val result = getSodium().crypto_core_ed25519_from_string(ctx, msg.toUInt8Array(), hashAlg.id)
+
+    return result.toUByteArray()
+  }
+
+  actual fun encodedPointFromStringRo(ctx: String?, msg: UByteArray, hashAlg: HashToCurveAlgorithm): UByteArray {
+    val result = getSodium().crypto_core_ed25519_from_string_ro(ctx, msg.toUInt8Array(), hashAlg.id)
 
     return result.toUByteArray()
   }
 
   actual fun encodedPointFromUniform(uniform: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ed25519_from_uniform(hash.toUint8Array())
+    val result = getSodium().crypto_core_ed25519_from_uniform(uniform.toUInt8Array())
 
     return result.toUByteArray()
   }
@@ -45,67 +51,67 @@ actual abstract class Ed25519LowLevel actual constructor() {
   }
 
   actual fun invertScalar(scalar: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ed25519_scalar_invert(scalar.toUint8Array())
+    val result = getSodium().crypto_core_ed25519_scalar_invert(scalar.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun negateScalar(scalar: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ed25519_scalar_negate(scalar.toUint8Array())
+    val result = getSodium().crypto_core_ed25519_scalar_negate(scalar.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun complementScalar(scalar: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ed25519_scalar_complement(scalar.toUint8Array())
+    val result = getSodium().crypto_core_ed25519_scalar_complement(scalar.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun addScalars(x: UByteArray, y: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ed25519_scalar_add(x.toUint8Array(), y.toUint8Array())
+    val result = getSodium().crypto_core_ed25519_scalar_add(x.toUInt8Array(), y.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun subtractScalars(x: UByteArray, y: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ed25519_scalar_sub(x.toUint8Array(), y.toUint8Array())
+    val result = getSodium().crypto_core_ed25519_scalar_sub(x.toUInt8Array(), y.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun multiplyScalars(x: UByteArray, y: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ed25519_scalar_mul(x.toUint8Array(), y.toUint8Array())
+    val result = getSodium().crypto_core_ed25519_scalar_mul(x.toUInt8Array(), y.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun reduceScalar(scalar: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ed25519_scalar_reduce(scalar.toUint8Array())
+    val result = getSodium().crypto_core_ed25519_scalar_reduce(scalar.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun scalarMultiplication(n: UByteArray, p: UByteArray): UByteArray {
-    val result = getSodium().crypto_scalarmult_ed25519(n.toUint8Array(), p.toUint8Array())
+    val result = getSodium().crypto_scalarmult_ed25519(n.toUInt8Array(), p.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun scalarMultiplicationNoClamp(n: UByteArray, p: UByteArray): UByteArray {
-    val result = getSodium().crypto_scalarmult_ed25519_noclamp(n.toUint8Array(), p.toUint8Array())
+    val result = getSodium().crypto_scalarmult_ed25519_noclamp(n.toUInt8Array(), p.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun scalarMultiplicationBase(n: UByteArray): UByteArray {
-    val result = getSodium().crypto_scalarmult_ed25519_base(n.toUint8Array())
+    val result = getSodium().crypto_scalarmult_ed25519_base(n.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun scalarMultiplicationBaseNoClamp(n: UByteArray): UByteArray {
-    val result = getSodium().crypto_scalarmult_ed25519_base_noclamp(n.toUint8Array())
+    val result = getSodium().crypto_scalarmult_ed25519_base_noclamp(n.toUInt8Array())
 
     return result.toUByteArray()
   }

multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/ristretto255/Ristretto255LowLevel.kt

@@ -6,22 +6,34 @@ import ext.libsodium.com.ionspin.kotlin.crypto.toUInt8Array
 
 actual abstract class Ristretto255LowLevel actual constructor() {
   actual fun isValidPoint(encoded: UByteArray): Boolean =
-    getSodium().crypto_core_ristretto255_is_valid_point(encoded.toUint8Array())
+    getSodium().crypto_core_ristretto255_is_valid_point(encoded.toUInt8Array())
 
   actual fun addPoints(p: UByteArray, q: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ristretto255_add(p.toUint8Array(), q.toUint8Array())
+    val result = getSodium().crypto_core_ristretto255_add(p.toUInt8Array(), q.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun subtractPoints(p: UByteArray, q: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ristretto255_sub(p.toUint8Array(), q.toUint8Array())
+    val result = getSodium().crypto_core_ristretto255_sub(p.toUInt8Array(), q.toUInt8Array())
 
-    return result
+    return result.toUByteArray()
   }
 
   actual fun encodedPointFromHash(hash: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ristretto255_from_hash(hash.toUint8Array())
+    val result = getSodium().crypto_core_ristretto255_from_hash(hash.toUInt8Array())
+
+    return result.toUByteArray()
+  }
+
+  actual fun encodedPointFromString(ctx: String?, msg: UByteArray, hashAlg: HashToCurveAlgorithm): UByteArray {
+    val result = getSodium().crypto_core_ristretto255_from_string(ctx, msg.toUInt8Array(), hashAlg.id)
+
+    return result.toUByteArray()
+  }
+
+  actual fun encodedPointFromStringRo(ctx: String?, msg: UByteArray, hashAlg: HashToCurveAlgorithm): UByteArray {
+    val result = getSodium().crypto_core_ristretto255_from_string_ro(ctx, msg.toUInt8Array(), hashAlg.id)
 
     return result.toUByteArray()
   }
@@ -39,55 +51,55 @@ actual abstract class Ristretto255LowLevel actual constructor() {
   }
 
   actual fun invertScalar(scalar: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ristretto255_scalar_invert(scalar.toUint8Array())
+    val result = getSodium().crypto_core_ristretto255_scalar_invert(scalar.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun negateScalar(scalar: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ristretto255_scalar_negate(scalar.toUint8Array())
+    val result = getSodium().crypto_core_ristretto255_scalar_negate(scalar.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun complementScalar(scalar: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ristretto255_scalar_complement(scalar.toUint8Array())
+    val result = getSodium().crypto_core_ristretto255_scalar_complement(scalar.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun addScalars(x: UByteArray, y: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ristretto255_scalar_add(x.toUint8Array(), y.toUint8Array())
+    val result = getSodium().crypto_core_ristretto255_scalar_add(x.toUInt8Array(), y.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun subtractScalars(x: UByteArray, y: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ristretto255_scalar_sub(x.toUint8Array(), y.toUint8Array())
+    val result = getSodium().crypto_core_ristretto255_scalar_sub(x.toUInt8Array(), y.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun multiplyScalars(x: UByteArray, y: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ristretto255_scalar_mul(x.toUint8Array(), y.toUint8Array())
+    val result = getSodium().crypto_core_ristretto255_scalar_mul(x.toUInt8Array(), y.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun reduceScalar(scalar: UByteArray): UByteArray {
-    val result = getSodium().crypto_core_ristretto255_scalar_reduce(scalar.toUint8Array())
+    val result = getSodium().crypto_core_ristretto255_scalar_reduce(scalar.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun scalarMultiplication(n: UByteArray, p: UByteArray): UByteArray {
-    val result = getSodium().crypto_scalarmult_ristretto255(n.toUint8Array(), p.toUint8Array())
+    val result = getSodium().crypto_scalarmult_ristretto255(n.toUInt8Array(), p.toUInt8Array())
 
     return result.toUByteArray()
   }
 
   actual fun scalarMultiplicationBase(n: UByteArray): UByteArray {
-    val result = getSodium().crypto_scalarmult_ristretto255_base(n.toUint8Array())
+    val result = getSodium().crypto_scalarmult_ristretto255_base(n.toUInt8Array())
 
     return result.toUByteArray()
   }