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

Check for duplicate keys when updating maps.

Browse Source
This commit is contained in:
akwizgran
2012-10-24 23:39:12 +01:00
parent 1b8478df84
commit e78b94b815
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/net/sf/briar/transport/KeyManagerImpl.java
View File

@@ -89,7 +89,6 @@ class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
} }
// Assigns secrets to the appropriate maps and returns any dead secrets // Assigns secrets to the appropriate maps and returns any dead secrets
// FIXME: Check there are no duplicate keys when updating maps
private Collection<TemporarySecret> assignSecretsToMaps(long now, private Collection<TemporarySecret> assignSecretsToMaps(long now,
Collection<TemporarySecret> secrets) { Collection<TemporarySecret> secrets) {
Collection<TemporarySecret> dead = new ArrayList<TemporarySecret>(); Collection<TemporarySecret> dead = new ArrayList<TemporarySecret>();
@@ -101,18 +100,25 @@ class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
long successorCreationTime = creationTime + rotationPeriod; long successorCreationTime = creationTime + rotationPeriod;
long deactivationTime = activationTime + rotationPeriod; long deactivationTime = activationTime + rotationPeriod;
long destructionTime = successorCreationTime + rotationPeriod; long destructionTime = successorCreationTime + rotationPeriod;
TemporarySecret dupe; // There should not be any duplicate keys
if(now >= destructionTime) { if(now >= destructionTime) {
dead.add(s); dead.add(s);
} else if(now >= deactivationTime) { } else if(now >= deactivationTime) {
incomingOld.put(k, s); dupe = incomingOld.put(k, s);
if(dupe != null) throw new IllegalStateException();
} else if(now >= successorCreationTime) { } else if(now >= successorCreationTime) {
incomingOld.put(k, s); dupe = incomingOld.put(k, s);
outgoing.put(k, s); if(dupe != null) throw new IllegalStateException();
dupe = outgoing.put(k, s);
if(dupe != null) throw new IllegalStateException();
} else if(now >= activationTime) { } else if(now >= activationTime) {
incomingNew.put(k, s); dupe = incomingNew.put(k, s);
outgoing.put(k, s); if(dupe != null) throw new IllegalStateException();
dupe = outgoing.put(k, s);
if(dupe != null) throw new IllegalStateException();
} else if(now >= creationTime) { } else if(now >= creationTime) {
incomingNew.put(k, s); dupe = incomingNew.put(k, s);
if(dupe != null) throw new IllegalStateException();
} else { } else {
// FIXME: What should we do if the clock moves backwards? // FIXME: What should we do if the clock moves backwards?
throw new IllegalStateException(); throw new IllegalStateException();