From cdf778514c90391ea0c6481a449cfde1f7eb5492 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Fri, 10 Jun 2022 07:35:53 -0400
Subject: [PATCH] SSU2: Don't attempt SSU1 fallback validation on a SSU2 peer
This should actually fix the HMAC NPE
---
router/java/src/net/i2p/router/transport/udp/PacketHandler.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
index 5bf7f266dd..64d5e9ff20 100644
--- a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
+++ b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
@@ -377,6 +377,8 @@ class PacketHandler {
PeerState state = null;
int newPort = remoteHost.getPort();
for (PeerState ps : peers) {
+ if (ps.getVersion() > 1)
+ continue;
boolean valid = false;
if (_log.shouldLog(Log.WARN)) {
long now = _context.clock().now();
--
GitLab