Merge pull request #1014 from Martin2112/serialize_v2a

Proto and serialization changes for V2 structures, should align with draft v10 rfc

Author: Martin2112

cpp/log/etcd_consistent_store-inl.h

@@ -275,6 +275,10 @@ bool LeafEntriesMatch(const Logged& a, const Logged& b) {
     case ct::PRECERT_ENTRY:
       return a.entry().precert_entry().pre_certificate() ==
              b.entry().precert_entry().pre_certificate();
+    case ct::PRECERT_ENTRY_V2:
+      // TODO(mhs): V2 implementation required here
+      LOG(FATAL) << "CT V2 not yet implemented";
+      break;
     case ct::X_JSON_ENTRY:
       return a.entry().x_json_entry().json() ==
              b.entry().x_json_entry().json();

cpp/log/logged_entry.cc

@@ -2,6 +2,7 @@
 
 using ct::LogEntry;
 using ct::PreCert;
+using ct::CertInfo;
 using ct::SignedCertificateTimestamp;
 
 namespace cert_trans {
@@ -50,6 +51,12 @@ bool LoggedEntry::CopyFromClientLogEntry(const AsyncLogClient::Entry& entry) {
       break;
     }
 
+    case ct::PRECERT_ENTRY_V2: {
+      // TODO(mhs): V2 implementation here + other changes above
+      LOG(FATAL) << "CT V2 not yet implemented";
+      break;
+    }
+
     default:
       LOG(FATAL) << "unknown entry type";
   }

cpp/log/logged_entry.h

@@ -60,6 +60,10 @@ class LoggedEntry : public ct::LoggedEntryPB {
       case ct::PRECERT_ENTRY:
         return Serializer::SerializePrecertChainEntry(entry().precert_entry(),
                                                       dst) == Serializer::OK;
+      case ct::PRECERT_ENTRY_V2:
+        // TODO(mhs): V2 implementation needs to be provided.
+        LOG(FATAL) << "CT V2 not yet implemented";
+        break;
       case ct::X_JSON_ENTRY:
         dst->clear();
         return true;