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

Erase connection windows if the JVM shuts down cleanly.

Browse Source
This commit is contained in:
akwizgran
2011-11-16 18:41:40 +00:00
parent 031aa53dc7
commit a144884ecd
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/net/sf/briar/transport/ConnectionRecogniserImpl.java
View File

@@ -34,6 +34,7 @@ import net.sf.briar.api.protocol.TransportIndex;
import net.sf.briar.api.transport.ConnectionContext; import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRecogniser; import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.ConnectionWindow; import net.sf.briar.api.transport.ConnectionWindow;
import net.sf.briar.util.ByteUtils;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -72,6 +73,12 @@ DatabaseListener {
// The contact was removed - clean up in eventOccurred() // The contact was removed - clean up in eventOccurred()
} }
} }
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
eraseSecrets();
}
});
initialised = true; initialised = true;
} }
@@ -88,12 +95,12 @@ DatabaseListener {
private synchronized void calculateIvs(ContactId c, TransportIndex i, private synchronized void calculateIvs(ContactId c, TransportIndex i,
ConnectionWindow w) throws DbException { ConnectionWindow w) throws DbException {
for(Entry<Long, byte[]> e : w.getUnseen().entrySet()) { for(Entry<Long, byte[]> e : w.getUnseen().entrySet()) {
long unseen = e.getKey(); long connection = e.getKey();
byte[] secret = e.getValue(); byte[] secret = e.getValue();
ErasableKey ivKey = crypto.deriveIvKey(secret, true); ErasableKey ivKey = crypto.deriveIvKey(secret, true);
Bytes iv = new Bytes(encryptIv(i, unseen, ivKey)); Bytes iv = new Bytes(encryptIv(i, connection, ivKey));
ivKey.erase(); ivKey.erase();
expected.put(iv, new Context(c, i, unseen, w)); expected.put(iv, new Context(c, i, connection, w));
} }
} }
@@ -112,6 +119,12 @@ DatabaseListener {
} }
} }
private synchronized void eraseSecrets() {
for(Context c : expected.values()) {
for(byte[] b : c.window.getUnseen().values()) ByteUtils.erase(b);
}
}
public synchronized ConnectionContext acceptConnection(byte[] encryptedIv) public synchronized ConnectionContext acceptConnection(byte[] encryptedIv)
throws DbException { throws DbException {
if(encryptedIv.length != IV_LENGTH) if(encryptedIv.length != IV_LENGTH)