Update WhisperTextProtocol for v3

This commit is contained in:
Matt Corallo 2014-07-20 16:38:02 -04:00
parent 3190fe97f9
commit 1d2e252595

View file

@ -1,6 +1,6 @@
package textsecure; package textsecure;
option java_package = "org.whispersystems.textsecure.crypto.protocol"; option java_package = "org.whispersystems.libaxolotl.protocol";
option java_outer_classname = "WhisperProtos"; option java_outer_classname = "WhisperProtos";
message WhisperMessage { message WhisperMessage {
@ -12,15 +12,19 @@ message WhisperMessage {
message PreKeyWhisperMessage { message PreKeyWhisperMessage {
optional uint32 registrationId = 5; optional uint32 registrationId = 5;
optional uint32 preKeyId = 1; optional uint32 preKeyId = 1;
optional bytes baseKey = 2; optional uint32 signedPreKeyId = 6;
optional bytes identityKey = 3; optional bytes baseKey = 2;
optional bytes message = 4; // WhisperMessage optional bytes identityKey = 3;
optional bytes verification = 7;
optional bytes message = 4; // WhisperMessage
} }
message KeyExchangeMessage { message KeyExchangeMessage {
optional uint32 id = 1; optional uint32 id = 1;
optional bytes baseKey = 2; optional bytes baseKey = 2;
optional bytes ephemeralKey = 3; optional bytes ephemeralKey = 3;
optional bytes identityKey = 4; optional bytes identityKey = 4;
optional bytes baseKeySignature = 5;
optional bytes verification = 6;
} }