Hashing and other bindings

SessionHero01 · SessionHero01 · commit e34282296862 · 2025-05-22T16:19:21.000+10:00
diff --git a/library/src/main/cpp/CMakeLists.txt b/library/src/main/cpp/CMakeLists.txt
@@ -43,6 +43,7 @@ set(SOURCES
         jni_utils.cpp
         ed25519.cpp
         curve25519.cpp
+        hash.cpp
 )
 
 add_library( # Sets the name of the library.
diff --git a/library/src/main/cpp/blinded_key.cpp b/library/src/main/cpp/blinded_key.cpp
@@ -73,4 +73,38 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blind15KeyPair(JNI
                 );
         return jni_utils::new_key_pair(env, util::bytes_from_span(env, pk), util::bytes_from_span(env, sk));
     });
+}
+
+extern "C"
+JNIEXPORT jbyteArray JNICALL
+Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blind15Sign(JNIEnv *env, jobject thiz,
+                                                                          jbyteArray ed25519_secret_key,
+                                                                          jstring server_pub_key,
+                                                                          jbyteArray message) {
+    return jni_utils::run_catching_cxx_exception_or_throws<jbyteArray>(env, [=] {
+        auto data = session::blind15_sign(
+                jni_utils::JavaByteArrayRef(env, ed25519_secret_key).get(),
+                jni_utils::JavaStringRef(env, server_pub_key).view(),
+                jni_utils::JavaByteArrayRef(env, message).get()
+                );
+        return util::bytes_from_vector(env, data);
+    });
+}
+
+extern "C"
+JNIEXPORT jboolean JNICALL
+Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_sessionIdMatchesBlindedId(JNIEnv *env,
+                                                                                        jobject thiz,
+                                                                                        jstring session_id,
+                                                                                        jstring blinded_id,
+                                                                                        jstring server_pub_key) {
+    return jni_utils::run_catching_cxx_exception_or<jboolean>([=]() -> jboolean {
+        return session::session_id_matches_blinded_id(
+                jni_utils::JavaStringRef(env, session_id).view(),
+                jni_utils::JavaStringRef(env, blinded_id).view(),
+                jni_utils::JavaStringRef(env, server_pub_key).view()
+        );
+    }, [](const char *) -> jboolean {
+        return false;
+    });
 }
diff --git a/library/src/main/cpp/encryption.cpp b/library/src/main/cpp/encryption.cpp
@@ -91,4 +91,38 @@ Java_network_loki_messenger_libsession_1util_SessionEncrypt_encryptForBlindedRec
 
         return jni_utils::session_bytes_from_range(env, data);
     });
+}
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_network_loki_messenger_libsession_1util_SessionEncrypt_decryptPushNotification(JNIEnv *env,
+                                                                                    jobject thiz,
+                                                                                    jbyteArray message,
+                                                                                    jbyteArray secret_key) {
+    return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
+        auto data = session::decrypt_push_notification(
+                jni_utils::JavaByteArrayRef(env, message).get(),
+                jni_utils::JavaByteArrayRef(env, secret_key).get()
+        );
+
+        return jni_utils::session_bytes_from_range(env, data);
+    });
+}
+
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_network_loki_messenger_libsession_1util_SessionEncrypt_decryptOnsResponse(JNIEnv *env,
+                                                                               jobject thiz,
+                                                                               jstring lowercase_name,
+                                                                               jbyteArray ciphertext,
+                                                                               jbyteArray nonce) {
+    return jni_utils::run_catching_cxx_exception_or_throws<jstring>(env, [=] {
+        auto data = session::decrypt_ons_response(
+                jni_utils::JavaStringRef(env, lowercase_name).view(),
+                jni_utils::JavaByteArrayRef(env, ciphertext).get(),
+                nonce ? std::make_optional(jni_utils::JavaByteArrayRef(env, nonce).get()) : std::nullopt
+        );
+
+        return util::jstringFromOptional(env, data);
+    });
 }
diff --git a/library/src/main/cpp/hash.cpp b/library/src/main/cpp/hash.cpp
@@ -0,0 +1,17 @@
+#include "jni_utils.h"
+
+#include <session/hash.hpp>
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_network_loki_messenger_libsession_1util_Hash_hash(JNIEnv *env, jobject thiz,
+                                                       jbyteArray message,
+                                                       jbyteArray hashOut,
+                                                       jbyteArray key) {
+    jni_utils::run_catching_cxx_exception_or_throws<void>(env, [=] {
+        session::hash::hash(
+                jni_utils::JavaByteArrayRef(env, hashOut).get(),
+                jni_utils::JavaByteArrayRef(env, message).get(),
+                key ? std::make_optional(jni_utils::JavaByteArrayRef(env, key).get()) : std::nullopt);
+    });
+}
diff --git a/library/src/main/cpp/jni_utils.h b/library/src/main/cpp/jni_utils.h
@@ -151,6 +151,32 @@ namespace jni_utils {
      */
     jobject new_key_pair(JNIEnv *env, jbyteArray pubKey, jbyteArray secKey);
 
+    class JavaStringRef {
+        JNIEnv *env;
+        jstring s;
+        std::span<char> data;
+
+        public:
+            JavaStringRef(JNIEnv *env, jstring s) : env(env), s(s) {
+                const char *c_str = env->GetStringUTFChars(s, nullptr);
+                data = std::span<char>(const_cast<char *>(c_str), env->GetStringUTFLength(s));
+            }
+
+            ~JavaStringRef() {
+                env->ReleaseStringUTFChars(s, data.data());
+            }
+
+            // Get the data as a string view. Only valid during the lifetime of this object.
+            std::string_view view() const {
+                return std::string_view(data.data(), data.size());
+            }
+
+            // Get the data as a span. Only valid during the lifetime of this object.
+            std::span<char> get() const {
+                return data;
+            }
+    };
+
     /**
      * A RAII wrapper for a Java byte array. This will automatically release the byte array when it goes out of scope.
      */
@@ -169,6 +195,7 @@ namespace jni_utils {
                 env->ReleaseByteArrayElements(byte_array, reinterpret_cast<jbyte *>(data.data()), 0);
             }
 
+            // Get the data as a span. Only valid during the lifetime of this object.
             std::span<unsigned char> get() const {
                 return data;
             }
diff --git a/library/src/main/java/network/loki/messenger/libsession_util/Hash.kt b/library/src/main/java/network/loki/messenger/libsession_util/Hash.kt
@@ -0,0 +1,17 @@
+package network.loki.messenger.libsession_util
+
+object Hash {
+    private external fun hash(message: ByteArray, hashOut: ByteArray, key: ByteArray?)
+
+    fun hash64(message: ByteArray, key: ByteArray? = null): ByteArray {
+        val hashOut = ByteArray(64)
+        hash(message, hashOut, key)
+        return hashOut
+    }
+
+    fun hash32(message: ByteArray, key: ByteArray? = null): ByteArray {
+        val hashOut = ByteArray(32)
+        hash(message, hashOut, key)
+        return hashOut
+    }
+}
diff --git a/library/src/main/java/network/loki/messenger/libsession_util/SessionEncrypt.kt b/library/src/main/java/network/loki/messenger/libsession_util/SessionEncrypt.kt
@@ -66,4 +66,15 @@ object SessionEncrypt {
         x25519PrivKey: ByteArray,
         ciphertext: ByteArray
     ): Pair<SessionId, Bytes>
+
+    external fun decryptPushNotification(
+        message: ByteArray,
+        secretKey: ByteArray,
+    ): Bytes
+
+    external fun decryptOnsResponse(
+        lowercaseName: String,
+        ciphertext: ByteArray,
+        nonce: ByteArray?,
+    ): SessionId
 }
diff --git a/library/src/main/java/network/loki/messenger/libsession_util/util/BlindKeyAPI.kt b/library/src/main/java/network/loki/messenger/libsession_util/util/BlindKeyAPI.kt
@@ -37,4 +37,31 @@ object BlindKeyAPI {
         ed25519SecretKey: ByteArray,
         serverPubKey: ByteArray,
     ): KeyPair? = kotlin.runCatching { blind15KeyPair(ed25519SecretKey, serverPubKey) }.getOrNull()
+
+    /**
+     * Sign a message with a 15 blinded key.
+     *
+     * @param ed25519SecretKey The Ed25519 secret key, 32/64 bytes
+     * @param serverPubKey The server public key in hex
+     * @param message The message to sign
+     */
+    external fun blind15Sign(
+        ed25519SecretKey: ByteArray,
+        serverPubKey: String,
+        message: ByteArray,
+    ): ByteArray
+
+    /**
+     * Takes in a standard sessionId and returns a flag indicating whether it matches the given
+     * blindedId for a given serverPubKey
+     *
+     * @param sessionId The session ID to check, 66bytes string
+     * @param blindedId The blinded ID to check against, 66bytes string
+     * @param serverPubKey The server public key, 64bytes string
+     */
+    external fun sessionIdMatchesBlindedId(
+        sessionId: String,
+        blindedId: String,
+        serverPubKey: String,
+    ): Boolean
 }

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ set(SOURCES`
`43`	`43`	`jni_utils.cpp`
`44`	`44`	`ed25519.cpp`
`45`	`45`	`curve25519.cpp`
	`46`	`+ hash.cpp`
`46`	`47`	`)`
`47`	`48`
`48`	`49`	`add_library( # Sets the name of the library.`