Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 12:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Frame-at-a-time encryption.

Browse Source
This commit is contained in:
akwizgran
2012-01-11 17:50:24 +00:00
parent 99caec9448
commit f55f98f506
5 changed files with 76 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/net/sf/briar/transport/ConnectionEncrypterImplTest.java
View File

@@ -49,25 +49,16 @@ public class ConnectionEncrypterImplTest extends BriarTestCase {
byte[] tag = TagEncoder.encodeTag(0, tagCipher, tagKey);
// Calculate the expected ciphertext for the first frame
byte[] iv = new byte[frameCipher.getBlockSize()];
byte[] plaintext = new byte[123];
byte[] plaintextMac = new byte[MAC_LENGTH];
byte[] plaintext = new byte[123 + MAC_LENGTH];
IvParameterSpec ivSpec = new IvParameterSpec(iv);
frameCipher.init(Cipher.ENCRYPT_MODE, frameKey, ivSpec);
byte[] ciphertext = new byte[plaintext.length + plaintextMac.length];
int offset = frameCipher.update(plaintext, 0, plaintext.length,
ciphertext);
frameCipher.doFinal(plaintextMac, 0, plaintextMac.length, ciphertext,
offset);
byte[] ciphertext = frameCipher.doFinal(plaintext);
// Calculate the expected ciphertext for the second frame
byte[] plaintext1 = new byte[1234];
byte[] plaintext1 = new byte[1234 + MAC_LENGTH];
IvEncoder.updateIv(iv, 1L);
ivSpec = new IvParameterSpec(iv);
frameCipher.init(Cipher.ENCRYPT_MODE, frameKey, ivSpec);
byte[] ciphertext1 = new byte[plaintext1.length + plaintextMac.length];
offset = frameCipher.update(plaintext1, 0, plaintext1.length,
ciphertext1);
frameCipher.doFinal(plaintextMac, 0, plaintextMac.length, ciphertext1,
offset);
byte[] ciphertext1 = frameCipher.doFinal(plaintext1);
// Concatenate the ciphertexts
ByteArrayOutputStream out = new ByteArrayOutputStream();
out.write(tag);
@@ -78,10 +69,8 @@ public class ConnectionEncrypterImplTest extends BriarTestCase {
out.reset();
ConnectionEncrypter e = new ConnectionEncrypterImpl(out, Long.MAX_VALUE,
tagCipher, frameCipher, tagKey, frameKey);
e.getOutputStream().write(plaintext);
e.writeFinal(plaintextMac);
e.getOutputStream().write(plaintext1);
e.writeFinal(plaintextMac);
e.writeFrame(plaintext, 0, plaintext.length);
e.writeFrame(plaintext1, 0, plaintext1.length);
byte[] actual = out.toByteArray();
// Check that the actual ciphertext matches the expected ciphertext
assertArrayEquals(expected, actual);

38
test/net/sf/briar/transport/NullConnectionEncrypter.java
View File

@@ -1,51 +1,35 @@
package net.sf.briar.transport;
import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
/** A ConnectionEncrypter that performs no encryption. */
class NullConnectionEncrypter extends FilterOutputStream
implements ConnectionEncrypter {
class NullConnectionEncrypter implements ConnectionEncrypter {
private final OutputStream out;
private long capacity;
NullConnectionEncrypter(OutputStream out) {
this(out, Long.MAX_VALUE);
this.out = out;
capacity = Long.MAX_VALUE;
}
NullConnectionEncrypter(OutputStream out, long capacity) {
super(out);
this.out = out;
this.capacity = capacity;
}
public OutputStream getOutputStream() {
return this;
public void writeFrame(byte[] b, int off, int len) throws IOException {
out.write(b, off, len);
capacity -= len;
}
public void writeFinal(byte[] mac) throws IOException {
out.write(mac);
capacity -= mac.length;
public void flush() throws IOException {
out.flush();
}
public long getRemainingCapacity() {
return capacity;
}
@Override
public void write(int b) throws IOException {
out.write(b);
capacity--;
}
@Override
public void write(byte[] b) throws IOException {
write(b, 0, b.length);
}
@Override
public void write(byte[] b, int off, int len) throws IOException {
out.write(b, off, len);
capacity -= len;
}
}