Intermediate commit before reverting back to proto version 2 for both

protobuf files.

PostLAMessages.pb.h

@@ -186,31 +186,25 @@ class ciphertext_client_data_field :
   // accessors -------------------------------------------------------
 
   enum : int {
-    kBytesFieldNumber = 1,
+    kFieldFieldNumber = 1,
   };
-  // repeated bytes bytes = 1;
-  int bytes_size() const;
-  void clear_bytes();
-  const std::string& bytes(int index) const;
-  std::string* mutable_bytes(int index);
-  void set_bytes(int index, const std::string& value);
-  void set_bytes(int index, std::string&& value);
-  void set_bytes(int index, const char* value);
-  void set_bytes(int index, const void* value, size_t size);
-  std::string* add_bytes();
-  void add_bytes(const std::string& value);
-  void add_bytes(std::string&& value);
-  void add_bytes(const char* value);
-  void add_bytes(const void* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& bytes() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_bytes();
+  // bytes field = 1;
+  void clear_field();
+  const std::string& field() const;
+  void set_field(const std::string& value);
+  void set_field(std::string&& value);
+  void set_field(const char* value);
+  void set_field(const void* value, size_t size);
+  std::string* mutable_field();
+  std::string* release_field();
+  void set_allocated_field(std::string* field);
 
   // @@protoc_insertion_point(class_scope:ciphertext_client_data_field)
  private:
   class _Internal;
 
   ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> bytes_;
+  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr field_;
   mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   friend struct ::TableStruct_PostLAMessages_2eproto;
 };
@@ -327,26 +321,9 @@ class extension_to_decryptor_enclosed_msg :
   // accessors -------------------------------------------------------
 
   enum : int {
-    kCiphertextClientPublicKeyFieldNumber = 1,
     kCiphertextFieldsFieldNumber = 2,
+    kCiphertextClientPublicKeyFieldNumber = 1,
   };
-  // repeated bytes ciphertext_client_public_key = 1;
-  int ciphertext_client_public_key_size() const;
-  void clear_ciphertext_client_public_key();
-  const std::string& ciphertext_client_public_key(int index) const;
-  std::string* mutable_ciphertext_client_public_key(int index);
-  void set_ciphertext_client_public_key(int index, const std::string& value);
-  void set_ciphertext_client_public_key(int index, std::string&& value);
-  void set_ciphertext_client_public_key(int index, const char* value);
-  void set_ciphertext_client_public_key(int index, const void* value, size_t size);
-  std::string* add_ciphertext_client_public_key();
-  void add_ciphertext_client_public_key(const std::string& value);
-  void add_ciphertext_client_public_key(std::string&& value);
-  void add_ciphertext_client_public_key(const char* value);
-  void add_ciphertext_client_public_key(const void* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& ciphertext_client_public_key() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_ciphertext_client_public_key();
-
   // repeated .ciphertext_client_data_field ciphertext_fields = 2;
   int ciphertext_fields_size() const;
   void clear_ciphertext_fields();
@@ -358,13 +335,24 @@ class extension_to_decryptor_enclosed_msg :
   const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ciphertext_client_data_field >&
       ciphertext_fields() const;
 
+  // bytes ciphertext_client_public_key = 1;
+  void clear_ciphertext_client_public_key();
+  const std::string& ciphertext_client_public_key() const;
+  void set_ciphertext_client_public_key(const std::string& value);
+  void set_ciphertext_client_public_key(std::string&& value);
+  void set_ciphertext_client_public_key(const char* value);
+  void set_ciphertext_client_public_key(const void* value, size_t size);
+  std::string* mutable_ciphertext_client_public_key();
+  std::string* release_ciphertext_client_public_key();
+  void set_allocated_ciphertext_client_public_key(std::string* ciphertext_client_public_key);
+
   // @@protoc_insertion_point(class_scope:extension_to_decryptor_enclosed_msg)
  private:
   class _Internal;
 
   ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> ciphertext_client_public_key_;
   ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::ciphertext_client_data_field > ciphertext_fields_;
+  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr ciphertext_client_public_key_;
   mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   friend struct ::TableStruct_PostLAMessages_2eproto;
 };
@@ -481,31 +469,25 @@ class extension_to_decryptor_ciphertext_msg :
   // accessors -------------------------------------------------------
 
   enum : int {
-    kBytesFieldNumber = 1,
+    kCiphertextBytesFieldNumber = 1,
   };
-  // repeated bytes bytes = 1;
-  int bytes_size() const;
-  void clear_bytes();
-  const std::string& bytes(int index) const;
-  std::string* mutable_bytes(int index);
-  void set_bytes(int index, const std::string& value);
-  void set_bytes(int index, std::string&& value);
-  void set_bytes(int index, const char* value);
-  void set_bytes(int index, const void* value, size_t size);
-  std::string* add_bytes();
-  void add_bytes(const std::string& value);
-  void add_bytes(std::string&& value);
-  void add_bytes(const char* value);
-  void add_bytes(const void* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& bytes() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_bytes();
+  // bytes ciphertext_bytes = 1;
+  void clear_ciphertext_bytes();
+  const std::string& ciphertext_bytes() const;
+  void set_ciphertext_bytes(const std::string& value);
+  void set_ciphertext_bytes(std::string&& value);
+  void set_ciphertext_bytes(const char* value);
+  void set_ciphertext_bytes(const void* value, size_t size);
+  std::string* mutable_ciphertext_bytes();
+  std::string* release_ciphertext_bytes();
+  void set_allocated_ciphertext_bytes(std::string* ciphertext_bytes);
 
   // @@protoc_insertion_point(class_scope:extension_to_decryptor_ciphertext_msg)
  private:
   class _Internal;
 
   ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> bytes_;
+  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr ciphertext_bytes_;
   mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   friend struct ::TableStruct_PostLAMessages_2eproto;
 };
@@ -655,138 +637,110 @@ class decryptor_to_extension_msg_t :
 #endif  // __GNUC__
 // ciphertext_client_data_field
 
-// repeated bytes bytes = 1;
-inline int ciphertext_client_data_field::bytes_size() const {
-  return bytes_.size();
-}
-inline void ciphertext_client_data_field::clear_bytes() {
-  bytes_.Clear();
+// bytes field = 1;
+inline void ciphertext_client_data_field::clear_field() {
+  field_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
 }
-inline const std::string& ciphertext_client_data_field::bytes(int index) const {
-  // @@protoc_insertion_point(field_get:ciphertext_client_data_field.bytes)
-  return bytes_.Get(index);
+inline const std::string& ciphertext_client_data_field::field() const {
+  // @@protoc_insertion_point(field_get:ciphertext_client_data_field.field)
+  return field_.GetNoArena();
 }
-inline std::string* ciphertext_client_data_field::mutable_bytes(int index) {
-  // @@protoc_insertion_point(field_mutable:ciphertext_client_data_field.bytes)
-  return bytes_.Mutable(index);
+inline void ciphertext_client_data_field::set_field(const std::string& value) {
+  
+  field_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value);
+  // @@protoc_insertion_point(field_set:ciphertext_client_data_field.field)
 }
-inline void ciphertext_client_data_field::set_bytes(int index, const std::string& value) {
-  // @@protoc_insertion_point(field_set:ciphertext_client_data_field.bytes)
-  bytes_.Mutable(index)->assign(value);
+inline void ciphertext_client_data_field::set_field(std::string&& value) {
+  
+  field_.SetNoArena(
+    &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
+  // @@protoc_insertion_point(field_set_rvalue:ciphertext_client_data_field.field)
 }
-inline void ciphertext_client_data_field::set_bytes(int index, std::string&& value) {
-  // @@protoc_insertion_point(field_set:ciphertext_client_data_field.bytes)
-  bytes_.Mutable(index)->assign(std::move(value));
-}
-inline void ciphertext_client_data_field::set_bytes(int index, const char* value) {
+inline void ciphertext_client_data_field::set_field(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  bytes_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:ciphertext_client_data_field.bytes)
-}
-inline void ciphertext_client_data_field::set_bytes(int index, const void* value, size_t size) {
-  bytes_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:ciphertext_client_data_field.bytes)
+  
+  field_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
+  // @@protoc_insertion_point(field_set_char:ciphertext_client_data_field.field)
 }
-inline std::string* ciphertext_client_data_field::add_bytes() {
-  // @@protoc_insertion_point(field_add_mutable:ciphertext_client_data_field.bytes)
-  return bytes_.Add();
+inline void ciphertext_client_data_field::set_field(const void* value, size_t size) {
+  
+  field_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+      ::std::string(reinterpret_cast<const char*>(value), size));
+  // @@protoc_insertion_point(field_set_pointer:ciphertext_client_data_field.field)
 }
-inline void ciphertext_client_data_field::add_bytes(const std::string& value) {
-  bytes_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:ciphertext_client_data_field.bytes)
+inline std::string* ciphertext_client_data_field::mutable_field() {
+  
+  // @@protoc_insertion_point(field_mutable:ciphertext_client_data_field.field)
+  return field_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
 }
-inline void ciphertext_client_data_field::add_bytes(std::string&& value) {
-  bytes_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:ciphertext_client_data_field.bytes)
+inline std::string* ciphertext_client_data_field::release_field() {
+  // @@protoc_insertion_point(field_release:ciphertext_client_data_field.field)
+  
+  return field_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
 }
-inline void ciphertext_client_data_field::add_bytes(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  bytes_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:ciphertext_client_data_field.bytes)
-}
-inline void ciphertext_client_data_field::add_bytes(const void* value, size_t size) {
-  bytes_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:ciphertext_client_data_field.bytes)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-ciphertext_client_data_field::bytes() const {
-  // @@protoc_insertion_point(field_list:ciphertext_client_data_field.bytes)
-  return bytes_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-ciphertext_client_data_field::mutable_bytes() {
-  // @@protoc_insertion_point(field_mutable_list:ciphertext_client_data_field.bytes)
-  return &bytes_;
+inline void ciphertext_client_data_field::set_allocated_field(std::string* field) {
+  if (field != nullptr) {
+    
+  } else {
+    
+  }
+  field_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), field);
+  // @@protoc_insertion_point(field_set_allocated:ciphertext_client_data_field.field)
 }
 
 // -------------------------------------------------------------------
 
 // extension_to_decryptor_enclosed_msg
 
-// repeated bytes ciphertext_client_public_key = 1;
-inline int extension_to_decryptor_enclosed_msg::ciphertext_client_public_key_size() const {
-  return ciphertext_client_public_key_.size();
-}
+// bytes ciphertext_client_public_key = 1;
 inline void extension_to_decryptor_enclosed_msg::clear_ciphertext_client_public_key() {
-  ciphertext_client_public_key_.Clear();
+  ciphertext_client_public_key_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
 }
-inline const std::string& extension_to_decryptor_enclosed_msg::ciphertext_client_public_key(int index) const {
+inline const std::string& extension_to_decryptor_enclosed_msg::ciphertext_client_public_key() const {
   // @@protoc_insertion_point(field_get:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
-  return ciphertext_client_public_key_.Get(index);
-}
-inline std::string* extension_to_decryptor_enclosed_msg::mutable_ciphertext_client_public_key(int index) {
-  // @@protoc_insertion_point(field_mutable:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
-  return ciphertext_client_public_key_.Mutable(index);
+  return ciphertext_client_public_key_.GetNoArena();
 }
-inline void extension_to_decryptor_enclosed_msg::set_ciphertext_client_public_key(int index, const std::string& value) {
+inline void extension_to_decryptor_enclosed_msg::set_ciphertext_client_public_key(const std::string& value) {
+  
+  ciphertext_client_public_key_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
-  ciphertext_client_public_key_.Mutable(index)->assign(value);
 }
-inline void extension_to_decryptor_enclosed_msg::set_ciphertext_client_public_key(int index, std::string&& value) {
-  // @@protoc_insertion_point(field_set:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
-  ciphertext_client_public_key_.Mutable(index)->assign(std::move(value));
+inline void extension_to_decryptor_enclosed_msg::set_ciphertext_client_public_key(std::string&& value) {
+  
+  ciphertext_client_public_key_.SetNoArena(
+    &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
+  // @@protoc_insertion_point(field_set_rvalue:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
 }
-inline void extension_to_decryptor_enclosed_msg::set_ciphertext_client_public_key(int index, const char* value) {
+inline void extension_to_decryptor_enclosed_msg::set_ciphertext_client_public_key(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  ciphertext_client_public_key_.Mutable(index)->assign(value);
+  
+  ciphertext_client_public_key_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
 }
-inline void extension_to_decryptor_enclosed_msg::set_ciphertext_client_public_key(int index, const void* value, size_t size) {
-  ciphertext_client_public_key_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
+inline void extension_to_decryptor_enclosed_msg::set_ciphertext_client_public_key(const void* value, size_t size) {
+  
+  ciphertext_client_public_key_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+      ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
 }
-inline std::string* extension_to_decryptor_enclosed_msg::add_ciphertext_client_public_key() {
-  // @@protoc_insertion_point(field_add_mutable:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
-  return ciphertext_client_public_key_.Add();
-}
-inline void extension_to_decryptor_enclosed_msg::add_ciphertext_client_public_key(const std::string& value) {
-  ciphertext_client_public_key_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
-}
-inline void extension_to_decryptor_enclosed_msg::add_ciphertext_client_public_key(std::string&& value) {
-  ciphertext_client_public_key_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
-}
-inline void extension_to_decryptor_enclosed_msg::add_ciphertext_client_public_key(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  ciphertext_client_public_key_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
-}
-inline void extension_to_decryptor_enclosed_msg::add_ciphertext_client_public_key(const void* value, size_t size) {
-  ciphertext_client_public_key_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
+inline std::string* extension_to_decryptor_enclosed_msg::mutable_ciphertext_client_public_key() {
+  
+  // @@protoc_insertion_point(field_mutable:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
+  return ciphertext_client_public_key_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
 }
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-extension_to_decryptor_enclosed_msg::ciphertext_client_public_key() const {
-  // @@protoc_insertion_point(field_list:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
-  return ciphertext_client_public_key_;
+inline std::string* extension_to_decryptor_enclosed_msg::release_ciphertext_client_public_key() {
+  // @@protoc_insertion_point(field_release:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
+  
+  return ciphertext_client_public_key_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
 }
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-extension_to_decryptor_enclosed_msg::mutable_ciphertext_client_public_key() {
-  // @@protoc_insertion_point(field_mutable_list:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
-  return &ciphertext_client_public_key_;
+inline void extension_to_decryptor_enclosed_msg::set_allocated_ciphertext_client_public_key(std::string* ciphertext_client_public_key) {
+  if (ciphertext_client_public_key != nullptr) {
+    
+  } else {
+    
+  }
+  ciphertext_client_public_key_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ciphertext_client_public_key);
+  // @@protoc_insertion_point(field_set_allocated:extension_to_decryptor_enclosed_msg.ciphertext_client_public_key)
 }
 
 // repeated .ciphertext_client_data_field ciphertext_fields = 2;
@@ -823,69 +777,55 @@ extension_to_decryptor_enclosed_msg::ciphertext_fields() const {
 
 // extension_to_decryptor_ciphertext_msg
 
-// repeated bytes bytes = 1;
-inline int extension_to_decryptor_ciphertext_msg::bytes_size() const {
-  return bytes_.size();
-}
-inline void extension_to_decryptor_ciphertext_msg::clear_bytes() {
-  bytes_.Clear();
-}
-inline const std::string& extension_to_decryptor_ciphertext_msg::bytes(int index) const {
-  // @@protoc_insertion_point(field_get:extension_to_decryptor_ciphertext_msg.bytes)
-  return bytes_.Get(index);
-}
-inline std::string* extension_to_decryptor_ciphertext_msg::mutable_bytes(int index) {
-  // @@protoc_insertion_point(field_mutable:extension_to_decryptor_ciphertext_msg.bytes)
-  return bytes_.Mutable(index);
-}
-inline void extension_to_decryptor_ciphertext_msg::set_bytes(int index, const std::string& value) {
-  // @@protoc_insertion_point(field_set:extension_to_decryptor_ciphertext_msg.bytes)
-  bytes_.Mutable(index)->assign(value);
-}
-inline void extension_to_decryptor_ciphertext_msg::set_bytes(int index, std::string&& value) {
-  // @@protoc_insertion_point(field_set:extension_to_decryptor_ciphertext_msg.bytes)
-  bytes_.Mutable(index)->assign(std::move(value));
-}
-inline void extension_to_decryptor_ciphertext_msg::set_bytes(int index, const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  bytes_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:extension_to_decryptor_ciphertext_msg.bytes)
-}
-inline void extension_to_decryptor_ciphertext_msg::set_bytes(int index, const void* value, size_t size) {
-  bytes_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:extension_to_decryptor_ciphertext_msg.bytes)
+// bytes ciphertext_bytes = 1;
+inline void extension_to_decryptor_ciphertext_msg::clear_ciphertext_bytes() {
+  ciphertext_bytes_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
 }
-inline std::string* extension_to_decryptor_ciphertext_msg::add_bytes() {
-  // @@protoc_insertion_point(field_add_mutable:extension_to_decryptor_ciphertext_msg.bytes)
-  return bytes_.Add();
+inline const std::string& extension_to_decryptor_ciphertext_msg::ciphertext_bytes() const {
+  // @@protoc_insertion_point(field_get:extension_to_decryptor_ciphertext_msg.ciphertext_bytes)
+  return ciphertext_bytes_.GetNoArena();
 }
-inline void extension_to_decryptor_ciphertext_msg::add_bytes(const std::string& value) {
-  bytes_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:extension_to_decryptor_ciphertext_msg.bytes)
+inline void extension_to_decryptor_ciphertext_msg::set_ciphertext_bytes(const std::string& value) {
+  
+  ciphertext_bytes_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value);
+  // @@protoc_insertion_point(field_set:extension_to_decryptor_ciphertext_msg.ciphertext_bytes)
 }
-inline void extension_to_decryptor_ciphertext_msg::add_bytes(std::string&& value) {
-  bytes_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:extension_to_decryptor_ciphertext_msg.bytes)
+inline void extension_to_decryptor_ciphertext_msg::set_ciphertext_bytes(std::string&& value) {
+  
+  ciphertext_bytes_.SetNoArena(
+    &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
+  // @@protoc_insertion_point(field_set_rvalue:extension_to_decryptor_ciphertext_msg.ciphertext_bytes)
 }
-inline void extension_to_decryptor_ciphertext_msg::add_bytes(const char* value) {
+inline void extension_to_decryptor_ciphertext_msg::set_ciphertext_bytes(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  bytes_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:extension_to_decryptor_ciphertext_msg.bytes)
-}
-inline void extension_to_decryptor_ciphertext_msg::add_bytes(const void* value, size_t size) {
-  bytes_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:extension_to_decryptor_ciphertext_msg.bytes)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-extension_to_decryptor_ciphertext_msg::bytes() const {
-  // @@protoc_insertion_point(field_list:extension_to_decryptor_ciphertext_msg.bytes)
-  return bytes_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-extension_to_decryptor_ciphertext_msg::mutable_bytes() {
-  // @@protoc_insertion_point(field_mutable_list:extension_to_decryptor_ciphertext_msg.bytes)
-  return &bytes_;
+  
+  ciphertext_bytes_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
+  // @@protoc_insertion_point(field_set_char:extension_to_decryptor_ciphertext_msg.ciphertext_bytes)
+}
+inline void extension_to_decryptor_ciphertext_msg::set_ciphertext_bytes(const void* value, size_t size) {
+  
+  ciphertext_bytes_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+      ::std::string(reinterpret_cast<const char*>(value), size));
+  // @@protoc_insertion_point(field_set_pointer:extension_to_decryptor_ciphertext_msg.ciphertext_bytes)
+}
+inline std::string* extension_to_decryptor_ciphertext_msg::mutable_ciphertext_bytes() {
+  
+  // @@protoc_insertion_point(field_mutable:extension_to_decryptor_ciphertext_msg.ciphertext_bytes)
+  return ciphertext_bytes_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+}
+inline std::string* extension_to_decryptor_ciphertext_msg::release_ciphertext_bytes() {
+  // @@protoc_insertion_point(field_release:extension_to_decryptor_ciphertext_msg.ciphertext_bytes)
+  
+  return ciphertext_bytes_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+}
+inline void extension_to_decryptor_ciphertext_msg::set_allocated_ciphertext_bytes(std::string* ciphertext_bytes) {
+  if (ciphertext_bytes != nullptr) {
+    
+  } else {
+    
+  }
+  ciphertext_bytes_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ciphertext_bytes);
+  // @@protoc_insertion_point(field_set_allocated:extension_to_decryptor_ciphertext_msg.ciphertext_bytes)
 }
 
 // -------------------------------------------------------------------

PostLAMessages.proto

@@ -1,16 +1,16 @@
-syntax = "proto3";
+syntax = "proto2";
 
 message ciphertext_client_data_field {
-    repeated bytes bytes = 1;
+    bytes field = 1;
 }
 
 message extension_to_decryptor_enclosed_msg {
-    repeated bytes ciphertext_client_public_key = 1;
+    bytes ciphertext_client_public_key = 1;
     repeated ciphertext_client_data_field ciphertext_fields = 2;
 }
 
 message extension_to_decryptor_ciphertext_msg {
-    repeated bytes bytes = 1;
+    bytes ciphertext_bytes = 1;
 }
 
 message decryptor_to_extension_msg_t {

ProtobufLAMessages.proto

@@ -10,75 +10,74 @@
 // "Repeated" - can be repeated 0 or more times - however, arrays in C or CPP with fixed size that have all their elements defined - are a stricter version of this. (Protobuf doesn't let you define constant-sized arrays.)
 // packed=true is necessary to ensure successive, efficient 'packing'
 
-syntax = "proto2";
-option optimize_for = LITE_RUNTIME;
+syntax = "proto3";
 // LITE_RUNTIME supports serializetocodedstream - which is helpful to read/write multiple messages - https://groups.google.com/forum/#!topic/protobuf/MlUMUPp5WDc and https://developers.google.com/protocol-buffers/docs/techniques?csw=1#streaming
 
 // Only have base classes for those structs in the composite structs that have more than 1 element - this causes a significant reduction in the size of the generated .cc and .h files.
 
 message  protobuf_sgx_attributes_t {
-  required uint64 flags = 1;
-  required uint64 xfrm = 2;
+  uint64 flags = 1;
+  uint64 xfrm = 2;
 }
 
 message protobuf_sgx_ec256_public_t {
-  repeated uint32 gx = 1 [packed=true];
-  repeated uint32 gy = 2 [packed=true];
+  repeated uint32 gx = 1 ;
+  repeated uint32 gy = 2 ;
 }
 
 // Composite message types
-// Tag numbers - first all the repeated ones (arrays) and then the required ones, as per the docs.
+// Tag numbers - first all the repeated ones (arrays) and then the  ones, as per the docs.
 message protobuf_sgx_report_body_t {
-  repeated uint32 cpu_svn = 1 [packed=true];
-  required uint32 misc_select = 9;
-  repeated uint32 reserved1 = 2 [packed=true];
-  required protobuf_sgx_attributes_t attributes = 10;
-  repeated uint32 mr_enclave = 3 [packed=true];
-  repeated uint32 reserved2 = 4 [packed=true];
-  repeated uint32 mr_signer = 5 [packed=true];
-  repeated uint32 reserved3 = 6 [packed=true];
-  required uint32 isv_prod_id = 11;
-  required uint32 isv_svn = 12;
-  repeated uint32 reserved4 = 7 [packed=true];
-  repeated uint32 report_data = 8 [packed=true];
+  repeated uint32 cpu_svn = 1 ;
+   uint32 misc_select = 9;
+  repeated uint32 reserved1 = 2 ;
+   protobuf_sgx_attributes_t attributes = 10;
+  repeated uint32 mr_enclave = 3 ;
+  repeated uint32 reserved2 = 4 ;
+  repeated uint32 mr_signer = 5 ;
+  repeated uint32 reserved3 = 6 ;
+   uint32 isv_prod_id = 11;
+   uint32 isv_svn = 12;
+  repeated uint32 reserved4 = 7 ;
+  repeated uint32 report_data = 8 ;
 }
 
 message protobuf_sgx_report_t {
-  required protobuf_sgx_report_body_t body = 1;
-  repeated uint32 key_id = 2 [packed=true];
-  repeated uint32 mac = 3 [packed=true];
+   protobuf_sgx_report_body_t body = 1;
+  repeated uint32 key_id = 2 ;
+  repeated uint32 mac = 3 ;
 }
 
 message protobuf_sgx_target_info_t {
-  repeated uint32 mr_enclave = 1 [packed=true];
-  required protobuf_sgx_attributes_t attributes = 4;
-  repeated uint32 reserved1 = 2 [packed=true];
-  required uint32 misc_select = 5;
-  repeated uint32 reserved2 = 3 [packed=true];
+  repeated uint32 mr_enclave = 1 ;
+   protobuf_sgx_attributes_t attributes = 4;
+  repeated uint32 reserved1 = 2 ;
+   uint32 misc_select = 5;
+  repeated uint32 reserved2 = 3 ;
 }
 
 message protobuf_sgx_dh_msg1_t {
-  required protobuf_sgx_ec256_public_t g_a = 1;
-  required protobuf_sgx_target_info_t target = 2;
+   protobuf_sgx_ec256_public_t g_a = 1;
+   protobuf_sgx_target_info_t target = 2;
 }
 
 message protobuf_sgx_dh_msg2_t {
-  required protobuf_sgx_ec256_public_t  g_b = 1;
-  required protobuf_sgx_report_t        report = 2;
-  repeated uint32 cmac = 3 [packed=true];
+   protobuf_sgx_ec256_public_t  g_b = 1;
+   protobuf_sgx_report_t        report = 2;
+  repeated uint32 cmac = 3 ;
 }
 
 message protobuf_sgx_dh_msg3_body_t {
-  required protobuf_sgx_report_t report = 1;
+   protobuf_sgx_report_t report = 1;
   repeated uint32 additional_prop = 2;
 }
 
 message protobuf_sgx_dh_msg3_t {
-  required protobuf_sgx_dh_msg3_body_t msg3_body = 1;
-  repeated uint32 cmac = 2 [packed=true];
+   protobuf_sgx_dh_msg3_body_t msg3_body = 1;
+  repeated uint32 cmac = 2 ;
 }
 
 // for post-LA key establishment and other msgs (in particular, between Apache and Decryptor)
 message protobuf_post_LA_encrypted_msg_t {
-  required bytes msg = 1 ; 	
+   bytes msg = 1 ; 	
 }