populate roster api on the session

Author: suhasHere

cmd/api_example/main.cpp

@@ -36,6 +36,10 @@ verify(const std::string& label, Session& alice, Session& bob)
     throw std::runtime_error(label + ": not equal");
   }
 
+  if (alice.roster() != bob.roster()) {
+    throw std::runtime_error(label + ": roster not equal");
+  }
+
   verify_send(label, alice, bob);
   verify_send(label, bob, alice);
 }

include/mls/credential.h

@@ -68,6 +68,9 @@ operator<<(tls::ostream& str, const X509Credential& obj);
 tls::istream&
 operator>>(tls::istream& str, X509Credential& obj);
 
+bool
+operator==(const X509Credential& lhs, const X509Credential& rhs);
+
 // struct {
 //     CredentialType credential_type;
 //     select (credential_type) {

include/mls/session.h

@@ -68,6 +68,7 @@ class Session
   bytes do_export(const std::string& label,
                   const bytes& context,
                   size_t size) const;
+  std::vector<Credential> roster() const;
 
   // Application message protection
   bytes protect(const bytes& plaintext);

include/mls/state.h

@@ -83,6 +83,7 @@ class State
   bytes do_export(const std::string& label,
                   const bytes& context,
                   size_t size) const;
+  std::vector<Credential> get_leaf_credentials() const;
 
   ///
   /// General encryption and decryption

src/credential.cpp

@@ -86,6 +86,12 @@ operator>>(tls::istream& str, X509Credential& obj)
   return str;
 }
 
+bool
+operator==(const X509Credential& lhs, const X509Credential& rhs)
+{
+  return lhs.der_chain == rhs.der_chain;
+}
+
 ///
 /// Credential
 ///

src/session.cpp

@@ -347,6 +347,12 @@ Session::do_export(const std::string& label,
   return inner->history.front().do_export(label, context, size);
 }
 
+std::vector<Credential>
+Session::roster() const
+{
+  return inner->history.front().get_leaf_credentials();
+}
+
 bytes
 Session::protect(const bytes& plaintext)
 {

src/state.cpp

@@ -580,6 +580,21 @@ State::do_export(const std::string& label,
   return _suite.expand_with_label(secret, "exporter", context, size);
 }
 
+std::vector<Credential>
+State::get_leaf_credentials() const
+{
+  std::vector<Credential> creds;
+
+  for (uint32_t i = 0; i < _tree.size().val; i++) {
+    const auto& ln = _tree.node_at(LeafIndex{ i });
+    if (ln.node.has_value()) {
+      creds.push_back(ln.key_package().credential);
+    }
+  }
+
+  return creds;
+}
+
 MLSCiphertext
 State::encrypt(const MLSPlaintext& pt)
 {

test/credential.cpp

@@ -74,7 +74,7 @@ TEST_CASE("X509 Credential Depth 2 Marshal/Unmarshal")
 
   auto marshalled = tls::marshal(original);
   auto unmarshaled = tls::get<Credential>(marshalled);
-  CHECK(original.public_key() == unmarshaled.public_key());
+  CHECK(original == unmarshaled);
 
   auto x509 = unmarshaled.get<X509Credential>();
   CHECK(x509.der_chain == der_in);
@@ -99,7 +99,7 @@ TEST_CASE("X509 Credential Depth 1 Marshal/Unmarshal")
 
   auto marshalled = tls::marshal(original);
   auto unmarshaled = tls::get<Credential>(marshalled);
-  CHECK(original.public_key() == unmarshaled.public_key());
+  CHECK(original == unmarshaled);
 
   auto x509 = unmarshaled.get<X509Credential>();
   CHECK(x509.der_chain == der_in);