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

ElG minor cleanup

Browse Source
This commit is contained in:
zzz
2018-11-13 17:51:52 +00:00
parent 2bfbcf1ae9
commit 9377b57c9e
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/src/net/i2p/crypto/ElGamalAESEngine.java
View File

@ -99,17 +99,18 @@ public final class ElGamalAESEngine {
SessionKey foundKey = new SessionKey(); SessionKey foundKey = new SessionKey();
SessionKey usedKey = new SessionKey(); SessionKey usedKey = new SessionKey();
Set<SessionTag> foundTags = new HashSet<SessionTag>(); Set<SessionTag> foundTags = new HashSet<SessionTag>();
byte decrypted[] = null; byte decrypted[];
boolean wasExisting = false; boolean wasExisting = false;
final boolean shouldDebug = _log.shouldDebug();
if (key != null) { if (key != null) {
//if (_log.shouldLog(Log.DEBUG)) _log.debug("Key is known for tag " + st); //if (_log.shouldLog(Log.DEBUG)) _log.debug("Key is known for tag " + st);
if (_log.shouldLog(Log.DEBUG)) if (shouldDebug)
_log.debug("Decrypting existing session encrypted with tag: " + st.toString() + ": key: " + key.toBase64() + ": " + data.length + " bytes " /* + Base64.encode(data, 0, 64) */ ); _log.debug("Decrypting existing session encrypted with tag: " + st.toString() + ": key: " + key.toBase64() + ": " + data.length + " bytes " /* + Base64.encode(data, 0, 64) */ );
decrypted = decryptExistingSession(data, key, targetPrivateKey, foundTags, usedKey, foundKey); decrypted = decryptExistingSession(data, key, targetPrivateKey, foundTags, usedKey, foundKey);
if (decrypted != null) { if (decrypted != null) {
_context.statManager().updateFrequency("crypto.elGamalAES.decryptExistingSession"); _context.statManager().updateFrequency("crypto.elGamalAES.decryptExistingSession");
if ( (!foundTags.isEmpty()) && (_log.shouldLog(Log.DEBUG)) ) if (!foundTags.isEmpty() && shouldDebug)
_log.debug("ElG/AES decrypt success with " + st + ": found tags: " + foundTags); _log.debug("ElG/AES decrypt success with " + st + ": found tags: " + foundTags);
wasExisting = true; wasExisting = true;
} else { } else {
@ -119,11 +120,11 @@ public final class ElGamalAESEngine {
} }
} }
} else { } else {
if (_log.shouldLog(Log.DEBUG)) _log.debug("Key is NOT known for tag " + st); if (shouldDebug) _log.debug("Key is NOT known for tag " + st);
decrypted = decryptNewSession(data, targetPrivateKey, foundTags, usedKey, foundKey); decrypted = decryptNewSession(data, targetPrivateKey, foundTags, usedKey, foundKey);
if (decrypted != null) { if (decrypted != null) {
_context.statManager().updateFrequency("crypto.elGamalAES.decryptNewSession"); _context.statManager().updateFrequency("crypto.elGamalAES.decryptNewSession");
if ( (!foundTags.isEmpty()) && (_log.shouldLog(Log.DEBUG)) ) if (!foundTags.isEmpty() && shouldDebug)
_log.debug("ElG decrypt success: found tags: " + foundTags); _log.debug("ElG decrypt success: found tags: " + foundTags);
} else { } else {
_context.statManager().updateFrequency("crypto.elGamalAES.decryptFailed"); _context.statManager().updateFrequency("crypto.elGamalAES.decryptFailed");
@ -132,17 +133,17 @@ public final class ElGamalAESEngine {
} }
} }
if ((key == null) && (decrypted == null)) { //if ((key == null) && (decrypted == null)) {
//_log.debug("Unable to decrypt the data starting with tag [" + st + "] - did the tag expire recently?", new Exception("Decrypt failure")); //_log.debug("Unable to decrypt the data starting with tag [" + st + "] - did the tag expire recently?", new Exception("Decrypt failure"));
} //}
if (!foundTags.isEmpty()) { if (!foundTags.isEmpty()) {
if (foundKey.getData() != null) { if (foundKey.getData() != null) {
if (_log.shouldLog(Log.DEBUG)) if (shouldDebug)
_log.debug("Found key: " + foundKey.toBase64() + " tags: " + foundTags + " wasExisting? " + wasExisting); _log.debug("Found key: " + foundKey.toBase64() + " tags: " + foundTags + " wasExisting? " + wasExisting);
keyManager.tagsReceived(foundKey, foundTags); keyManager.tagsReceived(foundKey, foundTags);
} else if (usedKey.getData() != null) { } else if (usedKey.getData() != null) {
if (_log.shouldLog(Log.DEBUG)) if (shouldDebug)
_log.debug("Used key: " + usedKey.toBase64() + " tags: " + foundTags + " wasExisting? " + wasExisting); _log.debug("Used key: " + usedKey.toBase64() + " tags: " + foundTags + " wasExisting? " + wasExisting);
keyManager.tagsReceived(usedKey, foundTags); keyManager.tagsReceived(usedKey, foundTags);
} }