From 0e1c9595e48afdd84dcc71f9b47d695b2824575f Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Wed, 20 Dec 2023 17:19:02 +1100 Subject: [PATCH] stub libsignal::PrimaryProvisioningCipher.decrypt() --- apps/sigchat/src/manager.rs | 7 ++++++- apps/sigchat/src/manager/libsignal.rs | 30 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/apps/sigchat/src/manager.rs b/apps/sigchat/src/manager.rs index ff678cab8..ec8052858 100644 --- a/apps/sigchat/src/manager.rs +++ b/apps/sigchat/src/manager.rs @@ -175,8 +175,13 @@ impl Manager { match ws.read() { Ok(Message::Binary(registration)) => { log::info!("raw registration ProtoBuffer: {:?}", registration); - // TODO complete registration + log::info!("device name: {name}"); ws.close(); + let provisioning_message = libsignal::ProvisionMessage::decode(identity_key_pair, registration); + log::info!("provisioning_message.number: {}", provisioning_message.number); + log::info!("provisioning_message.aci: {}", provisioning_message.aci); + log::info!("provisioning_message.pni: {}", provisioning_message.pni); + // TODO complete registration Ok(true) } Ok(_) => { diff --git a/apps/sigchat/src/manager/libsignal.rs b/apps/sigchat/src/manager/libsignal.rs index a8fd77958..b8e2bb663 100644 --- a/apps/sigchat/src/manager/libsignal.rs +++ b/apps/sigchat/src/manager/libsignal.rs @@ -1,6 +1,36 @@ // this is a stub for a wrapped libsignal +// use org.whispersystems.signalservice.internal.crypto.PrimaryProvisioningCipher; +pub struct PrimaryProvisioningCipher{} +impl PrimaryProvisioningCipher { + pub fn new(_stub: Option) -> PrimaryProvisioningCipher { + PrimaryProvisioningCipher {} + } + pub fn decrypt(&self, _temp_identity: IdentityKeyPair, bytes: Vec) -> ProvisionMessage { + //log::info!("temp_identity: {:?}", temp_identity); + log::info!("raw uuid Protocol Buffer: {:?}", bytes); + ProvisionMessage { + number : "STUB number".to_string(), + aci : "STUB number".to_string(), + pni : "STUB number".to_string(), + } + } +} + +pub struct ProvisionMessage { + pub number: String, + pub aci:String, + pub pni:String, +} +impl ProvisionMessage { + pub fn decode(temp_identity: IdentityKeyPair, bytes: Vec) -> ProvisionMessage { + let primary_provisioning_cipher = PrimaryProvisioningCipher::new(None); + primary_provisioning_cipher.decrypt(temp_identity, bytes) + } +} + +//////////////////////////////////////////////////////// // https://github.com/signalapp/Signal-Android/blob/d2053d2db7b1b930b7058ce5506dd6037ac3b808/libsignal-service/src/main/protowire/Provisioning.proto#L13C9-L15 //