pass test_passive_client

src/crypto/crypto_test.rs

@@ -82,7 +82,7 @@ fn test_derive_secret(
     tc: &DeriveSecretTest,
 ) -> Result<()> {
     let out = crypto_provider.derive_secret(cipher_suite, &tc.secret, tc.label.as_bytes())?;
-    assert_eq!(out.as_ref(), &tc.out,);
+    assert_eq!(out.as_ref(), &tc.out);
     Ok(())
 }
 
@@ -110,7 +110,7 @@ fn test_derive_tree_secret(
         tc.generation,
         tc.length,
     )?;
-    assert_eq!(out.as_ref(), &tc.out,);
+    assert_eq!(out.as_ref(), &tc.out);
     Ok(())
 }
 

src/key/package.rs

@@ -13,7 +13,7 @@ pub type KeyPackageRef = Bytes;
 pub struct KeyPackage {
     pub(crate) version: ProtocolVersion,
     pub(crate) cipher_suite: CipherSuite,
-    init_key: HpkePublicKey,
+    pub(crate) init_key: HpkePublicKey,
     pub(crate) leaf_node: LeafNode,
     extensions: Vec<Extension>,
     signature: Bytes,

src/message/group_info.rs

@@ -11,10 +11,10 @@ use crate::tree::{deserialize_extensions, serialize_extensions, Extension};
 
 #[derive(Default, Debug, Clone, Eq, PartialEq)]
 pub struct GroupInfo {
-    group_context: GroupContext,
-    extensions: Vec<Extension>,
+    pub(crate) group_context: GroupContext,
+    pub(crate) extensions: Vec<Extension>,
     confirmation_tag: Bytes,
-    signer: LeafIndex,
+    pub(crate) signer: LeafIndex,
     signature: Bytes,
 }
 
@@ -115,8 +115,8 @@ impl GroupInfo {
 #[derive(Default, Debug, Clone, Eq, PartialEq)]
 pub struct GroupSecrets {
     pub(crate) joiner_secret: Bytes,
-    path_secret: Option<Bytes>,
-    psk_ids: Vec<PreSharedKeyID>,
+    pub(crate) path_secret: Option<Bytes>,
+    pub(crate) psk_ids: Vec<PreSharedKeyID>,
 }
 
 impl Deserializer for GroupSecrets {
@@ -172,7 +172,7 @@ impl Serializer for GroupSecrets {
 impl GroupSecrets {
     // verifySingleReInitOrBranchPSK verifies that at most one key has type
     // resumption with usage reinit or branch.
-    fn verify_single_reinit_or_branch_psk(&self) -> bool {
+    pub(crate) fn verify_single_reinit_or_branch_psk(&self) -> bool {
         let mut n = 0;
         for psk in &self.psk_ids {
             if let Psk::Resumption(resumption) = &psk.psk {

src/message/mod.rs

@@ -27,8 +27,8 @@ use crate::tree::*;
 
 #[derive(Default, Debug, Clone, Eq, PartialEq)]
 pub struct Commit {
-    proposals: Vec<ProposalOrRef>,
-    path: Option<UpdatePath>,
+    pub(crate) proposals: Vec<ProposalOrRef>,
+    pub(crate) path: Option<UpdatePath>,
 }
 
 impl Deserializer for Commit {
@@ -154,7 +154,7 @@ pub fn verify_proposal_list(
     Ok(())
 }
 
-fn proposal_list_needs_path(proposals: &[Proposal]) -> bool {
+pub(crate) fn proposal_list_needs_path(proposals: &[Proposal]) -> bool {
     if proposals.is_empty() {
         return true;
     }
@@ -234,7 +234,7 @@ impl Welcome {
         None
     }
 
-    fn decrypt_group_secrets(
+    pub(crate) fn decrypt_group_secrets(
         &self,
         crypto_provider: &impl CryptoProvider,
         r: &KeyPackageRef,
@@ -256,7 +256,7 @@ impl Welcome {
         }
     }
 
-    fn decrypt_group_info(
+    pub(crate) fn decrypt_group_info(
         &self,
         crypto_provider: &impl CryptoProvider,
         joiner_secret: &[u8],