From ad3b999732ce9d70492d1980295eca300eb3ba65 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Mon, 31 Mar 2025 10:29:16 -0400
Subject: [PATCH] send path challenge of 8 bytes. add Ack block

---
 libi2pd/SSU2Session.cpp | 21 ++++++++++-----------
 libi2pd/SSU2Session.h   |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/libi2pd/SSU2Session.cpp b/libi2pd/SSU2Session.cpp
index a4a9fa03..94a27877 100644
--- a/libi2pd/SSU2Session.cpp
+++ b/libi2pd/SSU2Session.cpp
@@ -1660,9 +1660,7 @@ namespace transport
 					LogPrint (eLogDebug, "SSU2: Path response");
 					if (m_PathChallenge)
 					{
-						i2p::data::Tag<32> hash;
-						SHA256 (buf + offset, size, hash);
-						if (hash == m_PathChallenge->first)
+						if (buf64toh (buf + offset) == m_PathChallenge->first)
 						{
 							m_RemoteEndpoint = m_PathChallenge->second;
 							m_PathChallenge.reset (nullptr);
@@ -3091,14 +3089,15 @@ namespace transport
 		payloadSize += CreateAddressBlock (payload + payloadSize, m_MaxPayloadSize  - payloadSize, to);
 		// path challenge block
 		payload[payloadSize] = eSSU2BlkPathChallenge;
-		size_t len = m_Server.GetRng ()() % (m_MaxPayloadSize - payloadSize - 3 - 8) + 8; // 8 bytes min
-		htobe16buf (payload + payloadSize + 1, len);
-		payloadSize += 3;
-		m_PathChallenge = std::make_unique<std::pair<i2p::data::Tag<32>, boost::asio::ip::udp::endpoint> >();
-		RAND_bytes (payload + payloadSize, len);
-			SHA256 (payload + payloadSize, len, m_PathChallenge->first);
-			m_PathChallenge->second = to;
-		payloadSize += len;
+		uint64_t challenge;
+		RAND_bytes ((uint8_t *)&challenge, 8);		
+		htobe16buf (payload + payloadSize + 1, 8); // always 8 bytes
+		htobuf64 (payload + payloadSize + 3, challenge);
+		payloadSize += 11;
+		m_PathChallenge = std::make_unique<std::pair<uint64_t, boost::asio::ip::udp::endpoint> >(challenge, to);	
+		// ack block
+		if (payloadSize < m_MaxPayloadSize)
+			payloadSize += CreateAckBlock (payload + payloadSize, m_MaxPayloadSize - payloadSize);
 		// padding block
 		if (payloadSize < m_MaxPayloadSize)
 			payloadSize += CreatePaddingBlock (payload + payloadSize, m_MaxPayloadSize - payloadSize);
diff --git a/libi2pd/SSU2Session.h b/libi2pd/SSU2Session.h
index 7edc01a5..ee26255f 100644
--- a/libi2pd/SSU2Session.h
+++ b/libi2pd/SSU2Session.h
@@ -394,7 +394,7 @@ namespace transport
 			boost::asio::deadline_timer m_ConnectTimer;
 			SSU2TerminationReason m_TerminationReason;
 			size_t m_MaxPayloadSize;
-			std::unique_ptr<std::pair<i2p::data::Tag<32>, boost::asio::ip::udp::endpoint> > m_PathChallenge;
+			std::unique_ptr<std::pair<uint64_t, boost::asio::ip::udp::endpoint> > m_PathChallenge;
 			std::unordered_map<uint32_t, uint32_t> m_ReceivedI2NPMsgIDs; // msgID -> timestamp in seconds
 			uint64_t m_LastResendTime, m_LastResendAttemptTime; // in milliseconds
 			int m_NumRanges;