echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ratchet: Simplify lookup of OB session from IB NSR

Browse Source
This commit is contained in:
zzz
2019-11-05 17:15:37 +00:00
parent 160bcd7da8
commit 01d6cea017
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
router/java/src/net/i2p/router/crypto/ratchet/RatchetSKM.java
View File

@ -244,28 +244,26 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
} }
boolean found = false; boolean found = false;
for (OutboundSession sess : pending) { for (OutboundSession sess : pending) {
for (RatchetTagSet ts : sess.getTagSets()) { if (oldState.equals(sess.getHandshakeState())) {
if (ts.getHandshakeState().equals(oldState)) { if (!found) {
if (!found) { found = true;
found = true; sess.updateSession(state);
sess.updateSession(state); boolean ok = addSession(sess);
boolean ok = addSession(sess); if (_log.shouldDebug()) {
if (_log.shouldDebug()) { if (ok)
if (ok) _log.debug("Update Alice session from NSR to ES for " + target);
_log.debug("Update Alice session from NSR to ES for " + target); else
else _log.debug("Session already updated from NSR to ES for " + target);
_log.debug("Session already updated from NSR to ES for " + target);
}
} else {
if (_log.shouldDebug())
_log.debug("Dup tagset " + ts + " for " + target);
} }
} else { } else {
// TODO
// remove old tags
if (_log.shouldDebug()) if (_log.shouldDebug())
_log.debug("Remove tagset " + ts + " for " + target); _log.debug("Other pending session " + sess + " for " + target);
} }
} else {
// TODO
// remove old tags
if (_log.shouldDebug())
_log.debug("Other pending session " + sess + " for " + target);
} }
} }
if (found) { if (found) {
@ -786,6 +784,7 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
*/ */
private class OutboundSession { private class OutboundSession {
private final PublicKey _target; private final PublicKey _target;
private final HandshakeState _state;
private SessionKey _currentKey; private SessionKey _currentKey;
private final long _established; private final long _established;
private long _lastUsed; private long _lastUsed;
@ -839,6 +838,7 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
rk, tk, rk, tk,
_established, _sentTagSetID.getAndIncrement()); _established, _sentTagSetID.getAndIncrement());
_tagSets.add(tagset); _tagSets.add(tagset);
_state = null;
if (_log.shouldDebug()) if (_log.shouldDebug())
_log.debug("New OB Session, rk = " + rk + " tk = " + tk + " 1st tagset: " + tagset); _log.debug("New OB Session, rk = " + rk + " tk = " + tk + " 1st tagset: " + tagset);
} else { } else {
@ -847,9 +847,8 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
RatchetTagSet tagset = new RatchetTagSet(_hkdf, RatchetSKM.this, state, RatchetTagSet tagset = new RatchetTagSet(_hkdf, RatchetSKM.this, state,
rk, tk, rk, tk,
_established, _rcvTagSetID.getAndIncrement(), 5, 5); _established, _rcvTagSetID.getAndIncrement(), 5, 5);
// store the IB tagset as OB so we can lookup the state - // store the state so we can find the right session when we receive the NSR
// TODO just store the state _state = state;
_unackedTagSets.add(tagset);
if (_log.shouldDebug()) if (_log.shouldDebug())
_log.debug("New IB Session, rk = " + rk + " tk = " + tk + " 1st tagset: " + tagset); _log.debug("New IB Session, rk = " + rk + " tk = " + tk + " 1st tagset: " + tagset);
} }
@ -986,6 +985,13 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
return _target; return _target;
} }
/**
* Original outbound state, null for inbound.
*/
public HandshakeState getHandshakeState() {
return _state;
}
public SessionKey getCurrentKey() { public SessionKey getCurrentKey() {
return _currentKey; return _currentKey;
} }