From 99703d53ba0f462ca255e09c9f2f4cee26918d86 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Wed, 1 Feb 2023 08:47:58 -0500
Subject: [PATCH] Ratchet: Don't bundle LS with ratchet ACK
Not necessary, and will be the wrong LS for EdDSA subsession
---
.../src/net/i2p/router/crypto/ratchet/ACKTimer.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/router/java/src/net/i2p/router/crypto/ratchet/ACKTimer.java b/router/java/src/net/i2p/router/crypto/ratchet/ACKTimer.java
index 264cf61eb4..425092a73b 100644
--- a/router/java/src/net/i2p/router/crypto/ratchet/ACKTimer.java
+++ b/router/java/src/net/i2p/router/crypto/ratchet/ACKTimer.java
@@ -26,12 +26,16 @@ class ACKTimer extends SimpleTimer2.TimedEvent {
private final Destination _from, _to;
private static final long EXPIRATION = 60*1000;
+ // ClientMessageOptions.LS_MASK, don't send LS
+ // Never bundle our LS with a ratchet-layer ACK, because we don't need to,
+ // and because it will be the wrong LS for subsessions
+ private static final int LS_MASK = 0x0100;
/**
* Caller must schedule
*
- * @param from local destination ACK will come from
- * @param to remote destination ACK will go to
+ * @param from local destination ACK will come from, non-null
+ * @param to remote destination ACK will go to, non-null
*
*/
public ACKTimer(RouterContext context, Destination from, Destination to) {
@@ -51,8 +55,8 @@ class ACKTimer extends SimpleTimer2.TimedEvent {
long now = _context.clock().now();
long exp = now + EXPIRATION;
MessageId msgID = new MessageId();
- // null payload, no nonce, no flags
- ClientMessage cmsg = new ClientMessage(_to, null, config, _from, msgID, 0, exp, 0);
+ // null payload, no nonce
+ ClientMessage cmsg = new ClientMessage(_to, null, config, _from, msgID, 0, exp, LS_MASK);
_context.clientMessagePool().add(cmsg, true);
if (_log.shouldInfo())
_log.info("Sent ratchet ack from " + _from.toBase32() + " to " + _to.toBase32());
--
GitLab