From b48e6fb097c62bb246629ee7a182c57e497e4130 Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Sat, 19 Dec 2015 15:36:40 -0500 Subject: CLI rewrite The command line tools' origin as a collection of examples and test programs glued together led to some unfortunate problems; lots of hardcoded values, missing parameters, and obsolete crypto. Adds a small library for writing command line programs of the sort needed here (cli.h), which cuts the length of many of the commands in half and makes commands more pleasant to write and extend. Generalizes a lot of the commands also, eg previously only signing/verification with DSA/SHA-1 was included! Removes the fuzzer entry point since that's fairly useless outside of an instrumented build. Removes the in-library API for benchmarking. --- src/cli/hash.cpp | 63 -------------------------------------------------------- 1 file changed, 63 deletions(-) delete mode 100644 src/cli/hash.cpp (limited to 'src/cli/hash.cpp') diff --git a/src/cli/hash.cpp b/src/cli/hash.cpp deleted file mode 100644 index 9dd07d488..000000000 --- a/src/cli/hash.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/* -* (C) 2009 Jack Lloyd -* -* Botan is released under the Simplified BSD License (see license.txt) -*/ - -#include "apps.h" - -#if defined(BOTAN_HAS_CODEC_FILTERS) - -#include -#include -#include - -using namespace Botan; - -namespace { - -int hash(const std::vector &args) - { - if(args.size() < 3) - { - std::cout << "Usage: " << args[0] << " algorithm filename [filename ...]" << std::endl; - return 1; - } - - std::string hash = args[1]; - /* a couple of special cases, kind of a crock */ - if(hash == "sha1") hash = "SHA-1"; - if(hash == "md5") hash = "MD5"; - - try { - Pipe pipe(new Hash_Filter(hash), new Hex_Encoder); - - int skipped = 0; - for(int j = 2; j < args.size(); j++) - { - std::ifstream file(args[j], std::ios::binary); - if(!file) - { - std::cout << "ERROR: could not open " << args[j] << std::endl; - skipped++; - continue; - } - pipe.start_msg(); - file >> pipe; - pipe.end_msg(); - pipe.set_default_msg(j-2-skipped); - std::cout << pipe << " " << args[j] << std::endl; - } - } - catch(std::exception& e) - { - std::cout << "Exception caught: " << e.what() << std::endl; - } - return 0; - } - -REGISTER_APP(hash); - -} - -#endif // BOTAN_HAS_CODEC_FILTERS -- cgit v1.2.3