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

log tweaks

Browse Source
This commit is contained in:
zzz
2019-09-07 13:34:56 +00:00
parent bb88555a63
commit c5f126c196
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,8 +26,6 @@ import net.i2p.util.Log;
* *
* PRELIMINARY - Subject to change - see proposal 123 * PRELIMINARY - Subject to change - see proposal 123
* *
* Per-client auth TODO
*
* @since 0.9.38 * @since 0.9.38
*/ */
public class EncryptedLeaseSet extends LeaseSet2 { public class EncryptedLeaseSet extends LeaseSet2 {
@ -499,7 +497,7 @@ 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("DH: Added client ID/enc.cookie:\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) + net.i2p.util.HexDump.dump(ciphertext, off, COOKIE_LEN) +
"for client key:\n" + "for client key:\n" +
@ -519,7 +517,7 @@ public class EncryptedLeaseSet extends LeaseSet2 {
byte[] clientIVandID = new byte[32]; byte[] clientIVandID = new byte[32];
for (SimpleDataStructure sds : clientKeys) { for (SimpleDataStructure sds : clientKeys) {
if (!(sds instanceof PrivateKey)) if (!(sds instanceof PrivateKey))
throw new IllegalArgumentException("Bad DH client key type: " + sds); throw new IllegalArgumentException("Bad PSK client key type: " + sds);
PrivateKey csk = (PrivateKey) sds; PrivateKey csk = (PrivateKey) sds;
if (csk.getType() != EncType.ECIES_X25519) if (csk.getType() != EncType.ECIES_X25519)
throw new IllegalArgumentException("Bad PSK client key type: " + csk); throw new IllegalArgumentException("Bad PSK client key type: " + csk);
@ -532,7 +530,7 @@ 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 key:\n" + _log.debug("PSK: Added client key:\n" +
net.i2p.util.HexDump.dump(clientKey) + net.i2p.util.HexDump.dump(clientKey) +
"client IV:\n:" + "client IV:\n:" +
net.i2p.util.HexDump.dump(clientIVandID, 0, IV_LEN) + net.i2p.util.HexDump.dump(clientIVandID, 0, IV_LEN) +
@ -643,7 +641,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, authsalt is:\n" + _log.debug("Auth type " + authType + ", 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];