From 0c593583dccd88e90450972e6a1b9e6bc67e0911 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Tue, 4 Aug 2015 04:37:12 +0300 Subject: utils: bugfix & refactoring --- utils/block_common.hpp | 242 ------------------------------------------------- 1 file changed, 242 deletions(-) delete mode 100644 utils/block_common.hpp (limited to 'utils/block_common.hpp') diff --git a/utils/block_common.hpp b/utils/block_common.hpp deleted file mode 100644 index 52b9ce3..0000000 --- a/utils/block_common.hpp +++ /dev/null @@ -1,242 +0,0 @@ -/** - * \file - * \author Egor Tensin - * \date 2015 - * \copyright This file is licensed under the terms of the MIT License. - * See LICENSE.txt for details. - */ - -#pragma once - -#include - -#include -#include - -#include - -#include -#include -#include -#include -#include -#include - -static std::istream& operator>>(std::istream& is, aesni::Mode& dest) -{ - std::string src; - is >> src; - - if (boost::iequals(src, "ecb")) - dest = AESNI_ECB; - else if (boost::iequals(src, "cbc")) - dest = AESNI_CBC; - else if (boost::iequals(src, "cfb")) - dest = AESNI_CFB; - else if (boost::iequals(src, "ofb")) - dest = AESNI_OFB; - else if (boost::iequals(src, "ctr")) - dest = AESNI_CTR; - else - throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value, "mode", src); - - return is; -} - -static std::istream& operator>>(std::istream& is, aesni::Algorithm& dest) -{ - std::string src; - is >> src; - - if (boost::iequals(src, "aes128")) - dest = AESNI_AES128; - else if (boost::iequals(src, "aes192")) - dest = AESNI_AES192; - else if (boost::iequals(src, "aes256")) - dest = AESNI_AES256; - else - throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value, "algorithm", src); - - return is; -} - -namespace -{ - class CommandLineParser - { - public: - CommandLineParser(const std::string& prog_name) - : prog_name(prog_name) - , options("Options") - , boxes_flag(false) - , verbose_flag(false) - { } - - bool parse_options(int argc, char** argv) - { - namespace po = boost::program_options; - - options.add_options() - ("help,h", "show this message and exit") - ("box,b", po::bool_switch(&boxes_flag)->default_value(false), "use the \"boxes\" interface") - ("mode,m", po::value(&encryption_mode)->required(), "set mode of operation") - ("algorithm,a", po::value(&encryption_algo)->required(), "set algorithm") - ("verbose,v", po::bool_switch(&verbose_flag)->default_value(false), "enable verbose output"); - - po::options_description hidden_options; - hidden_options.add_options() - ("positional", po::value>(&args)); - - po::options_description all_options; - all_options.add(options).add(hidden_options); - - po::positional_options_description positional_options; - positional_options.add("positional", -1); - - po::variables_map vm; - po::store(po::command_line_parser(argc, argv).options(all_options).positional(positional_options).run(), vm); - - if (vm.count("help")) - { - print_usage(); - return false; - } - - po::notify(vm); - return true; - } - - void print_usage() - { - std::cout << "Usage: " << prog_name << " [OPTIONS...] [-- KEY [IV] [BLOCK...]...]\n"; - std::cout << options << "\n"; - } - - aesni::Mode get_mode() const - { - return encryption_mode; - } - - aesni::Algorithm get_algorithm() const - { - return encryption_algo; - } - - bool use_boxes() const - { - return boxes_flag; - } - - std::deque get_args() - { - return { std::make_move_iterator(args.begin()), std::make_move_iterator(args.end()) }; - } - - bool verbose() const - { - return verbose_flag; - } - - private: - const std::string prog_name; - boost::program_options::options_description options; - - aesni::Mode encryption_mode; - aesni::Algorithm encryption_algo; - bool boxes_flag; - std::vector args; - bool verbose_flag; - }; -} - -namespace -{ - template - void dump_block(const char* name, const typename aesni::Types::Block& block) - { - std::cout << name << ": " << aesni::to_string(block) << "\n" << aesni::to_matrix_string(block) << "\n"; - } - - template - void dump_plaintext(const typename aesni::Types::Block& block) - { - dump_block("Plaintext", block); - } - - template - void dump_key(const typename aesni::Types::Key& key) - { - std::cout << "Key: " << aesni::to_string(key) << "\n\n"; - } - - template - void dump_ciphertext(const typename aesni::Types::Block& ciphertext) - { - dump_block("Ciphertext", ciphertext); - } - - template - void dump_iv(const typename aesni::Types::Block& iv) - { - dump_block("Initialization vector", iv); - } - - template - void dump_round_keys(const char* name, const typename aesni::Types::RoundKeys& round_keys) - { - std::cout << name << ":\n"; - for (std::size_t i = 0; i < aesni::get_number_of_rounds(); ++i) - std::cout << "\t[" << i << "]: " << aesni::to_string(round_keys.keys[i]) << "\n"; - std::cout << "\n"; - } - - template - void dump_encryption_keys(const typename aesni::Types::RoundKeys& round_keys) - { - dump_round_keys("Encryption round keys", round_keys); - } - - template - void dump_decryption_keys(const typename aesni::Types::RoundKeys& round_keys) - { - dump_round_keys("Decryption round keys", round_keys); - } - - template - void dump_wrapper( - const aesni::EncryptWrapper& wrapper) - { - dump_encryption_keys(wrapper.encryption_keys); - } - - template - void dump_wrapper( - const aesni::DecryptWrapper& wrapper) - { - dump_decryption_keys(wrapper.decryption_keys); - } - - template ::value>::type* = 0> - void dump_next_iv( - const aesni::EncryptWrapper& wrapper) - { - dump_block("Next initialization vector", wrapper.iv); - } - - template ::value>::type* = 0> - void dump_next_iv( - const aesni::EncryptWrapper&) - { } - - template ::value>::type* = 0> - void dump_next_iv( - const aesni::DecryptWrapper& wrapper) - { - dump_block("Next initialization vector", wrapper.iv); - } - - template ::value>::type* = 0> - void dump_next_iv( - const aesni::DecryptWrapper&) - { } -} -- cgit v1.2.3