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

I2CP: Change format and message type of CreateLeaseSet2 message

Browse Source 
to match spec changes
This commit is contained in:
zzz
2019-02-04 21:58:27 +00:00
parent ead49256c7
commit a756c12432
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/src/net/i2p/data/i2cp/CreateLeaseSet2Message.java
View File

@ -12,6 +12,7 @@ import net.i2p.crypto.EncType;
import net.i2p.crypto.SigType;
import net.i2p.data.DatabaseEntry;
import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper;
import net.i2p.data.EncryptedLeaseSet;
import net.i2p.data.LeaseSet;
import net.i2p.data.LeaseSet2;
@ -40,7 +41,11 @@ import net.i2p.data.PublicKey;
* @since 0.9.38
*/
public class CreateLeaseSet2Message extends CreateLeaseSetMessage {
public final static int MESSAGE_TYPE = 40;
/**
* NOTE: Preliminary format was type 40 in 0.9.38.
* Format changed as of 0.9.39, changed type to 41.
*/
public final static int MESSAGE_TYPE = 41;
// only used if more than one key, otherwise null
private List<PrivateKey> _privateKeys;
@ -118,6 +123,10 @@ public class CreateLeaseSet2Message extends CreateLeaseSetMessage {
EncType etype = pk.getType();
if (etype == null)
throw new I2CPMessageException("Unsupported encryption type");
int encType = (int) DataHelper.readLong(in, 2);
int encLen = (int) DataHelper.readLong(in, 2);
if (encType != etype.getCode() || encLen != etype.getPrivkeyLen())
throw new I2CPMessageException("Enc type mismatch");
PrivateKey priv = new PrivateKey(etype);
priv.readBytes(in);
addPrivateKey(priv);
@ -156,6 +165,9 @@ public class CreateLeaseSet2Message extends CreateLeaseSetMessage {
_leaseSet.writeBytes(os);
if (type != DatabaseEntry.KEY_TYPE_META_LS2) {
for (PrivateKey pk : getPrivateKeys()) {
EncType etype = pk.getType();
DataHelper.writeLong(os, 2, etype.getCode());
DataHelper.writeLong(os, 2, pk.length());
pk.writeBytes(os);
}
}