From d7a079ad644be3e55d2f7c5074a732166ffec19f Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Tue, 7 May 2024 18:13:03 -0400
Subject: [PATCH] updated to 2.51.0

---
 famtool.cpp      | 11 ++++++++---
 i2pd             |  2 +-
 keygen.cpp       |  2 +-
 offlinekeys.cpp  |  2 +-
 regaddr.cpp      |  2 +-
 regaddr_3ld.cpp  |  2 +-
 regaddralias.cpp |  2 +-
 routerinfo.cpp   |  2 +-
 vain.cpp         |  2 +-
 verifyhost.cpp   |  2 +-
 10 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/famtool.cpp b/famtool.cpp
index b117842..c8b5911 100644
--- a/famtool.cpp
+++ b/famtool.cpp
@@ -197,7 +197,7 @@ int main(int argc, char * argv[])
 		return 0;
 	}
 
-	InitCrypto(false, true, true, false);
+	InitCrypto(false, true, false);
 
 	if(!fam.size()) {
 		// no family name
@@ -319,7 +319,10 @@ int main(int argc, char * argv[])
 			delete [] k;
 		}
 
-		LocalRouterInfo ri(infofile);
+        RouterInfo routerInfo(infofile);
+		LocalRouterInfo ri;
+        ri.Update (routerInfo.GetBuffer (), routerInfo.GetBufferLen ());        
+
 		auto ident = ri.GetIdentHash();
 
 
@@ -365,7 +368,9 @@ int main(int argc, char * argv[])
 
 		if (verbose) std::cout << "load " << infofile << std::endl;
 
-		LocalRouterInfo ri(infofile);
+        RouterInfo routerInfo(infofile);
+		LocalRouterInfo ri;
+        ri.Update (routerInfo.GetBuffer (), routerInfo.GetBufferLen ());
 		auto sig = ri.GetProperty(ROUTER_INFO_PROPERTY_FAMILY_SIG);
 		if (ri.GetProperty(ROUTER_INFO_PROPERTY_FAMILY) != fam) {
 			std::cout << infofile << " does not belong to " << fam << std::endl;
diff --git a/i2pd b/i2pd
index a6bd827..c98926a 160000
--- a/i2pd
+++ b/i2pd
@@ -1 +1 @@
-Subproject commit a6bd8275ca496c75c84d7eb890c0071569d28f55
+Subproject commit c98926abf2dcd3cbe2cbbfc00a9e9159240c3df9
diff --git a/keygen.cpp b/keygen.cpp
index 81d184c..30df4a0 100644
--- a/keygen.cpp
+++ b/keygen.cpp
@@ -12,7 +12,7 @@ int main (int argc, char * argv[])
 		std::cout << "Usage: keygen filename <signature type>" << std::endl;
 		return -1;
 	}
-	i2p::crypto::InitCrypto (false, true, true, false);
+	i2p::crypto::InitCrypto (false, true, false);
 	i2p::data::SigningKeyType type = i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519;
 	if (argc > 2) {
 		std::string str(argv[2]);
diff --git a/offlinekeys.cpp b/offlinekeys.cpp
index 473c703..8a4a8c5 100644
--- a/offlinekeys.cpp
+++ b/offlinekeys.cpp
@@ -14,7 +14,7 @@ int main (int argc, char * argv[])
 		std::cout << "Usage: offlinekeys <output file> <keys file> <signature type> <days>" << std::endl;
 		return -1;
 	}
-	i2p::crypto::InitCrypto (false, true, true, false);
+	i2p::crypto::InitCrypto (false, true, false);
 
 	std::string fname(argv[2]);
 	i2p::data::PrivateKeys keys;
diff --git a/regaddr.cpp b/regaddr.cpp
index 5f16c01..bd560c0 100644
--- a/regaddr.cpp
+++ b/regaddr.cpp
@@ -12,7 +12,7 @@ int main (int argc, char * argv[])
 		return -1;
 	}
 
-	i2p::crypto::InitCrypto (false, true, true, false);
+	i2p::crypto::InitCrypto (false, true, false);
 
 	i2p::data::PrivateKeys keys;
 	std::ifstream s(argv[1], std::ifstream::binary);
diff --git a/regaddr_3ld.cpp b/regaddr_3ld.cpp
index bb1c703..561bbae 100644
--- a/regaddr_3ld.cpp
+++ b/regaddr_3ld.cpp
@@ -18,7 +18,7 @@ int main (int argc, char * argv[])
 	if (argc < 3) {	help(); return -1;}
 	std::string arg = argv[1];
 
-	i2p::crypto::InitCrypto (false, true, true, false);
+	i2p::crypto::InitCrypto (false, true, false);
 	i2p::data::PrivateKeys keys;
 
 	if (arg == "step1") {
diff --git a/regaddralias.cpp b/regaddralias.cpp
index 921847e..96eafaa 100644
--- a/regaddralias.cpp
+++ b/regaddralias.cpp
@@ -12,7 +12,7 @@ int main (int argc, char * argv[])
 		return -1;
 	}
 
-	i2p::crypto::InitCrypto (false, true, true, false);
+	i2p::crypto::InitCrypto (false, true, false);
 
 	i2p::data::PrivateKeys oldkeys, newkeys;
 	{
diff --git a/routerinfo.cpp b/routerinfo.cpp
index a2b1713..a56a273 100644
--- a/routerinfo.cpp
+++ b/routerinfo.cpp
@@ -46,7 +46,7 @@ int main(int argc, char * argv[])
 		usage(argv[0]);
 		return 1;
 	}
-	i2p::crypto::InitCrypto(false, true, true, false);
+	i2p::crypto::InitCrypto(false, true, false);
 	int opt;
 	bool ipv6 = false;
 	bool firewall = false;
diff --git a/vain.cpp b/vain.cpp
index 148d33f..f2e11fa 100755
--- a/vain.cpp
+++ b/vain.cpp
@@ -296,7 +296,7 @@ int main (int argc, char * argv[])
 //// init and terminate
 //	void InitCrypto (bool precomputation, bool aesni, bool avx, bool force);
 // By default false to all. But on much proccessors some things will be enabled. SO, TODO
-	i2p::crypto::InitCrypto (PRECOMPUTATION_CRYPTO, AESNI_CRYPTO, AVX_CRYPTO, FORCE_CRYPTO);
+	i2p::crypto::InitCrypto (PRECOMPUTATION_CRYPTO, AESNI_CRYPTO, FORCE_CRYPTO);
 	options.signature = i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519;
 ///////////////
 //For while
diff --git a/verifyhost.cpp b/verifyhost.cpp
index 59779ac..482d7f8 100644
--- a/verifyhost.cpp
+++ b/verifyhost.cpp
@@ -12,7 +12,7 @@ int main (int argc, char * argv[])
 		return -1;
 	}
 
-	i2p::crypto::InitCrypto (false, true, true, false);
+	i2p::crypto::InitCrypto (false, true, false);
 
 	i2p::data::IdentityEx Identity, OldIdentity;