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

Renamed a couple of classes.

Browse Source
This commit is contained in:
akwizgran
2012-01-20 23:28:17 +00:00
parent 3a77ba9aaf
commit 48ceaaea2a
10 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/net/sf/briar/transport/ConnectionReaderFactoryImpl.java
View File

@@ -55,7 +55,8 @@ class ConnectionReaderFactoryImpl implements ConnectionReaderFactory {
new IncomingAuthenticationLayerImpl(correction, mac, macKey);
// No reordering or retransmission
IncomingReliabilityLayer reliability =
new NullIncomingReliabilityLayer(authentication);
new IncomingReliabilityLayerImpl(authentication,
new NullFrameWindow());
// Create the reader - don't tolerate errors
return new ConnectionReaderImpl(reliability, false);
}
@@ -81,7 +82,7 @@ class ConnectionReaderFactoryImpl implements ConnectionReaderFactory {
Cipher tagCipher = crypto.getTagCipher();
Cipher segCipher = crypto.getSegmentCipher();
IncomingEncryptionLayer encryption =
new IncomingSegmentedEncryptionLayer(in, tagCipher, segCipher,
new SegmentedIncomingEncryptionLayer(in, tagCipher, segCipher,
tagKey, segKey, false, bufferedSegment);
// No error correction
IncomingErrorCorrectionLayer correction =
@@ -92,7 +93,8 @@ class ConnectionReaderFactoryImpl implements ConnectionReaderFactory {
new IncomingAuthenticationLayerImpl(correction, mac, macKey);
// No reordering or retransmission
IncomingReliabilityLayer reliability =
new NullIncomingReliabilityLayer(authentication);
new IncomingReliabilityLayerImpl(authentication,
new NullFrameWindow());
// Create the reader - don't tolerate errors
return new ConnectionReaderImpl(reliability, false);
}

2
components/net/sf/briar/transport/ConnectionWriterFactoryImpl.java
View File

@@ -60,7 +60,7 @@ class ConnectionWriterFactoryImpl implements ConnectionWriterFactory {
Cipher tagCipher = crypto.getTagCipher();
Cipher segCipher = crypto.getSegmentCipher();
OutgoingEncryptionLayer encryption =
new OutgoingSegmentedEncryptionLayer(out, capacity, tagCipher,
new SegmentedOutgoingEncryptionLayer(out, capacity, tagCipher,
segCipher, tagKey, segKey, false);
// No error correction
OutgoingErrorCorrectionLayer correction =

9
components/net/sf/briar/transport/NullIncomingReliabilityLayer.java → components/net/sf/briar/transport/IncomingReliabilityLayerImpl.java
View File

@@ -2,16 +2,17 @@ package net.sf.briar.transport;
import java.io.IOException;
class NullIncomingReliabilityLayer implements IncomingReliabilityLayer {
class IncomingReliabilityLayerImpl implements IncomingReliabilityLayer {
private final IncomingAuthenticationLayer in;
private final int maxFrameLength;
private final FrameWindow window;
private final int maxFrameLength;
NullIncomingReliabilityLayer(IncomingAuthenticationLayer in) {
IncomingReliabilityLayerImpl(IncomingAuthenticationLayer in,
FrameWindow window) {
this.in = in;
this.window = window;
maxFrameLength = in.getMaxFrameLength();
window = new NullFrameWindow();
}
public boolean readFrame(Frame f) throws IOException, InvalidDataException {

4
components/net/sf/briar/transport/IncomingSegmentedEncryptionLayer.java → components/net/sf/briar/transport/SegmentedIncomingEncryptionLayer.java
View File

@@ -15,7 +15,7 @@ import net.sf.briar.api.crypto.ErasableKey;
import net.sf.briar.api.plugins.SegmentSource;
import net.sf.briar.api.transport.Segment;
class IncomingSegmentedEncryptionLayer implements IncomingEncryptionLayer {
class SegmentedIncomingEncryptionLayer implements IncomingEncryptionLayer {
private final SegmentSource in;
private final Cipher tagCipher, segCipher;
@@ -29,7 +29,7 @@ class IncomingSegmentedEncryptionLayer implements IncomingEncryptionLayer {
private boolean firstSegment = true;
private long segmentNumber = 0L;
IncomingSegmentedEncryptionLayer(SegmentSource in, Cipher tagCipher,
SegmentedIncomingEncryptionLayer(SegmentSource in, Cipher tagCipher,
Cipher segCipher, ErasableKey tagKey, ErasableKey segKey,
boolean tagEverySegment, Segment bufferedSegment) {
this.in = in;

4
components/net/sf/briar/transport/OutgoingSegmentedEncryptionLayer.java → components/net/sf/briar/transport/SegmentedOutgoingEncryptionLayer.java
View File

@@ -15,7 +15,7 @@ import net.sf.briar.api.crypto.ErasableKey;
import net.sf.briar.api.plugins.SegmentSink;
import net.sf.briar.api.transport.Segment;
class OutgoingSegmentedEncryptionLayer implements OutgoingEncryptionLayer {
class SegmentedOutgoingEncryptionLayer implements OutgoingEncryptionLayer {
private final SegmentSink out;
private final Cipher tagCipher, segCipher;
@@ -27,7 +27,7 @@ class OutgoingSegmentedEncryptionLayer implements OutgoingEncryptionLayer {
private long capacity;
OutgoingSegmentedEncryptionLayer(SegmentSink out, long capacity,
SegmentedOutgoingEncryptionLayer(SegmentSink out, long capacity,
Cipher tagCipher, Cipher segCipher, ErasableKey tagKey,
ErasableKey segKey, boolean tagEverySegment) {
this.out = out;

4
test/build.xml
View File

@@ -59,9 +59,9 @@
<test name='net.sf.briar.transport.FrameWindowImplTest'/>
<test name='net.sf.briar.transport.IncomingEncryptionLayerImplTest'/>
<test name='net.sf.briar.transport.IncomingErrorCorrectionLayerImplTest'/>
<test name='net.sf.briar.transport.IncomingSegmentedEncryptionLayerTest'/>
<test name='net.sf.briar.transport.OutgoingEncryptionLayerImplTest'/>
<test name='net.sf.briar.transport.OutgoingSegmentedEncryptionLayerTest'/>
<test name='net.sf.briar.transport.SegmentedIncomingEncryptionLayerTest'/>
<test name='net.sf.briar.transport.SegmentedOutgoingEncryptionLayerTest'/>
<test name='net.sf.briar.transport.XorErasureCodeTest'/>
<test name='net.sf.briar.transport.XorErasureDecoderTest'/>
<test name='net.sf.briar.transport.XorErasureEncoderTest'/>

3
test/net/sf/briar/transport/ConnectionReaderImplTest.java
View File

@@ -224,7 +224,8 @@ public class ConnectionReaderImplTest extends TransportTest {
IncomingAuthenticationLayer authentication =
new IncomingAuthenticationLayerImpl(correction, mac, macKey);
IncomingReliabilityLayer reliability =
new NullIncomingReliabilityLayer(authentication);
new IncomingReliabilityLayerImpl(authentication,
new NullFrameWindow());
return new ConnectionReaderImpl(reliability, false);
}
}

3
test/net/sf/briar/transport/FrameReadWriteTest.java
View File

@@ -103,7 +103,8 @@ public class FrameReadWriteTest extends BriarTestCase {
IncomingAuthenticationLayer authenticationIn =
new IncomingAuthenticationLayerImpl(correctionIn, mac, macKey);
IncomingReliabilityLayer reliabilityIn =
new NullIncomingReliabilityLayer(authenticationIn);
new IncomingReliabilityLayerImpl(authenticationIn,
new NullFrameWindow());
ConnectionReader reader = new ConnectionReaderImpl(reliabilityIn,
false);
InputStream in1 = reader.getInputStream();

8
test/net/sf/briar/transport/IncomingSegmentedEncryptionLayerTest.java → test/net/sf/briar/transport/SegmentedIncomingEncryptionLayerTest.java
View File

@@ -22,12 +22,12 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class IncomingSegmentedEncryptionLayerTest extends BriarTestCase {
public class SegmentedIncomingEncryptionLayerTest extends BriarTestCase {
private final Cipher tagCipher, segCipher;
private final ErasableKey tagKey, segKey;
public IncomingSegmentedEncryptionLayerTest() {
public SegmentedIncomingEncryptionLayerTest() {
super();
Injector i = Guice.createInjector(new CryptoModule());
CryptoComponent crypto = i.getInstance(CryptoComponent.class);
@@ -65,7 +65,7 @@ public class IncomingSegmentedEncryptionLayerTest extends BriarTestCase {
SegmentSource in = new ByteArraySegmentSource(ciphertext1);
// Use the encryption layer to decrypt the ciphertext
IncomingEncryptionLayer decrypter =
new IncomingSegmentedEncryptionLayer(in, tagCipher, segCipher,
new SegmentedIncomingEncryptionLayer(in, tagCipher, segCipher,
tagKey, segKey, false, buffered);
// First segment
Segment s = new SegmentImpl();
@@ -116,7 +116,7 @@ public class IncomingSegmentedEncryptionLayerTest extends BriarTestCase {
SegmentSource in = new ByteArraySegmentSource(ciphertext1);
// Use the encryption layer to decrypt the ciphertext
IncomingEncryptionLayer decrypter =
new IncomingSegmentedEncryptionLayer(in, tagCipher, segCipher,
new SegmentedIncomingEncryptionLayer(in, tagCipher, segCipher,
tagKey, segKey, true, buffered);
// First segment
Segment s = new SegmentImpl();

8
test/net/sf/briar/transport/OutgoingSegmentedEncryptionLayerTest.java → test/net/sf/briar/transport/SegmentedOutgoingEncryptionLayerTest.java
View File

@@ -22,14 +22,14 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class OutgoingSegmentedEncryptionLayerTest extends BriarTestCase {
public class SegmentedOutgoingEncryptionLayerTest extends BriarTestCase {
private static final int MAC_LENGTH = 32;
private final Cipher tagCipher, segCipher;
private final ErasableKey tagKey, segKey;
public OutgoingSegmentedEncryptionLayerTest() {
public SegmentedOutgoingEncryptionLayerTest() {
super();
Injector i = Guice.createInjector(new CryptoModule());
CryptoComponent crypto = i.getInstance(CryptoComponent.class);
@@ -65,7 +65,7 @@ public class OutgoingSegmentedEncryptionLayerTest extends BriarTestCase {
// Use the encryption layer to encrypt the plaintext
ByteArraySegmentSink sink = new ByteArraySegmentSink();
OutgoingEncryptionLayer encrypter =
new OutgoingSegmentedEncryptionLayer(sink, Long.MAX_VALUE,
new SegmentedOutgoingEncryptionLayer(sink, Long.MAX_VALUE,
tagCipher, segCipher, tagKey, segKey, false);
Segment s = new SegmentImpl();
System.arraycopy(plaintext, 0, s.getBuffer(), 0, plaintext.length);
@@ -113,7 +113,7 @@ public class OutgoingSegmentedEncryptionLayerTest extends BriarTestCase {
// Use the encryption layer to encrypt the plaintext
SegmentSink sink = new ByteArraySegmentSink();
OutgoingEncryptionLayer encrypter =
new OutgoingSegmentedEncryptionLayer(sink, Long.MAX_VALUE,
new SegmentedOutgoingEncryptionLayer(sink, Long.MAX_VALUE,
tagCipher, segCipher, tagKey, segKey, true);
Segment s = new SegmentImpl();
System.arraycopy(plaintext, 0, s.getBuffer(), 0, plaintext.length);