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

Ratchet: Destroy HandshakeState after fatal NS/NSR errors

Browse Source
This commit is contained in:
zzz
2020-11-10 15:22:46 +00:00
parent 7aa78a1aed
commit 29dc311c6a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -513,6 +513,7 @@ public final class ECIESAEADEngine {
if (_log.shouldDebug())
_log.debug("Elg2 decode fail NSR");
data[TAGLEN + KEYLEN - 1] = yy31;
state.destroy();
return null;
}
if (_log.shouldDebug())
@@ -534,6 +535,7 @@ public final class ECIESAEADEngine {
// unlikely since we already matched the tag
System.arraycopy(yy, 0, data, TAGLEN, KEYLEN - 1);
data[TAGLEN + KEYLEN - 1] = yy31;
state.destroy();
return null;
}
if (_log.shouldDebug())
@@ -559,6 +561,7 @@ public final class ECIESAEADEngine {
if (_log.shouldDebug())
_log.debug("State at failure: " + state);
}
state.destroy();
return NO_CLOVES;
}
@@ -575,8 +578,10 @@ public final class ECIESAEADEngine {
if (_log.shouldDebug())
_log.debug("Processed " + blocks + " blocks in IB NSR");
} catch (DataFormatException e) {
state.destroy();
throw e;
} catch (Exception e) {
state.destroy();
throw new DataFormatException("NSR payload error", e);
}
}
@@ -589,6 +594,7 @@ public final class ECIESAEADEngine {
// TODO
if (_log.shouldWarn())
_log.warn("NSR reply to zero static key NS");
state.destroy();
return NO_CLOVES;
}