From 0fc4e01b1eca3c4c0719487c5c0ef4acb4fd1141 Mon Sep 17 00:00:00 2001
From: Jeff Becker <ampernand@gmail.com>
Date: Mon, 10 Oct 2016 08:18:54 -0400
Subject: [PATCH] remove tools

---
 Makefile                          |  8 +---
 contrib/tools/Makefile            |  7 ----
 contrib/tools/README.md           |  6 ---
 contrib/tools/keyinfo/Makefile    |  8 ----
 contrib/tools/keyinfo/README.md   |  5 ---
 contrib/tools/keyinfo/keyinfo.cpp | 70 -------------------------------
 6 files changed, 1 insertion(+), 103 deletions(-)
 delete mode 100644 contrib/tools/Makefile
 delete mode 100644 contrib/tools/README.md
 delete mode 100644 contrib/tools/keyinfo/Makefile
 delete mode 100644 contrib/tools/keyinfo/README.md
 delete mode 100644 contrib/tools/keyinfo/keyinfo.cpp

diff --git a/Makefile b/Makefile
index c68b977e..147bedd4 100644
--- a/Makefile
+++ b/Makefile
@@ -80,13 +80,7 @@ $(ARLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
 $(ARLIB_CLIENT): $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC))
 	ar -r $@ $^
 
-tools: $(ARLIB)
-	$(MAKE) -C contrib/tools/
-
-clean-tools:
-	$(MAKE) -C contrib/tools/ clean
-
-clean: clean-tools
+clean:
 	rm -rf obj
 	rm -rf docs/generated
 	$(RM) $(I2PD) $(SHLIB) $(ARLIB) $(SHLIB_CLIENT) $(ARLIB_CLIENT)
diff --git a/contrib/tools/Makefile b/contrib/tools/Makefile
deleted file mode 100644
index 6c60bb59..00000000
--- a/contrib/tools/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-all:
-	$(MAKE) -C keyinfo keyinfo
-
-clean:
-	$(MAKE) -C keyinfo clean
diff --git a/contrib/tools/README.md b/contrib/tools/README.md
deleted file mode 100644
index e598adfa..00000000
--- a/contrib/tools/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Collection of i2pd related tools
-
-# Buildling
-
-
-run `make tools` in the root of the repo
diff --git a/contrib/tools/keyinfo/Makefile b/contrib/tools/keyinfo/Makefile
deleted file mode 100644
index 44a13ff7..00000000
--- a/contrib/tools/keyinfo/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-CXXFLAGS = -I ../../../
-all: keyinfo
-
-keyinfo:
-	$(CXX) -o keyinfo keyinfo.cpp $(CXXFLAGS) -std=c++11 ../../../libi2pd.a -lssl -lcrypto -lboost_system
-
-clean:
-	$(RM) keyinfo
diff --git a/contrib/tools/keyinfo/README.md b/contrib/tools/keyinfo/README.md
deleted file mode 100644
index b3c39a4b..00000000
--- a/contrib/tools/keyinfo/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# keyinfo
-
-print information about a private key file
-
-
diff --git a/contrib/tools/keyinfo/keyinfo.cpp b/contrib/tools/keyinfo/keyinfo.cpp
deleted file mode 100644
index 6b6689c6..00000000
--- a/contrib/tools/keyinfo/keyinfo.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "Identity.h"
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <vector>
-#include <unistd.h>
-
-int main(int argc, char * argv[])
-{
-  if(argc == 1) {
-    std::cout << "usage: " << argv[0] << " [-v] [-d] privatekey.dat" << std::endl;
-    return -1;
-  }
-  int opt;
-  bool print_full = false;
-  bool verbose = false;
-  while((opt = getopt(argc, argv, "vd"))!=-1) {
-    switch(opt){ 
-    case 'v':
-      verbose = true;
-      break;
-    case 'd':
-      print_full = true;
-      break;
-    default:
-      std::cout << "usage: " << argv[0] << " [-v] [-d] privatekey.dat" << std::endl;
-      return -1;
-    }
-  }
-  std::string fname(argv[optind]);
-  i2p::data::PrivateKeys keys;
-  {
-    std::vector<uint8_t> buff;
-    std::ifstream inf;
-    inf.open(fname);
-    if (!inf.is_open()) {
-      std::cout << "cannot open private key file " << fname << std::endl;
-      return 2;
-    }
-    inf.seekg(0, std::ios::end);
-    const std::size_t len = inf.tellg();
-    inf.seekg(0, std::ios::beg);
-    buff.resize(len);
-    inf.read((char*)buff.data(), buff.size());
-    if (!keys.FromBuffer(buff.data(), buff.size())) {
-      std::cout << "bad key file format" << std::endl;
-      return 3;
-    }
-  }
-  auto dest = keys.GetPublic();
-  if(!dest) {
-    std::cout << "failed to extract public key" << std::endl;
-    return 3;
-  }
-  
-  const auto & ident = dest->GetIdentHash();
-  if (verbose) {
-    std::cout << "Destination: " << dest->ToBase64() << std::endl;
-    std::cout << "Destination Hash: " << ident.ToBase64() << std::endl;
-    std::cout << "B32 Address: " << ident.ToBase32() << ".b32.i2p" << std::endl;
-    std::cout << "Signature Type: " << (int) dest->GetSigningKeyType() << std::endl;
-    std::cout << "Encryption Type: " << (int) dest->GetCryptoKeyType() << std::endl;
-  } else {
-    if(print_full) {
-      std::cout << dest->ToBase64() << std::endl;
-    } else {
-      std::cout << ident.ToBase32() << ".b32.i2p" << std::endl;
-    }
-  }
-}