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, bump -10

Browse Source
This commit is contained in:
zzz
2019-06-06 15:00:35 +00:00
parent e75881d6cc
commit e50bf00fa8
5 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -994,13 +994,17 @@ public class EncryptedLeaseSet extends LeaseSet2 {
pkf.createIfAbsent(SigType.EdDSA_SHA512_Ed25519);
System.out.println("Online test");
java.io.File f2 = new java.io.File("online-encls2.dat");
test(pkf, f2, false, BlindData.AUTH_NONE, null);
//test(pkf, f2, false, BlindData.AUTH_NONE, null);
List<KeyPair> keys = new java.util.ArrayList<KeyPair>(4);
for (int i = 0; i < 4; i++) {
keys.add(net.i2p.crypto.KeyGenerator.getInstance().generatePKIKeys(net.i2p.crypto.EncType.ECIES_X25519));
KeyPair kp = net.i2p.crypto.KeyGenerator.getInstance().generatePKIKeys(net.i2p.crypto.EncType.ECIES_X25519);
keys.add(kp);
System.out.println("Client key " + i + ":\n Private: " + kp.getPrivate() + "\n Public: " + kp.getPublic());
}
System.out.println("Online test with DH Keys");
test(pkf, f2, false, BlindData.AUTH_DH, keys);
//f2 = new java.io.File("online-encls2-dh.dat");
//System.out.println("Online test with DH Keys");
//test(pkf, f2, false, BlindData.AUTH_DH, keys);
f2 = new java.io.File("online-encls2-psk.dat");
System.out.println("Online test with PSK Keys");
test(pkf, f2, false, BlindData.AUTH_PSK, keys);
//System.out.println("Offline test");
@ -1033,7 +1037,7 @@ public class EncryptedLeaseSet extends LeaseSet2 {
net.i2p.crypto.KeyPair encKeys2 = net.i2p.crypto.KeyGenerator.getInstance().generatePKIKeys(net.i2p.crypto.EncType.ECIES_X25519);
pubKey = encKeys2.getPublic();
ls2.addEncryptionKey(pubKey);
ls2.setSecret("foobar");
//ls2.setSecret("foobar");
SigningPrivateKey spk = pkf.getSigningPrivKey();
if (offline) {
now += 365*24*60*60*1000L;

7
core/java/src/net/i2p/data/PrivateKey.java
View File

@ -121,11 +121,14 @@ public class PrivateKey extends SimpleDataStructure implements Destroyable {
public String toString() {
StringBuilder buf = new StringBuilder(64);
buf.append("[PrivateKey ").append(_type).append(' ');
int length = length();
if (_data == null) {
buf.append("null");
} else {
buf.append("size: ").append(length);
int length = length();
if (length <= 32)
buf.append(toBase64());
else
buf.append("size: ").append(length);
}
buf.append(']');
return buf.toString();

6
core/java/src/net/i2p/data/PublicKey.java
View File

@ -151,7 +151,11 @@ public class PublicKey extends SimpleDataStructure {
if (_data == null) {
buf.append("null");
} else {
buf.append("size: ").append(length());
int length = length();
if (length <= 32)
buf.append(toBase64());
else
buf.append("size: ").append(length);
}
buf.append(']');
return buf.toString();