Merge pull request #1 from PurpleI2P/master

sync

.gitignore

@@ -6,6 +6,7 @@
 *.o
 
 # built binaries
+autoconf
 keygen
 keyinfo
 famtool

README.md

@@ -26,7 +26,12 @@ Notice: git submodules are used so make sure to clone this repository recursivel
 
 ### Building
 
-    make
+```sh
+git submodule init && git submodule update
+git submodule update --init
+git pull --recurse-submodules
+make
+```
 
 ## Tools included
 

famtool.cpp

@@ -197,7 +197,7 @@ int main(int argc, char * argv[])
 		return 0;
 	}
 
-	InitCrypto(false, true, false);
+	InitCrypto(false);
 
 	if(!fam.size()) {
 		// no family name

i2pd

@@ -1 +1 @@
-Subproject commit 9668ea9338fe8524781d6966f576227775129769
+Subproject commit dcd15cc2449d6320de6351054e61ef2ee7ebee40

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, false);
+	i2p::crypto::InitCrypto (false);
 	i2p::data::SigningKeyType type = i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519;
 	if (argc > 2) {
 		std::string str(argv[2]);

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, false);
+	i2p::crypto::InitCrypto (false);
 
 	std::string fname(argv[2]);
 	i2p::data::PrivateKeys keys;

regaddr.cpp

@@ -12,7 +12,7 @@ int main (int argc, char * argv[])
 		return -1;
 	}
 
-	i2p::crypto::InitCrypto (false, true, false);
+	i2p::crypto::InitCrypto (false);
 
 	i2p::data::PrivateKeys keys;
 	std::ifstream s(argv[1], std::ifstream::binary);

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, false);
+	i2p::crypto::InitCrypto (false);
 	i2p::data::PrivateKeys keys;
 
 	if (arg == "step1") {

regaddralias.cpp

@@ -12,7 +12,7 @@ int main (int argc, char * argv[])
 		return -1;
 	}
 
-	i2p::crypto::InitCrypto (false, true, false);
+	i2p::crypto::InitCrypto (false);
 
 	i2p::data::PrivateKeys oldkeys, newkeys;
 	{

routerinfo.cpp

@@ -6,7 +6,7 @@
 
 static void usage(const char * argv)
 {
-	std::cout << "usage: " << argv << " [-6|-f|-p] routerinfo.dat" << std::endl;
+	std::cout << "usage: " << argv << " [-6|-f|-p|-y] routerinfo.dat" << std::endl;
 }
 
 template<typename Addr>
@@ -46,12 +46,13 @@ int main(int argc, char * argv[])
 		usage(argv[0]);
 		return 1;
 	}
-	i2p::crypto::InitCrypto(false, true, false);
+	i2p::crypto::InitCrypto(false);
 	int opt;
 	bool ipv6 = false;
 	bool firewall = false;
 	bool port = false;
-	while((opt = getopt(argc, argv, "6fp")) != -1) {
+	bool yggdrasil = false;
+	while((opt = getopt(argc, argv, "6fpy")) != -1) {
 		switch(opt) {
 		case '6':
 			ipv6 = true;
@@ -62,6 +63,9 @@ int main(int argc, char * argv[])
 		case 'p':
 			port = true;
 			break;
+		case 'y':
+			yggdrasil = true;
+			break;
 		default:
 			usage(argv[0]);
 			return 1;
@@ -89,7 +93,13 @@ int main(int argc, char * argv[])
 			a = ri.GetSSU2V6Address();
 			if(a)
 				addrs.push_back(a);
-		}	
+		}
+
+		if(yggdrasil){
+			a = ri.GetYggdrasilAddress();
+			if(a)
+				addrs.push_back(a);
+		}
 
 		if(firewall)
 			std::cout << "# ";

vain.cpp

@@ -294,9 +294,9 @@ int main (int argc, char * argv[])
 	}
 // https://github.com/PurpleI2P/i2pd/blob/ae5239de435e1dcdff342961af9b506f60a494d4/libi2pd/Crypto.h#L310
 //// 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, FORCE_CRYPTO);
+//	void InitCrypto (bool precomputation);
+// By default false
+	i2p::crypto::InitCrypto (PRECOMPUTATION_CRYPTO);
 	options.signature = i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519;
 ///////////////
 //For while

verifyhost.cpp

@@ -12,7 +12,7 @@ int main (int argc, char * argv[])
 		return -1;
 	}
 
-	i2p::crypto::InitCrypto (false, true, false);
+	i2p::crypto::InitCrypto (false);
 
 	i2p::data::IdentityEx Identity, OldIdentity;