Added ways to convert x25519 -> ed25519 key

Author: SessionHero01

library/src/main/cpp/ed25519.cpp

@@ -2,6 +2,7 @@
 #include "util.h"
 
 #include <session/ed25519.hpp>
+#include <session/xed25519.hpp>
 
 extern "C"
 JNIEXPORT jbyteArray JNICALL
@@ -58,4 +59,17 @@ Java_network_loki_messenger_libsession_1util_ED25519_generateProMasterKey(JNIEnv
         );
 
     });
+}
+
+extern "C"
+JNIEXPORT jbyteArray JNICALL
+Java_network_loki_messenger_libsession_1util_ED25519_positiveEd25519PubKeyFromCurve25519(
+        JNIEnv *env, jobject thiz, jbyteArray curve25519_pub_key) {
+    return jni_utils::run_catching_cxx_exception_or_throws<jbyteArray>(env, [=] {
+        return util::bytes_from_span(
+                env,
+                session::xed25519::pubkey(
+                        jni_utils::JavaByteArrayRef(env, curve25519_pub_key).get())
+        );
+    });
 }

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

@@ -38,4 +38,13 @@ object ED25519 : LibSessionUtilCApi() {
      * @return The libsodium-style Master Session Pro Ed25519 secret key, 64 bytes.
      */
     external fun generateProMasterKey(ed25519Seed: ByteArray): ByteArray
+
+    private external fun positiveEd25519PubKeyFromCurve25519(curve25519PubKey: ByteArray): ByteArray
+
+    fun ed25519PubKeysFromCurve25519(curve25519PubKey: ByteArray): List<ByteArray> {
+        val positive = positiveEd25519PubKeyFromCurve25519(curve25519PubKey)
+        val negative = positive.clone()
+        negative[31] = (negative[31].toInt() xor 0x80).toByte()
+        return listOf(positive, negative)
+    }
 }

library/src/main/java/network/loki/messenger/libsession_util/pro/ProProof.kt

@@ -74,10 +74,17 @@ data class ProProof(
         val signature: ByteArray,
     )
 
+    /**
+     * Checks the status of the Pro proof.
+     *
+     * @param senderED25519PubKey The sender (proof generator)'s ED25519 public key.
+     * @param signedMessage An optional signed message to verify against the proof.
+     * @param now The current time to use for expiry checks. Defaults to
+     */
     fun status(
-        verifyPubKey: ByteArray,
-        signedMessage: ProSignedMessage?,
-        now: Instant = Instant.now(),
+        senderED25519PubKey: ByteArray,
+        now: Instant,
+        signedMessage: ProSignedMessage? = null,
     ): Status {
         val signedMessageData = signedMessage?.data
         val signedMessageSignature = signedMessage?.signature
@@ -88,7 +95,7 @@ data class ProProof(
             expiryMs = expiryMs,
             signature = signatureHex.hexToByteArray(),
             nowUnixTs = now.toEpochMilli(),
-            verifyPubKey = verifyPubKey,
+            verifyPubKey = senderED25519PubKey,
             signedMessageData = signedMessageData,
             signedMessageSignature = signedMessageSignature
         )