From 8951a6d72f29051a6d25a482f2d6f9765dd52c23 Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Wed, 20 Dec 2023 10:02:58 +1100 Subject: [PATCH] stub libsignal::generate_identity_key_pair() --- apps/sigchat/src/manager.rs | 6 ++- apps/sigchat/src/manager/libsignal.rs | 57 +++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 apps/sigchat/src/manager/libsignal.rs diff --git a/apps/sigchat/src/manager.rs b/apps/sigchat/src/manager.rs index 8b1084051..50e9e5575 100644 --- a/apps/sigchat/src/manager.rs +++ b/apps/sigchat/src/manager.rs @@ -1,4 +1,5 @@ mod group_permission; +mod libsignal; // stub mod link_state; mod signal_ws; mod trust_mode; @@ -155,10 +156,11 @@ impl Manager { Ok(Message::Binary(uuid)) => { log::info!("raw uuid ProtoBuffer: {:?}", uuid); let uuid = "TODO decode uuid ProtoBuffer"; - let pub_key = "TODO generateIdentityKeyPair()"; + let identity_key_pair = libsignal::generate_identity_key_pair(); + let pub_key = identity_key_pair.djb_identity_key.key.clone(); match url::Url::parse_with_params( "sgnl://linkdevice", - &[("uuid", &uuid), ("pub_key", &pub_key)], + &[("uuid", &uuid), ("pub_key", &pub_key.as_str())], ) { Ok(device_link_uri) => { log::info!("device_link_uri: {device_link_uri}"); diff --git a/apps/sigchat/src/manager/libsignal.rs b/apps/sigchat/src/manager/libsignal.rs new file mode 100644 index 000000000..eb53e38f5 --- /dev/null +++ b/apps/sigchat/src/manager/libsignal.rs @@ -0,0 +1,57 @@ +// this is a stub for a wrapped libsignal + + + +// use org.signal.libsignal.protocol.IdentityKey; +pub struct IdentityKey { + pub key:String, +} +impl IdentityKey { + pub fn new(key: String) -> Self { + IdentityKey {key} + } + + pub fn clone(&self) -> IdentityKey { + IdentityKey::new(self.key.clone()) + } +} + +// use org.signal.libsignal.protocol.IdentityKeyPair; +pub struct IdentityKeyPair { + pub djb_identity_key: IdentityKey, + pub djb_private_key: IdentityKey, +} + + +// use org.signal.libsignal.protocol.ecc.Curve; +pub struct Curve {} +impl Curve { + pub fn generate_key_pair() -> DjbKeyPair { + DjbKeyPair { + djb_private_key: IdentityKey::new("STUB privateIdentityKey".to_string()), + djb_public_key: IdentityKey::new("STUB publicIdentityKey".to_string()), + } + } +} + +pub struct DjbKeyPair { + djb_private_key: IdentityKey, + djb_public_key: IdentityKey, +} +impl DjbKeyPair { + pub fn get_private_key(&self) -> IdentityKey { + self.djb_private_key.clone() + } + pub fn get_public_key(&self) -> IdentityKey { + self.djb_public_key.clone() + } +} + + +// https://github.com/AsamK/signal-cli/blob/375bdb79485ec90beb9a154112821a4657740b7a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java#L45-L51 +pub fn generate_identity_key_pair() -> IdentityKeyPair { + let djb_key_pair = Curve::generate_key_pair(); + let djb_identity_key = IdentityKey::new(djb_key_pair.get_public_key().key); + let djb_private_key = djb_key_pair.get_private_key(); + IdentityKeyPair { djb_identity_key, djb_private_key } +}