From 5b4f566822fe4ea0dc9c2bef75467be86fbb341b Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Wed, 29 Aug 2012 18:54:44 +0100
Subject: [PATCH] Code layout.
---
components/net/sf/briar/transport/IncomingEncryptionLayer.java | 3 ++-
components/net/sf/briar/transport/OutgoingEncryptionLayer.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/net/sf/briar/transport/IncomingEncryptionLayer.java b/components/net/sf/briar/transport/IncomingEncryptionLayer.java
index 7e0fc8be13..05e15c1dde 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 22bb1bcea3..5e8ec05db9 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);
--
GitLab