Merge pull request #85 from gdbelvin/multi_key

Use a map to store multiple signatures. closes #41
google · Aug 21, 2015 · 9e3a451 · 9e3a451
2 parents f40aa7e + e37c1d3
commit 9e3a451
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/proto/v2/e2ekeys.proto b/proto/v2/e2ekeys.proto
@@ -70,13 +70,11 @@ service E2EKeyService {
 
 // SignedEpochHead represents a signed state of the Merkel tree.
 message SignedEpochHead {
-  // Signature of this epoch's hash, using the signature type of the key.
-  bytes head_sig = 1;
+  // Signature of head, using the signature type of the key.
+  // keyed by the first 8 bytes of the hash of the key.
+  map<uint64, bytes> head_sigs = 1;
   // Serialized TimestampedEpochHead.
   bytes head = 2;
-  // key_hash is the first 4 bytes of the SHA256 hash of the key used for
-  // signing. May be used for key rotation and/or multiple signatures.
-  uint64 key_hash = 3;
 }
 
 message TimestampedEpochHead {