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

Ratchet: GMB method to encrypt to a single key/tag for prop. 154

Browse Source
This commit is contained in:
zzz
2020-03-30 16:53:14 +00:00
parent 86fc6478f5
commit 22ca4d0e44
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
View File

@ -32,6 +32,7 @@ import net.i2p.router.LeaseSetKeys;
import net.i2p.router.RouterContext;
import net.i2p.router.crypto.ratchet.MuxedSKM;
import net.i2p.router.crypto.ratchet.RatchetSKM;
import net.i2p.router.crypto.ratchet.RatchetSessionTag;
import net.i2p.router.crypto.ratchet.ReplyCallback;
import net.i2p.util.Log;
@ -196,7 +197,7 @@ public class GarlicMessageBuilder {
/**
* ELGAMAL_2048 only.
* Used by TestJob, and directly above,
* and by MessageWrapper for encrypting DatabaseLookupMessages
* and by MessageWrapper for encrypting DatabaseLookupMessages and DSM/DSRM replies.
*
* @param ctx scope
* @param config how/what to wrap
@ -245,6 +246,29 @@ public class GarlicMessageBuilder {
return msg;
}
/**
* Ratchet only.
* Used by TestJob,
* and by MessageWrapper for encrypting DatabaseLookupMessages and DSM/DSRM replies.
*
* @param ctx scope
* @param config how/what to wrap
* @param encryptKey sessionKey used to encrypt the current message, non-null
* @param encryptTag sessionTag used to encrypt the current message, non-null
* @since 0.9.46
*/
public static GarlicMessage buildMessage(RouterContext ctx, GarlicConfig config,
SessionKey encryptKey, RatchetSessionTag encryptTag) {
GarlicMessage msg = new GarlicMessage(ctx);
CloveSet cloveSet = buildECIESCloveSet(ctx, config);
byte encData[] = ctx.eciesEngine().encrypt(cloveSet, encryptKey, encryptTag);
if (encData == null)
return null;
msg.setData(encData);
msg.setMessageExpiration(config.getExpiration());
return msg;
}
/**
* ECIES_X25519 only.
* Called by OCMJH only.