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

encrypted ls2 test tweaks

Browse Source
This commit is contained in:
zzz
2019-06-25 13:26:30 +00:00
parent 85a2c9026a
commit cf1c1bb3f7
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/src/net/i2p/data/EncryptedLeaseSet.java
View File

@ -67,7 +67,6 @@ public class EncryptedLeaseSet extends LeaseSet2 {
/** /**
* @return leaseset or null if not decrypted. * @return leaseset or null if not decrypted.
* Also returns null if we created and encrypted it.
* @since 0.9.39 * @since 0.9.39
*/ */
public LeaseSet2 getDecryptedLeaseSet() { public LeaseSet2 getDecryptedLeaseSet() {
@ -532,11 +531,14 @@ public class EncryptedLeaseSet extends LeaseSet2 {
off += ID_LEN; off += ID_LEN;
ChaCha20.encrypt(clientKey, clientIVandID, authcookie, 0, ciphertext, off, authcookie.length); ChaCha20.encrypt(clientKey, clientIVandID, authcookie, 0, ciphertext, off, authcookie.length);
if (_log.shouldDebug()) { if (_log.shouldDebug()) {
_log.debug("Added client ID/enc.cookie:\n" + _log.debug("Added client key:\n" +
net.i2p.util.HexDump.dump(clientKey) +
"client IV:\n:" +
net.i2p.util.HexDump.dump(clientIVandID, 0, IV_LEN) +
"client ID:\n:" +
net.i2p.util.HexDump.dump(clientIVandID, IV_LEN, ID_LEN) + net.i2p.util.HexDump.dump(clientIVandID, IV_LEN, ID_LEN) +
net.i2p.util.HexDump.dump(ciphertext, off, COOKIE_LEN) + "client cookie:\n:" +
"for client key:\n" + net.i2p.util.HexDump.dump(ciphertext, off, COOKIE_LEN));
net.i2p.util.HexDump.dump(clientKey));
} }
off += COOKIE_LEN; off += COOKIE_LEN;
} }
@ -640,7 +642,7 @@ public class EncryptedLeaseSet extends LeaseSet2 {
throw new DataFormatException("No client entries"); throw new DataFormatException("No client entries");
authLen = 1 + SALT_LEN + 2 + (count * CLIENT_LEN); authLen = 1 + SALT_LEN + 2 + (count * CLIENT_LEN);
if (_log.shouldDebug()) { if (_log.shouldDebug()) {
_log.debug("Found " + count + " client entries, seed is:\n" + _log.debug("Found " + count + " client entries, authsalt is:\n" +
net.i2p.util.HexDump.dump(seed)); net.i2p.util.HexDump.dump(seed));
} }
byte[] clientKey = new byte[32]; byte[] clientKey = new byte[32];
@ -1001,12 +1003,12 @@ public class EncryptedLeaseSet extends LeaseSet2 {
keys.add(kp); keys.add(kp);
System.out.println("Client key " + i + ":\n Private: " + kp.getPrivate() + "\n Public: " + kp.getPublic()); System.out.println("Client key " + i + ":\n Private: " + kp.getPrivate() + "\n Public: " + kp.getPublic());
} }
//f2 = new java.io.File("online-encls2-dh.dat"); f2 = new java.io.File("online-encls2-dh.dat");
//System.out.println("Online test with DH Keys"); System.out.println("Online test with DH Keys");
//test(pkf, f2, false, BlindData.AUTH_DH, keys); test(pkf, f2, false, BlindData.AUTH_DH, keys);
f2 = new java.io.File("online-encls2-psk.dat"); //f2 = new java.io.File("online-encls2-psk.dat");
System.out.println("Online test with PSK Keys"); //System.out.println("Online test with PSK Keys");
test(pkf, f2, false, BlindData.AUTH_PSK, keys); //test(pkf, f2, false, BlindData.AUTH_PSK, keys);
//System.out.println("Offline test"); //System.out.println("Offline test");
//f2 = new java.io.File("offline-encls2.dat"); //f2 = new java.io.File("offline-encls2.dat");
//test(pkf, f2, true); //test(pkf, f2, true);