more logs

Author: cameronvoell

openmls/src/framing/private_message.rs

@@ -259,10 +259,18 @@ impl PrivateMessage {
         let ciphertext_tag_short = &ciphertext_tag[..ciphertext_tag.len().min(8)];
         let sender_data_aad_tag_short = &sender_data_aad_tag[..sender_data_aad_tag.len().min(8)];
 
+        // XMTP: derive a short hint from sender_data_secret for debugging
+        let sender_data_secret_bytes = message_secrets.sender_data_secret().as_slice(); // Secret type in OpenMLS exposes as_slice()
+        let sender_data_secret_tag = crypto
+            .hash(HashType::Sha2_256, sender_data_secret_bytes)
+            .unwrap_or_default();
+        let sender_data_secret_hint =
+            &sender_data_secret_tag[..sender_data_secret_tag.len().min(8)];
+
         log::info!(
             "XMTP DEBUG LOGS: PrivateMessage handshake send: \
              group_id={:?}, epoch={:?}, sender={:?}, content_type={:?}, secret_type={:?}, \
-             generation={}, reuse_guard={:x?}, ciphertext_tag={:x?}, sender_data_aad_tag={:x?}",
+             generation={}, reuse_guard={:x?}, ciphertext_tag={:x?}, sender_data_aad_tag={:x?}, sender_data_secret_hint={:x?}",
             header.group_id,
             header.epoch,
             header.sender,
@@ -272,6 +280,7 @@ impl PrivateMessage {
             reuse_guard,
             ciphertext_tag_short,
             sender_data_aad_tag_short,
+            sender_data_secret_hint,
         );
         Ok(PrivateMessage {
             group_id: header.group_id.clone(),

openmls/src/framing/private_message_in.rs

@@ -77,10 +77,10 @@ impl PrivateMessageIn {
         // from on-the-wire values (ciphertext and sender-data AAD).
         // Still for internal debug builds only!
         let ciphertext_tag = crypto
-            .hash(ciphersuite.hash_algorithm(), self.ciphertext.as_slice())
+            .hash(HashType::Sha2_256, self.ciphertext.as_slice())
             .unwrap_or_default();
         let sender_data_aad_tag = crypto
-            .hash(ciphersuite.hash_algorithm(), &mls_sender_data_aad_bytes)
+            .hash(HashType::Sha2_256, &mls_sender_data_aad_bytes)
             .unwrap_or_default();
 
         let ciphertext_tag_short = &ciphertext_tag[..ciphertext_tag.len().min(8)];
@@ -89,7 +89,7 @@ impl PrivateMessageIn {
         // XMTP: derive a short hint from sender_data_secret for debugging
         let sender_data_secret_bytes = message_secrets.sender_data_secret().as_slice(); // Secret type in OpenMLS exposes as_slice()
         let sender_data_secret_tag = crypto
-            .hash(ciphersuite.hash_algorithm(), sender_data_secret_bytes)
+            .hash(HashType::Sha2_256, sender_data_secret_bytes)
             .unwrap_or_default();
         let sender_data_secret_hint =
             &sender_data_secret_tag[..sender_data_secret_tag.len().min(8)];

openmls/src/framing/validation.rs

@@ -102,7 +102,7 @@ impl DecryptedMessage {
         // XMTP debug logging, log epoch authenticator before we decrypt
         log::info!(
             "XMTP DEBUG LOGS: Decrypting PrivateMessage epoch_authenticator={:?}",
-            group.epoch_authenticator()
+            group.epoch_authenticator().as_slice()
         );
         log::info!(
             "XMTP DEBUG LOGS: Decrypting PrivateMessage epoch={:?}",

openmls/src/group/mls_group/mod.rs

@@ -613,7 +613,7 @@ impl MlsGroup {
         // XMTP debug logging, log epoch authenticator before we encrypt
         log::info!(
             "XMTP DEBUG LOGS: Encrypting PrivateMessage epoch_authenticator={:?}",
-            self.epoch_authenticator()
+            self.epoch_authenticator().as_slice()
         );
         log::info!(
             "XMTP DEBUG LOGS: Encrypting PrivateMessage epoch={:?}",

openmls/src/schedule/mod.rs

@@ -202,7 +202,6 @@ impl EpochAuthenticator {
         Ok(Self { secret })
     }
 
-    /// Returns the secret as a slice.
     pub fn as_slice(&self) -> &[u8] {
         self.secret.as_slice()
     }