clang-format

include/mls/state.h

@@ -116,7 +116,8 @@ class State
   /// Generic handshake message handler
   ///
   std::optional<State> handle(const MLSMessage& msg);
-  std::optional<State> handle(const MLSMessage& msg, std::optional<State> cached);
+  std::optional<State> handle(const MLSMessage& msg,
+                              std::optional<State> cached);
 
   ///
   /// Accessors
@@ -141,7 +142,9 @@ class State
   ///
   /// Application encryption and decryption
   ///
-  MLSMessage protect(const bytes& authenticated_data, const bytes& pt, size_t padding_size);
+  MLSMessage protect(const bytes& authenticated_data,
+                     const bytes& pt,
+                     size_t padding_size);
   std::tuple<bytes, bytes> unprotect(const MLSMessage& ct);
 
   // Assemble a group context for this state

src/messages.cpp

@@ -274,7 +274,7 @@ operator<<(tls::ostream& str, const MLSMessageAuth& obj)
       return str << obj.signature;
 
     case ContentType::commit:
-     return str << obj.signature << opt::get(obj.confirmation_tag);
+      return str << obj.signature << opt::get(obj.confirmation_tag);
 
     default:
       throw InvalidParameterError("Invalid content type");
@@ -307,10 +307,10 @@ operator==(const MLSMessageAuth& lhs, const MLSMessageAuth& rhs)
 }
 
 MLSMessageContent::MLSMessageContent(bytes group_id_in,
-                  epoch_t epoch_in,
-                  Sender sender_in,
-                  bytes authenticated_data_in,
-                  RawContent content_in)
+                                     epoch_t epoch_in,
+                                     Sender sender_in,
+                                     bytes authenticated_data_in,
+                                     RawContent content_in)
   : group_id(std::move(group_id_in))
   , epoch(epoch_in)
   , sender(std::move(sender_in))
@@ -319,10 +319,10 @@ MLSMessageContent::MLSMessageContent(bytes group_id_in,
 {}
 
 MLSMessageContent::MLSMessageContent(bytes group_id_in,
-                  epoch_t epoch_in,
-                  Sender sender_in,
-                  bytes authenticated_data_in,
-                  ContentType content_type)
+                                     epoch_t epoch_in,
+                                     Sender sender_in,
+                                     bytes authenticated_data_in,
+                                     ContentType content_type)
   : group_id(std::move(group_id_in))
   , epoch(epoch_in)
   , sender(std::move(sender_in))
@@ -626,16 +626,13 @@ marshal_ciphertext_content(const MLSMessageContent& content,
   return w.bytes();
 }
 
-
-
 static void
 unmarshal_ciphertext_content(const bytes& content_pt,
                              MLSMessageContent& content,
                              MLSMessageAuth& auth)
 {
   auto r = tls::istream(content_pt);
 
-
   auto padding = bytes{};
   var::visit([&r](auto& val) { r >> val; }, content.content);
   r >> auth >> padding;
@@ -776,8 +773,7 @@ MLSCiphertext::unprotect(CipherSuite suite,
 
   // Parse the content
   auto content = MLSMessageContent{
-    group_id,          epoch, { sender_data.sender }, authenticated_data,
-    content_type
+    group_id, epoch, { sender_data.sender }, authenticated_data, content_type
   };
   auto auth = MLSMessageAuth{ content_type, {}, {} };
 

src/session.cpp

@@ -325,7 +325,8 @@ Session::handle(const bytes& handshake_data)
     maybe_cached_state = node.mapped();
   }
 
-  auto maybe_next_state = inner->history.front().handle(msg, maybe_cached_state);
+  auto maybe_next_state =
+    inner->history.front().handle(msg, maybe_cached_state);
   if (!maybe_next_state) {
     return false;
   }
@@ -393,7 +394,7 @@ Session::authentication_secret() const
 bytes
 Session::protect(const bytes& plaintext)
 {
-  auto msg = inner->history.front().protect({}, plaintext, 0 );
+  auto msg = inner->history.front().protect({}, plaintext, 0);
   return tls::marshal(msg);
 }
 

src/state.cpp

@@ -591,7 +591,6 @@ State::handle(const MLSMessage& msg, std::optional<State> cached_state)
     throw InvalidParameterError("Message signature failed to verify");
   }
 
-
   // Validate the MLSMessageContent
   const auto& content = content_auth.content;
   if (content.group_id != _group_id) {
@@ -636,14 +635,14 @@ State::handle(const MLSMessage& msg, std::optional<State> cached_state)
     // This optional is guaranteed to be present because we just did this same
     // lookup for signature verification.
     sender = opt::get(_tree.find(sender_ref));
-
   }
 
   if (sender == _index) {
     if (cached_state) {
       // Verify that the cached state is a plausible successor to this state
       const auto& next = opt::get(cached_state);
-      if (next._group_id != _group_id || next._epoch != _epoch + 1 || next._index != _index) {
+      if (next._group_id != _group_id || next._epoch != _epoch + 1 ||
+          next._index != _index) {
         throw InvalidParameterError("Invalid successor state");
       }
 
@@ -997,7 +996,9 @@ State::apply(const std::vector<CachedProposal>& proposals)
 ///
 
 MLSMessage
-State::protect(const bytes& authenticated_data, const bytes& pt, size_t padding_size)
+State::protect(const bytes& authenticated_data,
+               const bytes& pt,
+               size_t padding_size)
 {
   auto msg_opts = MessageOpts{ true, authenticated_data, padding_size };
   return protect_full(ApplicationData{ pt }, msg_opts);