diff --git a/components/net/sf/briar/transport/IncomingEncryptionLayer.java b/components/net/sf/briar/transport/IncomingEncryptionLayer.java index 7e0fc8be133c786e46d13c9b118c5b526ba36e7a..05e15c1dde67b31d6ba85c6eaff9150f69e0edbf 100644 --- a/components/net/sf/briar/transport/IncomingEncryptionLayer.java +++ b/components/net/sf/briar/transport/IncomingEncryptionLayer.java @@ -120,8 +120,9 @@ class IncomingEncryptionLayer implements FrameReader { if(payloadLength > plaintextLength - HEADER_LENGTH) throw new FormatException(); // If there's any padding it must be all zeroes - for(int i = HEADER_LENGTH + payloadLength; i < plaintextLength; i++) + for(int i = HEADER_LENGTH + payloadLength; i < plaintextLength; i++) { if(frame[i] != 0) throw new FormatException(); + } frameNumber++; return payloadLength; } diff --git a/components/net/sf/briar/transport/OutgoingEncryptionLayer.java b/components/net/sf/briar/transport/OutgoingEncryptionLayer.java index 22bb1bcea3b5255a94391f828207199722ff1595..5e8ec05db996ca1ed0e737bcb4abdb9907664ebf 100644 --- a/components/net/sf/briar/transport/OutgoingEncryptionLayer.java +++ b/components/net/sf/briar/transport/OutgoingEncryptionLayer.java @@ -97,8 +97,9 @@ class OutgoingEncryptionLayer implements FrameWriter { ciphertextLength = frameLength; } // If there's any padding it must all be zeroes - for(int i = HEADER_LENGTH + payloadLength; i < plaintextLength; i++) + for(int i = HEADER_LENGTH + payloadLength; i < plaintextLength; i++) { frame[i] = 0; + } // Encrypt and authenticate the frame FrameEncoder.encodeIv(iv, frameNumber); FrameEncoder.encodeAad(aad, frameNumber, plaintextLength);