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

Erase temporary secrets after deriving keys.

Browse Source
This commit is contained in:
akwizgran
2014-11-06 08:39:07 +00:00
parent 1f4d801162
commit b27a17db88
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
briar-core/src/org/briarproject/plugins/ConnectionManagerImpl.java
View File

@@ -6,7 +6,6 @@ import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -30,6 +29,7 @@ import org.briarproject.api.transport.StreamReaderFactory;
import org.briarproject.api.transport.StreamWriter; import org.briarproject.api.transport.StreamWriter;
import org.briarproject.api.transport.StreamWriterFactory; import org.briarproject.api.transport.StreamWriterFactory;
import org.briarproject.api.transport.TagRecogniser; import org.briarproject.api.transport.TagRecogniser;
import org.briarproject.util.ByteUtils;
class ConnectionManagerImpl implements ConnectionManager { class ConnectionManagerImpl implements ConnectionManager {
@@ -96,21 +96,28 @@ class ConnectionManagerImpl implements ConnectionManager {
private MessagingSession createIncomingSession(StreamContext ctx, private MessagingSession createIncomingSession(StreamContext ctx,
TransportConnectionReader r) throws IOException { TransportConnectionReader r) throws IOException {
InputStream in = r.getInputStream(); try {
StreamReader streamReader = streamReaderFactory.createStreamReader(in, StreamReader streamReader = streamReaderFactory.createStreamReader(
r.getMaxFrameLength(), ctx); r.getInputStream(), r.getMaxFrameLength(), ctx);
return messagingSessionFactory.createIncomingSession(ctx.getContactId(), return messagingSessionFactory.createIncomingSession(
ctx.getTransportId(), streamReader.getInputStream()); ctx.getContactId(), ctx.getTransportId(),
streamReader.getInputStream());
} finally {
ByteUtils.erase(ctx.getSecret());
}
} }
private MessagingSession createOutgoingSession(StreamContext ctx, private MessagingSession createOutgoingSession(StreamContext ctx,
TransportConnectionWriter w, boolean duplex) throws IOException { TransportConnectionWriter w, boolean duplex) throws IOException {
OutputStream out = w.getOutputStream(); try {
StreamWriter streamWriter = streamWriterFactory.createStreamWriter(out, StreamWriter streamWriter = streamWriterFactory.createStreamWriter(
w.getMaxFrameLength(), ctx); w.getOutputStream(), w.getMaxFrameLength(), ctx);
return messagingSessionFactory.createOutgoingSession(ctx.getContactId(), return messagingSessionFactory.createOutgoingSession(
ctx.getTransportId(), w.getMaxLatency(), ctx.getContactId(), ctx.getTransportId(), w.getMaxLatency(),
duplex, streamWriter.getOutputStream()); duplex, streamWriter.getOutputStream());
} finally {
ByteUtils.erase(ctx.getSecret());
}
} }
private class DispatchIncomingSimplexConnection implements Runnable { private class DispatchIncomingSimplexConnection implements Runnable {