Add ed25519 key gen and x25519

Author: SessionHero01

library/src/main/cpp/CMakeLists.txt

@@ -42,6 +42,7 @@ set(SOURCES
         encryption.cpp
         jni_utils.cpp
         ed25519.cpp
+        curve25519.cpp
 )
 
 add_library( # Sets the name of the library.

library/src/main/cpp/curve25519.cpp

@@ -0,0 +1,16 @@
+#include "jni_utils.h"
+
+#include <session/curve25519.hpp>
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_network_loki_messenger_libsession_1util_Curve25519_fromED25519(JNIEnv *env, jobject thiz,
+                                                                    jbyteArray ed25519_public_key,
+                                                                    jbyteArray ed25519_private_key) {
+    return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
+        auto pk = session::curve25519::to_curve25519_pubkey(jni_utils::JavaByteArrayRef(env, ed25519_public_key).get());
+        auto sk = session::curve25519::to_curve25519_seckey(jni_utils::JavaByteArrayRef(env, ed25519_private_key).get());
+
+        return jni_utils::new_key_pair(env, util::bytes_from_span(env, pk), util::bytes_from_span(env, sk));
+    });
+}

library/src/main/cpp/ed25519.cpp

@@ -30,4 +30,17 @@ Java_network_loki_messenger_libsession_1util_ED25519_verify(JNIEnv *env, jobject
                 jni_utils::JavaByteArrayRef(env, message).get()
                 );
     });
+}
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_network_loki_messenger_libsession_1util_ED25519_generate(JNIEnv *env, jobject thiz,
+                                                              jbyteArray seed) {
+    return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
+        auto [pk, sk] = seed
+                ? session::ed25519::ed25519_key_pair(jni_utils::JavaByteArrayRef(env, seed).get())
+                : session::ed25519::ed25519_key_pair();
+
+        return jni_utils::new_key_pair(env, util::bytes_from_span(env, pk), util::bytes_from_span(env, sk));
+    });
 }

library/src/main/java/network/loki/messenger/libsession_util/Curve25519.kt

@@ -0,0 +1,16 @@
+package network.loki.messenger.libsession_util
+
+import network.loki.messenger.libsession_util.util.KeyPair
+
+object Curve25519 {
+    private external fun fromED25519(
+        ed25519PublicKey: ByteArray,
+        ed25519PrivateKey: ByteArray,
+    ): KeyPair
+
+    fun fromED25519(keyPair: KeyPair): KeyPair =
+        fromED25519(
+            ed25519PublicKey = keyPair.pubKey.data,
+            ed25519PrivateKey = keyPair.secretKey.data
+        )
+}

library/src/main/java/network/loki/messenger/libsession_util/ED25519.kt

@@ -1,5 +1,7 @@
 package network.loki.messenger.libsession_util
 
+import network.loki.messenger.libsession_util.util.KeyPair
+
 object ED25519 {
     /**
      * Sign a message using the ed25519 private key
@@ -25,4 +27,6 @@ object ED25519 {
         message: ByteArray,
         signature: ByteArray,
     ): Boolean
+
+    external fun generate(seed: ByteArray?): KeyPair
 }