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

Renamed "encrypted IVs" as "tags" (actual crypto changes to follow).

Browse Source
This commit is contained in:
akwizgran
2011-12-02 12:02:55 +00:00
parent f7360cddde
commit f3fdd85996
26 changed files with 225 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/net/sf/briar/transport/ConnectionDispatcherImpl.java
View File

@@ -41,20 +41,20 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher {
}
public void dispatchReader(TransportId t, final BatchTransportReader r) {
// Read the encrypted IV
final byte[] encryptedIv;
// Read the tag
final byte[] tag;
try {
encryptedIv = readIv(r.getInputStream());
tag = readTag(r.getInputStream());
} catch(IOException e) {
if(LOG.isLoggable(Level.WARNING)) LOG.warning(e.getMessage());
r.dispose(false);
return;
}
// Get the connection context asynchronously
recogniser.acceptConnection(t, encryptedIv, new Callback() {
recogniser.acceptConnection(t, tag, new Callback() {
public void connectionAccepted(ConnectionContext ctx) {
batchConnFactory.createIncomingConnection(ctx, r, encryptedIv);
batchConnFactory.createIncomingConnection(ctx, r, tag);
}
public void connectionRejected() {
@@ -68,8 +68,8 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher {
});
}
private byte[] readIv(InputStream in) throws IOException {
byte[] b = new byte[TransportConstants.IV_LENGTH];
private byte[] readTag(InputStream in) throws IOException {
byte[] b = new byte[TransportConstants.TAG_LENGTH];
int offset = 0;
while(offset < b.length) {
int read = in.read(b, offset, b.length - offset);
@@ -86,20 +86,20 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher {
public void dispatchIncomingConnection(TransportId t,
final StreamTransportConnection s) {
// Read the encrypted IV
final byte[] encryptedIv;
// Read the tag
final byte[] tag;
try {
encryptedIv = readIv(s.getInputStream());
tag = readTag(s.getInputStream());
} catch(IOException e) {
if(LOG.isLoggable(Level.WARNING)) LOG.warning(e.getMessage());
s.dispose(false);
return;
}
// Get the connection context asynchronously
recogniser.acceptConnection(t, encryptedIv, new Callback() {
recogniser.acceptConnection(t, tag, new Callback() {
public void connectionAccepted(ConnectionContext ctx) {
streamConnFactory.createIncomingConnection(ctx, s, encryptedIv);
streamConnFactory.createIncomingConnection(ctx, s, tag);
}
public void connectionRejected() {