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

Ratchet: Reduce tagset expiration

Browse Source 
other minor cleanups
This commit is contained in:
zzz
2020-04-27 19:52:39 +00:00
parent 5173d24c72
commit 10be87bb59
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
router/java/src/net/i2p/router/crypto/ratchet/ECIESAEADEngine.java
View File

@ -1115,9 +1115,7 @@ public final class ECIESAEADEngine {
blocks.add(block); blocks.add(block);
len += block.getTotalLength(); len += block.getTotalLength();
} }
int padlen = 1 + _context.random().nextInt(MAXPAD); int padlen = _context.random().nextInt(MAXPAD);
// random data
//Block block = new PaddingBlock(_context, padlen);
// zeros // zeros
Block block = new PaddingBlock(padlen); Block block = new PaddingBlock(padlen);
blocks.add(block); blocks.add(block);

1
router/java/src/net/i2p/router/crypto/ratchet/RatchetPayload.java
View File

@ -282,6 +282,7 @@ class RatchetPayload {
} }
/** with random data */ /** with random data */
@Deprecated
public PaddingBlock(I2PAppContext context, int size) { public PaddingBlock(I2PAppContext context, int size) {
super(BLOCK_PADDING); super(BLOCK_PADDING);
sz = size; sz = size;

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

@ -57,7 +57,7 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
* Let outbound session tags sit around for this long before expiring them. * Let outbound session tags sit around for this long before expiring them.
* Inbound tag expiration is set by SESSION_LIFETIME_MAX_MS * Inbound tag expiration is set by SESSION_LIFETIME_MAX_MS
*/ */
final static long SESSION_TAG_DURATION_MS = 12 * 60 * 1000; final static long SESSION_TAG_DURATION_MS = 8 * 60 * 1000;
/** /**
* Keep unused inbound session tags around for this long (a few minutes longer than * Keep unused inbound session tags around for this long (a few minutes longer than
@ -66,19 +66,13 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
* *
* This is also the max idle time for an outbound session. * This is also the max idle time for an outbound session.
*/ */
final static long SESSION_LIFETIME_MAX_MS = SESSION_TAG_DURATION_MS + 3 * 60 * 1000; final static long SESSION_LIFETIME_MAX_MS = SESSION_TAG_DURATION_MS + 2 * 60 * 1000;
final static long SESSION_PENDING_DURATION_MS = 3 * 60 * 1000; final static long SESSION_PENDING_DURATION_MS = 3 * 60 * 1000;
// replace an old session created before this if we get a new NS // replace an old session created before this if we get a new NS
private static final long SESSION_REPLACE_AGE = 3*60*1000; private static final long SESSION_REPLACE_AGE = 3*60*1000;
private static final int MIN_RCV_WINDOW_NSR = 12;
private static final int MAX_RCV_WINDOW_NSR = 12;
private static final int MIN_RCV_WINDOW_ES = 24;
private static final int MAX_RCV_WINDOW_ES = 160;
private static final byte[] ZEROLEN = new byte[0]; private static final byte[] ZEROLEN = new byte[0];
private static final String INFO_0 = "SessionReplyTags";
/** /**
@ -909,6 +903,12 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
private NextSessionKey _hisOBKeyWithData; private NextSessionKey _hisOBKeyWithData;
private SessionKey _nextIBRootKey; private SessionKey _nextIBRootKey;
private static final int MIN_RCV_WINDOW_NSR = 12;
private static final int MAX_RCV_WINDOW_NSR = 12;
private static final int MIN_RCV_WINDOW_ES = 24;
private static final int MAX_RCV_WINDOW_ES = 160;
private static final String INFO_0 = "SessionReplyTags";
private static final String INFO_7 = "XDHRatchetTagSet"; private static final String INFO_7 = "XDHRatchetTagSet";
private static final int MAX_SEND_ACKS = 16; private static final int MAX_SEND_ACKS = 16;
private static final int MAX_SEND_REVERSE_KEY = 64; private static final int MAX_SEND_REVERSE_KEY = 64;
@ -1126,8 +1126,8 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
_context.clock().now(), newtsID, _myOBKeyID); _context.clock().now(), newtsID, _myOBKeyID);
_tagSet = ts; _tagSet = ts;
_currentOBTagSetID = newtsID; _currentOBTagSetID = newtsID;
if (_log.shouldWarn()) if (_log.shouldDebug())
_log.warn("Got nextkey " + key + " ratchet to new OB ES TS:\n" + ts); _log.debug("Got nextkey " + key + "\nratchet to new OB ES TS:\n" + ts);
} else { } else {
// this is about my inbound tag set // this is about my inbound tag set
if (key.equals(_hisOBKey)) { if (key.equals(_hisOBKey)) {
@ -1221,8 +1221,8 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
_context.clock().now(), newtsID, _myIBKeyID, _context.clock().now(), newtsID, _myIBKeyID,
MAX_RCV_WINDOW_ES, MAX_RCV_WINDOW_ES); MAX_RCV_WINDOW_ES, MAX_RCV_WINDOW_ES);
_nextIBRootKey = ts.getNextRootKey(); _nextIBRootKey = ts.getNextRootKey();
if (_log.shouldWarn()) if (_log.shouldDebug())
_log.warn("Got nextkey " + key + " ratchet to new IB ES TS:\n" + ts); _log.debug("Got nextkey " + key + "\nratchet to new IB ES TS:\n" + ts);
} }
} }
} }