decrypt one-time message encrypted with tag on router

2021-07-06 20:15:55 -04:00
parent 431265a86a
commit a6294df9e8
3 changed files with 30 additions and 20 deletions
--- a/libi2pd/RouterContext.cpp
+++ b/libi2pd/RouterContext.cpp
@@ -843,10 +843,14 @@ namespace i2p
 				return;
 			}
 			buf += 4;
-			if (m_ECIESSession)
-				m_ECIESSession->HandleNextMessage (buf, len);
-			else
-				LogPrint (eLogError, "Router: Session is not set for ECIES router");
+			if (!HandleECIESx25519TagMessage (buf, len)) // try tag first
+			{	
+				// then Noise_N one-time decryption
+				if (m_ECIESSession)
+					m_ECIESSession->HandleNextMessage (buf, len);
+				else
+					LogPrint (eLogError, "Router: Session is not set for ECIES router");
+			}	
 		}
 		else
 			i2p::garlic::GarlicDestination::ProcessGarlicMessage (msg);