From f752dfe56b67f2729df0c54c83612ba36f8133bc Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Thu, 25 Jun 2015 01:18:24 +0300 Subject: remove specialized buffer encryption functions --- README.md | 2 +- include/aesni/all.h | 1 - include/aesni/buffer.h | 40 ------- src/buffer.c | 120 --------------------- utils/file/CMakeLists.txt | 27 +++-- utils/file/README.md | 87 ++++++++++++++++ utils/file/aes128ecb_decrypt_file.cpp | 104 ------------------ utils/file/aes128ecb_encrypt_file.cpp | 103 ------------------ utils/file/aes_common.hpp | 132 +++++++++++++++++++++++ utils/file/aes_decrypt_bmp.cpp | 191 ++++++++++++++++++++++++++++++++++ utils/file/aes_decrypt_file.cpp | 182 ++++++++++++++++++++++++++++++++ utils/file/aes_encrypt_bmp.cpp | 190 +++++++++++++++++++++++++++++++++ utils/file/aes_encrypt_file.cpp | 182 ++++++++++++++++++++++++++++++++ utils/file/bmp/butterfly.bmp | Bin 0 -> 503370 bytes utils/file/bmp/cipherfly_cbc.bmp | Bin 0 -> 503382 bytes utils/file/bmp/cipherfly_ecb.bmp | Bin 0 -> 503382 bytes utils/file/cxx/CMakeLists.txt | 21 ---- utils/file/cxx/README.md | 87 ---------------- utils/file/cxx/aes_common.hpp | 132 ----------------------- utils/file/cxx/aes_decrypt_bmp.cpp | 191 ---------------------------------- utils/file/cxx/aes_decrypt_file.cpp | 182 -------------------------------- utils/file/cxx/aes_encrypt_bmp.cpp | 190 --------------------------------- utils/file/cxx/aes_encrypt_file.cpp | 182 -------------------------------- utils/file/cxx/bmp/butterfly.bmp | Bin 503370 -> 0 bytes utils/file/cxx/bmp/cipherfly_cbc.bmp | Bin 503382 -> 0 bytes utils/file/cxx/bmp/cipherfly_ecb.bmp | Bin 503382 -> 0 bytes 26 files changed, 984 insertions(+), 1362 deletions(-) delete mode 100644 include/aesni/buffer.h delete mode 100644 src/buffer.c create mode 100644 utils/file/README.md delete mode 100644 utils/file/aes128ecb_decrypt_file.cpp delete mode 100644 utils/file/aes128ecb_encrypt_file.cpp create mode 100644 utils/file/aes_common.hpp create mode 100644 utils/file/aes_decrypt_bmp.cpp create mode 100644 utils/file/aes_decrypt_file.cpp create mode 100644 utils/file/aes_encrypt_bmp.cpp create mode 100644 utils/file/aes_encrypt_file.cpp create mode 100644 utils/file/bmp/butterfly.bmp create mode 100644 utils/file/bmp/cipherfly_cbc.bmp create mode 100644 utils/file/bmp/cipherfly_ecb.bmp delete mode 100644 utils/file/cxx/CMakeLists.txt delete mode 100644 utils/file/cxx/README.md delete mode 100644 utils/file/cxx/aes_common.hpp delete mode 100644 utils/file/cxx/aes_decrypt_bmp.cpp delete mode 100644 utils/file/cxx/aes_decrypt_file.cpp delete mode 100644 utils/file/cxx/aes_encrypt_bmp.cpp delete mode 100644 utils/file/cxx/aes_encrypt_file.cpp delete mode 100644 utils/file/cxx/bmp/butterfly.bmp delete mode 100644 utils/file/cxx/bmp/cipherfly_cbc.bmp delete mode 100644 utils/file/cxx/bmp/cipherfly_ecb.bmp diff --git a/README.md b/README.md index 6b198ce..b8acb60 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Remember that in order to link to the static Boost libraries, you also have to p A couple of useful utilities built on top of the library are included. Namely, -* [the file encryption utilities](utils/file/cxx#file-encryption-utilities), +* [the file encryption utilities](utils/file#file-encryption-utilities), * and [the block encryption utilities](utils/block/cxx#block-encryption-utilities) (used mainly for testing). ## Running on older CPUs diff --git a/include/aesni/all.h b/include/aesni/all.h index 144a695..bbea6f9 100644 --- a/include/aesni/all.h +++ b/include/aesni/all.h @@ -20,7 +20,6 @@ #include "box.h" #include "box_aes.h" #include "box_data.h" -#include "buffer.h" #include "data.h" #include "error.h" #include "mode.h" diff --git a/include/aesni/buffer.h b/include/aesni/buffer.h deleted file mode 100644 index 3e74078..0000000 --- a/include/aesni/buffer.h +++ /dev/null @@ -1,40 +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. - * - * \brief Declares variable-length buffer encryption/decryption functions. - */ - -#pragma once - -#include "aes.h" -#include "error.h" - -#include - -#ifdef __cplusplus -extern "C" -{ -#endif - -AesNI_StatusCode aesni_encrypt_buffer_ecb128( - const void* src, - size_t src_size, - void* dest, - size_t* dest_size, - AesNI_Aes128_RoundKeys* encryption_keys, - AesNI_ErrorDetails* err_details); -AesNI_StatusCode aesni_decrypt_buffer_ecb128( - const void* src, - size_t src_size, - void* dest, - size_t* dest_size, - AesNI_Aes128_RoundKeys* decryption_keys, - AesNI_ErrorDetails* err_details); - -#ifdef __cplusplus -} -#endif diff --git a/src/buffer.c b/src/buffer.c deleted file mode 100644 index 593a5b8..0000000 --- a/src/buffer.c +++ /dev/null @@ -1,120 +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. - */ - -#include - -#include -#include - -static unsigned char FULL_BLOCK_PADDING[16] = { 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16 }; - -AesNI_StatusCode aesni_encrypt_buffer_ecb128( - const void* src, - size_t src_size, - void* dest, - size_t* dest_size, - AesNI_Aes128_RoundKeys* encryption_keys, - AesNI_ErrorDetails* err_details) -{ - if (dest_size == NULL) - return aesni_error_null_argument(err_details, "dest_size"); - - const size_t rem_size = src_size % 16; - const size_t padding_size = 16 - rem_size; - *dest_size = src_size + padding_size; - - if (dest == NULL) - return AESNI_SUCCESS; - if (src == NULL) - return aesni_error_null_argument(err_details, "src"); - if (encryption_keys == NULL) - return aesni_error_null_argument(err_details, "encryption_keys"); - - const size_t src_len = src_size / 16; - - for (size_t i = 0; i < src_len; ++i, (char*) src += 16, (char*) dest += 16) - { - AesNI_Block128 plaintext = aesni_load_block128(src); - AesNI_Block128 ciphertext = aesni_aes128_encrypt_block_ecb(plaintext, encryption_keys); - aesni_store_block128(dest, ciphertext); - } - - unsigned char padding[16]; - - if (rem_size == 0) - { - memcpy(padding, FULL_BLOCK_PADDING, 16); - } - else - { - memcpy(padding, src, rem_size); - memset(padding + rem_size, padding_size, padding_size); - } - - AesNI_Block128 plaintext = aesni_load_block128(padding); - AesNI_Block128 ciphertext = aesni_aes128_encrypt_block_ecb(plaintext, encryption_keys); - aesni_store_block128(dest, ciphertext); - - return AESNI_SUCCESS; -} - -static unsigned char get_pkcs7_padding_size(const unsigned char* padding) -{ - if (padding[15] < 0x01 || padding[15] > 0x10) - return 0; - - for (int i = 16 - padding[15]; i < 15; ++i) - if (padding[i] != padding[15]) - return 0; - - return padding[15]; -} - -AesNI_StatusCode aesni_decrypt_buffer_ecb128( - const void* src, - size_t src_size, - void* dest, - size_t* dest_size, - AesNI_Aes128_RoundKeys* decryption_keys, - AesNI_ErrorDetails* err_details) -{ - if (dest_size == NULL) - return aesni_error_null_argument(err_details, "dest_size"); - - *dest_size = src_size; - - if (dest == NULL) - return 0; - if (src == NULL) - return aesni_error_null_argument(err_details, "src"); - if (decryption_keys == NULL) - return aesni_error_null_argument(err_details, "decryption_keys"); - - const size_t src_len = src_size / 16; - - for (size_t i = 0; i < src_len - 1; ++i, (char*) src += 16, (char*) dest += 16) - { - AesNI_Block128 ciphertext = aesni_load_block128(src); - AesNI_Block128 plaintext = aesni_aes128_decrypt_block_ecb(ciphertext, decryption_keys); - aesni_store_block128(dest, plaintext); - } - - AesNI_Block128 ciphertext = aesni_load_block128(src); - AesNI_Block128 plaintext = aesni_aes128_decrypt_block_ecb(ciphertext, decryption_keys); - unsigned char padding[16]; - aesni_store_block128(padding, plaintext); - - unsigned char padding_size = get_pkcs7_padding_size(padding); - - if (padding_size == 0) - return aesni_error_invalid_pkcs7_padding(err_details); - - memcpy(dest, padding, 16 - padding_size); - *dest_size -= padding_size; - return AESNI_SUCCESS; -} diff --git a/utils/file/CMakeLists.txt b/utils/file/CMakeLists.txt index ad949f7..75895a0 100644 --- a/utils/file/CMakeLists.txt +++ b/utils/file/CMakeLists.txt @@ -1,10 +1,21 @@ -macro(util prefix) - add_executable(util_${prefix} ${prefix}.cpp) - target_link_libraries(util_${prefix} libaesnixx libaesni) - set_target_properties(util_${prefix} PROPERTIES OUTPUT_NAME ${prefix}) -endmacro() +find_package(Boost REQUIRED COMPONENTS program_options) -util(aes128ecb_encrypt_file) -util(aes128ecb_decrypt_file) +add_executable(util_aes_encrypt_file aes_encrypt_file.cpp aes_common.hpp) +target_include_directories(util_aes_encrypt_file PRIVATE ${Boost_INCLUDE_DIRS}) +target_link_libraries(util_aes_encrypt_file libaesni libaesnixx ${Boost_LIBRARIES}) +set_target_properties(util_aes_encrypt_file PROPERTIES OUTPUT_NAME aes_encrypt_file) -add_subdirectory(cxx) +add_executable(util_aes_decrypt_file aes_decrypt_file.cpp aes_common.hpp) +target_include_directories(util_aes_decrypt_file PRIVATE ${Boost_INCLUDE_DIRS}) +target_link_libraries(util_aes_decrypt_file libaesni libaesnixx ${Boost_LIBRARIES}) +set_target_properties(util_aes_decrypt_file PROPERTIES OUTPUT_NAME aes_decrypt_file) + +add_executable(util_aes_encrypt_bmp aes_encrypt_bmp.cpp aes_common.hpp) +target_include_directories(util_aes_encrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS}) +target_link_libraries(util_aes_encrypt_bmp libaesni libaesnixx ${Boost_LIBRARIES}) +set_target_properties(util_aes_encrypt_bmp PROPERTIES OUTPUT_NAME aes_encrypt_bmp) + +add_executable(util_aes_decrypt_bmp aes_decrypt_bmp.cpp aes_common.hpp) +target_include_directories(util_aes_decrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS}) +target_link_libraries(util_aes_decrypt_bmp libaesni libaesnixx ${Boost_LIBRARIES}) +set_target_properties(util_aes_decrypt_bmp PROPERTIES OUTPUT_NAME aes_decrypt_bmp) diff --git a/utils/file/README.md b/utils/file/README.md new file mode 100644 index 0000000..bf79cb2 --- /dev/null +++ b/utils/file/README.md @@ -0,0 +1,87 @@ +# File encryption utilities + +Here are a couple of useful file encryption utilities built on top of the library. +Each of the utilities accepts `--help` flag, which can be used to examine utility's usage info. + +The included utilities are: + +* [file encryption](#file-encryption) utilities, +* and [bitmap encryption](#bitmap-encryption) utilities. + +On older CPUs, you can run the utilities [using Intel SDE](https://github.com/egor-tensin/aesni#running-on-older-cpus). + +## File encryption + +### aes_encrypt_file.exe + +Encrypts a file using AES-128/192/256 in the specified mode of operation. + +#### Usage examples + +For example, to encrypt the plaintext `input.txt` + +* using AES-128 in ECB mode +* with key `0x11111111111111111111111111111111` +* and write the ciphertext to `output.txt`, + +run: + + aes_encrypt_file.exe -a aes128 -m ecb 11111111111111111111111111111111 input.txt output.txt + +To encrypt the plaintext from `input.txt` + +* using AES-192 in OFB mode +* with key `0x111111111111111111111111111111111111111111111111` +* and initialization vector `0x22222222222222222222222222222222` +* and write the ciphertext to `output.txt`: + +run + + aes_encrypt_file.exe -a aes192 -m ofb 111111111111111111111111111111111111111111111111 22222222222222222222222222222222 input.txt output.txt + +### aes_decrypt_file.exe + +Decrypts a file using AES-128/192/256 in the specified mode of operation. + +#### Usage examples + +To decrypt the ciphertext from `input.txt` + +* using AES-128 in ECB mode +* with key `0x11111111111111111111111111111111` +* and write the plaintext to `output.txt`, + +run + + aes_decrypt_file.exe -a aes128 -m ecb 11111111111111111111111111111111 input.txt output.txt + +To decrypt the ciphertext from `input.txt` + +* using AES-192 in OFB mode +* with key `0x111111111111111111111111111111111111111111111111` +* and initialization vector `0x22222222222222222222222222222222` +* and write the plaintext to `output.txt`, + +run + + aes_decrypt_file.exe -a aes192 -m ofb 111111111111111111111111111111111111111111111111 22222222222222222222222222222222 input.txt output.txt + +## Bitmap encryption + +These utilities were developed primarily to demonstrate the drawbacks of using ECB mode +(namely, the fact that identical plaintext blocks get mapped to identical ciphertext blocks). +This can be explicitly shown using 8-bit-per-pixel bitmaps: + +Plaintext BMP | Encrypted in ECB mode | Encrypted in CBC mode +------------- | --------------------- | --------------------- +![Plaintext butterfly](bmp/butterfly.bmp?raw=true) | ![Ciphertext butterfly in ECB mode](bmp/cipherfly_ecb.bmp?raw=true) | ![Ciphertext butterfly in CBC mode](bmp/cipherfly_cbc.bmp?raw=true) + +### aes_encrypt_bmp.exe + +Encrypts the pixels in a BMP image file, preserving the header. +The usage is the same as for [aes_encrypt_file.exe](#aes_encrypt_fileexe). + +### aes_decrypt_bmp.exe + +Decrypts the pixels in a BMP image file, preserving the header. +The usage is the same as for [aes_decrypt_file.exe](#aes_decrypt_fileexe). diff --git a/utils/file/aes128ecb_decrypt_file.cpp b/utils/file/aes128ecb_decrypt_file.cpp deleted file mode 100644 index 9b8b15c..0000000 --- a/utils/file/aes128ecb_decrypt_file.cpp +++ /dev/null @@ -1,104 +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. - */ - -#include -#include - -#include - -#include -#include -#include -#include -#include - -namespace -{ - void exit_with_usage() - { - std::cout << "Usage: aes128ecb_decrypt_file.exe KEY SRC DEST\n"; - std::exit(EXIT_FAILURE); - } - - std::ifstream::pos_type get_file_size(const std::string& path) - { - std::ifstream ifs; - ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - ifs.open(path, std::ifstream::binary | std::ifstream::ate); - return ifs.tellg(); - } -} - -int main(int argc, char** argv) -{ - if (argc != 4) - exit_with_usage(); - - try - { - aesni::aes::Key128 key; - aesni::aes::from_string(key, argv[1]); - - aesni::aes::RoundKeys128 encryption_keys, decryption_keys; - - const std::string src_path(argv[2]); - const std::string dest_path(argv[3]); - - const auto src_size = static_cast(get_file_size(src_path)); - - std::ifstream src_ifs; - src_ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - src_ifs.open(src_path, std::ifstream::binary); - - std::vector src_buf; - src_buf.reserve(src_size); - src_buf.assign(std::istreambuf_iterator(src_ifs), - std::istreambuf_iterator()); - - aesni_aes128_expand_key(&key, &encryption_keys); - aesni_aes128_derive_decryption_keys(&encryption_keys, &decryption_keys); - - std::size_t dest_size; - - aesni_decrypt_buffer_ecb128( - src_buf.data(), - src_size, - NULL, - &dest_size, - &decryption_keys, - aesni::ErrorDetailsThrowsInDestructor()); - - std::vector dest_buf; - dest_buf.reserve(dest_size); - - aesni_decrypt_buffer_ecb128( - src_buf.data(), - src_size, - dest_buf.data(), - &dest_size, - &decryption_keys, - aesni::ErrorDetailsThrowsInDestructor()); - - std::ofstream dest_ofs; - dest_ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit); - dest_ofs.open(dest_path, std::ofstream::binary); - dest_ofs.write(dest_buf.data(), dest_size); - } - catch (const aesni::Error& e) - { - std::cerr << e; - return 1; - } - catch (const std::exception& e) - { - std::cerr << e.what() << "\n"; - return 1; - } - - return 0; -} diff --git a/utils/file/aes128ecb_encrypt_file.cpp b/utils/file/aes128ecb_encrypt_file.cpp deleted file mode 100644 index a43c4d9..0000000 --- a/utils/file/aes128ecb_encrypt_file.cpp +++ /dev/null @@ -1,103 +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. - */ - -#include -#include - -#include - -#include -#include -#include -#include -#include - -namespace -{ - void exit_with_usage() - { - std::cout << "Usage: aes128ecb_encrypt_file.exe KEY SRC DEST\n"; - std::exit(EXIT_FAILURE); - } - - std::ifstream::pos_type get_file_size(const std::string& path) - { - std::ifstream ifs; - ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - ifs.open(path, std::ifstream::binary | std::ifstream::ate); - return ifs.tellg(); - } -} - -int main(int argc, char** argv) -{ - if (argc != 4) - exit_with_usage(); - - try - { - aesni::aes::Key128 key; - aesni::aes::from_string(key, argv[1]); - - AesNI_Aes128_RoundKeys encryption_keys; - - const std::string src_path(argv[2]); - const std::string dest_path(argv[3]); - - const auto src_size = static_cast(get_file_size(src_path)); - - std::ifstream src_ifs; - src_ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - src_ifs.open(src_path, std::ifstream::binary); - - std::vector src_buf; - src_buf.reserve(src_size); - src_buf.assign(std::istreambuf_iterator(src_ifs), - std::istreambuf_iterator()); - - aesni_aes128_expand_key(&key, &encryption_keys); - - std::size_t dest_size; - - aesni_encrypt_buffer_ecb128( - src_buf.data(), - src_size, - NULL, - &dest_size, - &encryption_keys, - aesni::ErrorDetailsThrowsInDestructor()); - - std::vector dest_buf; - dest_buf.reserve(dest_size); - - aesni_encrypt_buffer_ecb128( - src_buf.data(), - src_size, - dest_buf.data(), - &dest_size, - &encryption_keys, - aesni::ErrorDetailsThrowsInDestructor()); - - std::ofstream dest_ofs; - dest_ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit); - dest_ofs.open(dest_path, std::ofstream::binary); - dest_ofs.write(dest_buf.data(), dest_size); - } - catch (const aesni::Error& e) - { - std::cerr << e; - return 1; - } - catch (const std::exception& e) - { - std::cerr << e.what() << "\n"; - return 1; - } - - return 0; -} diff --git a/utils/file/aes_common.hpp b/utils/file/aes_common.hpp new file mode 100644 index 0000000..28e16df --- /dev/null +++ b/utils/file/aes_common.hpp @@ -0,0 +1,132 @@ +/** + * \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 + +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& program_name) + : m_program_name(program_name) + , m_options("Options") + { } + + bool parse_options(int argc, char** argv) + { + namespace po = boost::program_options; + + m_options.add_options() + ("help,h", "show this message and exit") + ("mode,m", po::value(&m_mode)->required(), "set mode of operation") + ("algorithm,a", po::value(&m_algorithm)->required(), "set algorithm"); + + po::options_description hidden_options; + hidden_options.add_options() + ("positional", po::value>(&m_args)); + + po::options_description all_options; + all_options.add(m_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: " << m_program_name << " [OPTIONS...] KEY [IV] SRC_PATH DEST_PATH\n"; + std::cout << m_options << "\n"; + } + + aesni::Mode get_mode() const + { + return m_mode; + } + + aesni::Algorithm get_algorithm() const + { + return m_algorithm; + } + + std::deque get_args() + { + return { std::make_move_iterator(m_args.begin()), std::make_move_iterator(m_args.end()) }; + } + + private: + const std::string m_program_name; + boost::program_options::options_description m_options; + + aesni::Mode m_mode; + aesni::Algorithm m_algorithm; + std::vector m_args; + }; +} diff --git a/utils/file/aes_decrypt_bmp.cpp b/utils/file/aes_decrypt_bmp.cpp new file mode 100644 index 0000000..85dffe5 --- /dev/null +++ b/utils/file/aes_decrypt_bmp.cpp @@ -0,0 +1,191 @@ +/** + * \file + * \author Egor Tensin + * \date 2015 + * \copyright This file is licensed under the terms of the MIT License. + * See LICENSE.txt for details. + */ + +#include "aes_common.hpp" + +#include + +#include + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include + +namespace +{ + std::ifstream::pos_type get_file_size(const std::string& path) + { + std::ifstream ifs; + ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); + ifs.open(path, std::ifstream::binary | std::ifstream::ate); + return ifs.tellg(); + } + + std::vector read_file(const std::string& path) + { + const auto size = static_cast(get_file_size(path)); + + std::ifstream ifs; + ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); + ifs.open(path, std::ifstream::binary); + + std::vector src_buf; + src_buf.reserve(size); + src_buf.assign(std::istreambuf_iterator(ifs), + std::istreambuf_iterator()); + return src_buf; + } + + void write_file(const std::string& path, const std::vector& src) + { + std::ofstream ofs; + ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit); + ofs.open(path, std::ofstream::binary); + ofs.write(src.data(), src.size()); + } +} + +int main(int argc, char** argv) +{ + try + { + CommandLineParser cmd_parser("aes_decrypt_bmp.exe"); + + if (!cmd_parser.parse_options(argc, argv)) + return 0; + + auto args = cmd_parser.get_args(); + + if (args.empty()) + { + cmd_parser.print_usage(); + return 1; + } + + AesNI_BoxAlgorithmParams algorithm_params; + + switch (cmd_parser.get_algorithm()) + { + case AESNI_AES128: + aesni::aes::from_string(algorithm_params.aes128_key, args.front()); + break; + + case AESNI_AES192: + aesni::aes::from_string(algorithm_params.aes192_key, args.front()); + break; + + case AESNI_AES256: + aesni::aes::from_string(algorithm_params.aes256_key, args.front()); + break; + } + + args.pop_front(); + + AesNI_BoxBlock iv; + AesNI_BoxBlock* iv_ptr = nullptr; + + switch (cmd_parser.get_mode()) + { + case AESNI_ECB: + break; + + case AESNI_CBC: + case AESNI_CFB: + case AESNI_OFB: + case AESNI_CTR: + if (args.empty()) + { + cmd_parser.print_usage(); + return 1; + } + aesni::aes::from_string(iv.aes_block, args.front()); + iv_ptr = &iv; + args.pop_front(); + break; + } + + if (args.size() != 2) + { + cmd_parser.print_usage(); + return 1; + } + + const auto src_path = args[0]; + const auto dest_path = args[1]; + + const auto src_buf = read_file(src_path); + + const auto bmp_header = reinterpret_cast(src_buf.data()); + + const auto header_size = bmp_header->bfOffBits; + const auto cipherpixels = src_buf.data() + header_size; + const auto cipherpixels_size = src_buf.size() - header_size; + + AesNI_Box box; + + aesni_box_init( + &box, + cmd_parser.get_algorithm(), + &algorithm_params, + cmd_parser.get_mode(), + iv_ptr, + aesni::ErrorDetailsThrowsInDestructor()); + + std::size_t pixels_size; + + aesni_box_decrypt_buffer( + &box, + cipherpixels, + cipherpixels_size, + nullptr, + &pixels_size, + aesni::ErrorDetailsThrowsInDestructor()); + + std::vector dest_buf; + dest_buf.resize(header_size + pixels_size); + std::memcpy(dest_buf.data(), src_buf.data(), header_size); + + aesni_box_decrypt_buffer( + &box, + cipherpixels, + cipherpixels_size, + dest_buf.data() + header_size, + &pixels_size, + aesni::ErrorDetailsThrowsInDestructor()); + + dest_buf.resize(header_size + pixels_size); + write_file(dest_path, dest_buf); + + return 0; + } + catch (const boost::program_options::error& e) + { + std::cerr << "Usage error: " << e.what() << "\n"; + return 1; + } + catch (const aesni::Error& e) + { + std::cerr << e; + return 1; + } + catch (const std::exception& e) + { + std::cerr << e.what() << "\n"; + return 1; + } +} diff --git a/utils/file/aes_decrypt_file.cpp b/utils/file/aes_decrypt_file.cpp new file mode 100644 index 0000000..e2da979 --- /dev/null +++ b/utils/file/aes_decrypt_file.cpp @@ -0,0 +1,182 @@ +/** + * \file + * \author Egor Tensin + * \date 2015 + * \copyright This file is licensed under the terms of the MIT License. + * See LICENSE.txt for details. + */ + +#include "aes_common.hpp" + +#include + +#include + +#include + +#include + +#include +#include +#include +#include +#include +#include + +namespace +{ + std::ifstream::pos_type get_file_size(const std::string& path) + { + std::ifstream ifs; + ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); + ifs.open(path, std::ifstream::binary | std::ifstream::ate); + return ifs.tellg(); + } + + std::vector read_file(const std::string& path) + { + const auto size = static_cast(get_file_size(path)); + + std::ifstream ifs; + ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); + ifs.open(path, std::ifstream::binary); + + std::vector src_buf; + src_buf.reserve(size); + src_buf.assign(std::istreambuf_iterator(ifs), + std::istreambuf_iterator()); + return src_buf; + } + + void write_file(const std::string& path, const std::vector& src) + { + std::ofstream ofs; + ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit); + ofs.open(path, std::ofstream::binary); + ofs.write(src.data(), src.size()); + } +} + +int main(int argc, char** argv) +{ + try + { + CommandLineParser cmd_parser("aes_encrypt_file.exe"); + + if (!cmd_parser.parse_options(argc, argv)) + return 0; + + auto args = cmd_parser.get_args(); + + if (args.empty()) + { + cmd_parser.print_usage(); + return 1; + } + + AesNI_BoxAlgorithmParams algorithm_params; + + switch (cmd_parser.get_algorithm()) + { + case AESNI_AES128: + aesni::aes::from_string(algorithm_params.aes128_key, args.front()); + break; + + case AESNI_AES192: + aesni::aes::from_string(algorithm_params.aes192_key, args.front()); + break; + + case AESNI_AES256: + aesni::aes::from_string(algorithm_params.aes256_key, args.front()); + break; + } + + args.pop_front(); + + AesNI_BoxBlock iv; + AesNI_BoxBlock* iv_ptr = nullptr; + + switch (cmd_parser.get_mode()) + { + case AESNI_ECB: + break; + + case AESNI_CBC: + case AESNI_CFB: + case AESNI_OFB: + case AESNI_CTR: + if (args.empty()) + { + cmd_parser.print_usage(); + return 1; + } + aesni::aes::from_string(iv.aes_block, args.front()); + iv_ptr = &iv; + args.pop_front(); + break; + } + + if (args.size() != 2) + { + cmd_parser.print_usage(); + return 1; + } + + const auto src_path = args[0]; + const auto dest_path = args[1]; + + const auto src_buf = read_file(src_path); + + AesNI_Box box; + + aesni_box_init( + &box, + cmd_parser.get_algorithm(), + &algorithm_params, + cmd_parser.get_mode(), + iv_ptr, + aesni::ErrorDetailsThrowsInDestructor()); + + std::size_t dest_size; + + aesni_box_decrypt_buffer( + &box, + src_buf.data(), + src_buf.size(), + nullptr, + &dest_size, + aesni::ErrorDetailsThrowsInDestructor()); + + std::vector dest_buf; + dest_buf.resize(dest_size); + + aesni_box_decrypt_buffer( + &box, + src_buf.data(), + src_buf.size(), + dest_buf.data(), + &dest_size, + aesni::ErrorDetailsThrowsInDestructor()); + + dest_buf.resize(dest_size); + + write_file(dest_path, dest_buf); + + return 0; + } + catch (const boost::program_options::error& e) + { + std::cerr << "Usage error: " << e.what() << "\n"; + return 1; + } + catch (const aesni::Error& e) + { + std::cerr << e; + return 1; + } + catch (const std::exception& e) + { + std::cerr << e.what() << "\n"; + return 1; + } +} diff --git a/utils/file/aes_encrypt_bmp.cpp b/utils/file/aes_encrypt_bmp.cpp new file mode 100644 index 0000000..cf55b0b --- /dev/null +++ b/utils/file/aes_encrypt_bmp.cpp @@ -0,0 +1,190 @@ +/** + * \file + * \author Egor Tensin + * \date 2015 + * \copyright This file is licensed under the terms of the MIT License. + * See LICENSE.txt for details. + */ + +#include "aes_common.hpp" + +#include + +#include + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include + +namespace +{ + std::ifstream::pos_type get_file_size(const std::string& path) + { + std::ifstream ifs; + ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); + ifs.open(path, std::ifstream::binary | std::ifstream::ate); + return ifs.tellg(); + } + + std::vector read_file(const std::string& path) + { + const auto size = static_cast(get_file_size(path)); + + std::ifstream ifs; + ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); + ifs.open(path, std::ifstream::binary); + + std::vector src_buf; + src_buf.reserve(size); + src_buf.assign(std::istreambuf_iterator(ifs), + std::istreambuf_iterator()); + return src_buf; + } + + void write_file(const std::string& path, const std::vector& src) + { + std::ofstream ofs; + ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit); + ofs.open(path, std::ofstream::binary); + ofs.write(src.data(), src.size()); + } +} + +int main(int argc, char** argv) +{ + try + { + CommandLineParser cmd_parser("aes_encrypt_bmp.exe"); + + if (!cmd_parser.parse_options(argc, argv)) + return 0; + + auto args = cmd_parser.get_args(); + + if (args.empty()) + { + cmd_parser.print_usage(); + return 1; + } + + AesNI_BoxAlgorithmParams algorithm_params; + + switch (cmd_parser.get_algorithm()) + { + case AESNI_AES128: + aesni::aes::from_string(algorithm_params.aes128_key, args.front()); + break; + + case AESNI_AES192: + aesni::aes::from_string(algorithm_params.aes192_key, args.front()); + break; + + case AESNI_AES256: + aesni::aes::from_string(algorithm_params.aes256_key, args.front()); + break; + } + + args.pop_front(); + + AesNI_BoxBlock iv; + AesNI_BoxBlock* iv_ptr = nullptr; + + switch (cmd_parser.get_mode()) + { + case AESNI_ECB: + break; + + case AESNI_CBC: + case AESNI_CFB: + case AESNI_OFB: + case AESNI_CTR: + if (args.empty()) + { + cmd_parser.print_usage(); + return 1; + } + aesni::aes::from_string(iv.aes_block, args.front()); + iv_ptr = &iv; + args.pop_front(); + break; + } + + if (args.size() != 2) + { + cmd_parser.print_usage(); + return 1; + } + + const auto src_path = args[0]; + const auto dest_path = args[1]; + + const auto src_buf = read_file(src_path); + + const auto bmp_header = reinterpret_cast(src_buf.data()); + + const auto header_size = bmp_header->bfOffBits; + const auto pixels = src_buf.data() + header_size; + const auto pixels_size = src_buf.size() - header_size; + + AesNI_Box box; + + aesni_box_init( + &box, + cmd_parser.get_algorithm(), + &algorithm_params, + cmd_parser.get_mode(), + iv_ptr, + aesni::ErrorDetailsThrowsInDestructor()); + + std::size_t cipherpixels_size; + + aesni_box_encrypt_buffer( + &box, + pixels, + pixels_size, + nullptr, + &cipherpixels_size, + aesni::ErrorDetailsThrowsInDestructor()); + + std::vector dest_buf; + dest_buf.resize(header_size + cipherpixels_size); + std::memcpy(dest_buf.data(), src_buf.data(), header_size); + + aesni_box_encrypt_buffer( + &box, + pixels, + pixels_size, + dest_buf.data() + header_size, + &cipherpixels_size, + aesni::ErrorDetailsThrowsInDestructor()); + + write_file(dest_path, dest_buf); + + return 0; + } + catch (const boost::program_options::error& e) + { + std::cerr << "Usage error: " << e.what() << "\n"; + return 1; + } + catch (const aesni::Error& e) + { + std::cerr << e; + return 1; + } + catch (const std::exception& e) + { + std::cerr << e.what() << "\n"; + return 1; + } +} diff --git a/utils/file/aes_encrypt_file.cpp b/utils/file/aes_encrypt_file.cpp new file mode 100644 index 0000000..ff6753f --- /dev/null +++ b/utils/file/aes_encrypt_file.cpp @@ -0,0 +1,182 @@ +/** + * \file + * \author Egor Tensin + * \date 2015 + * \copyright This file is licensed under the terms of the MIT License. + * See LICENSE.txt for details. + */ + +#include "aes_common.hpp" + +#include + +#include + +#include + +#include + +#include +#include +#include +#include +#include +#include + +namespace +{ + std::ifstream::pos_type get_file_size(const std::string& path) + { + std::ifstream ifs; + ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); + ifs.open(path, std::ifstream::binary | std::ifstream::ate); + return ifs.tellg(); + } + + std::vector read_file(const std::string& path) + { + const auto size = static_cast(get_file_size(path)); + + std::ifstream ifs; + ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); + ifs.open(path, std::ifstream::binary); + + std::vector src_buf; + src_buf.reserve(size); + src_buf.assign(std::istreambuf_iterator(ifs), + std::istreambuf_iterator()); + return src_buf; + } + + void write_file(const std::string& path, const std::vector& src) + { + std::ofstream ofs; + ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit); + ofs.open(path, std::ofstream::binary); + ofs.write(src.data(), src.size()); + } +} + +int main(int argc, char** argv) +{ + try + { + CommandLineParser cmd_parser("aes_encrypt_file.exe"); + + if (!cmd_parser.parse_options(argc, argv)) + return 0; + + auto args = cmd_parser.get_args(); + + if (args.empty()) + { + cmd_parser.print_usage(); + return 1; + } + + AesNI_BoxAlgorithmParams algorithm_params; + + switch (cmd_parser.get_algorithm()) + { + case AESNI_AES128: + aesni::aes::from_string(algorithm_params.aes128_key, args.front()); + break; + + case AESNI_AES192: + aesni::aes::from_string(algorithm_params.aes192_key, args.front()); + break; + + case AESNI_AES256: + aesni::aes::from_string(algorithm_params.aes256_key, args.front()); + break; + } + + args.pop_front(); + + AesNI_BoxBlock iv; + AesNI_BoxBlock* iv_ptr = nullptr; + + switch (cmd_parser.get_mode()) + { + case AESNI_ECB: + break; + + case AESNI_CBC: + case AESNI_CFB: + case AESNI_OFB: + case AESNI_CTR: + if (args.empty()) + { + cmd_parser.print_usage(); + return 1; + } + aesni::aes::from_string(iv.aes_block, args.front()); + iv_ptr = &iv; + args.pop_front(); + break; + } + + if (args.size() != 2) + { + cmd_parser.print_usage(); + return 1; + } + + const auto src_path = args[0]; + const auto dest_path = args[1]; + + const auto src_buf = read_file(src_path); + + AesNI_Box box; + + aesni_box_init( + &box, + cmd_parser.get_algorithm(), + &algorithm_params, + cmd_parser.get_mode(), + iv_ptr, + aesni::ErrorDetailsThrowsInDestructor()); + + std::size_t dest_size; + + aesni_box_encrypt_buffer( + &box, + src_buf.data(), + src_buf.size(), + nullptr, + &dest_size, + aesni::ErrorDetailsThrowsInDestructor()); + + std::vector dest_buf; + dest_buf.resize(dest_size); + + aesni_box_encrypt_buffer( + &box, + src_buf.data(), + src_buf.size(), + dest_buf.data(), + &dest_size, + aesni::ErrorDetailsThrowsInDestructor()); + + dest_buf.resize(dest_size); + + write_file(dest_path, dest_buf); + + return 0; + } + catch (const boost::program_options::error& e) + { + std::cerr << "Usage error: " << e.what() << "\n"; + return 1; + } + catch (const aesni::Error& e) + { + std::cerr << e; + return 1; + } + catch (const std::exception& e) + { + std::cerr << e.what() << "\n"; + return 1; + } +} diff --git a/utils/file/bmp/butterfly.bmp b/utils/file/bmp/butterfly.bmp new file mode 100644 index 0000000..105a55a Binary files /dev/null and b/utils/file/bmp/butterfly.bmp differ diff --git a/utils/file/bmp/cipherfly_cbc.bmp b/utils/file/bmp/cipherfly_cbc.bmp new file mode 100644 index 0000000..664b557 Binary files /dev/null and b/utils/file/bmp/cipherfly_cbc.bmp differ diff --git a/utils/file/bmp/cipherfly_ecb.bmp b/utils/file/bmp/cipherfly_ecb.bmp new file mode 100644 index 0000000..78de9a8 Binary files /dev/null and b/utils/file/bmp/cipherfly_ecb.bmp differ diff --git a/utils/file/cxx/CMakeLists.txt b/utils/file/cxx/CMakeLists.txt deleted file mode 100644 index 75895a0..0000000 --- a/utils/file/cxx/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -find_package(Boost REQUIRED COMPONENTS program_options) - -add_executable(util_aes_encrypt_file aes_encrypt_file.cpp aes_common.hpp) -target_include_directories(util_aes_encrypt_file PRIVATE ${Boost_INCLUDE_DIRS}) -target_link_libraries(util_aes_encrypt_file libaesni libaesnixx ${Boost_LIBRARIES}) -set_target_properties(util_aes_encrypt_file PROPERTIES OUTPUT_NAME aes_encrypt_file) - -add_executable(util_aes_decrypt_file aes_decrypt_file.cpp aes_common.hpp) -target_include_directories(util_aes_decrypt_file PRIVATE ${Boost_INCLUDE_DIRS}) -target_link_libraries(util_aes_decrypt_file libaesni libaesnixx ${Boost_LIBRARIES}) -set_target_properties(util_aes_decrypt_file PROPERTIES OUTPUT_NAME aes_decrypt_file) - -add_executable(util_aes_encrypt_bmp aes_encrypt_bmp.cpp aes_common.hpp) -target_include_directories(util_aes_encrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS}) -target_link_libraries(util_aes_encrypt_bmp libaesni libaesnixx ${Boost_LIBRARIES}) -set_target_properties(util_aes_encrypt_bmp PROPERTIES OUTPUT_NAME aes_encrypt_bmp) - -add_executable(util_aes_decrypt_bmp aes_decrypt_bmp.cpp aes_common.hpp) -target_include_directories(util_aes_decrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS}) -target_link_libraries(util_aes_decrypt_bmp libaesni libaesnixx ${Boost_LIBRARIES}) -set_target_properties(util_aes_decrypt_bmp PROPERTIES OUTPUT_NAME aes_decrypt_bmp) diff --git a/utils/file/cxx/README.md b/utils/file/cxx/README.md deleted file mode 100644 index bf79cb2..0000000 --- a/utils/file/cxx/README.md +++ /dev/null @@ -1,87 +0,0 @@ -# File encryption utilities - -Here are a couple of useful file encryption utilities built on top of the library. -Each of the utilities accepts `--help` flag, which can be used to examine utility's usage info. - -The included utilities are: - -* [file encryption](#file-encryption) utilities, -* and [bitmap encryption](#bitmap-encryption) utilities. - -On older CPUs, you can run the utilities [using Intel SDE](https://github.com/egor-tensin/aesni#running-on-older-cpus). - -## File encryption - -### aes_encrypt_file.exe - -Encrypts a file using AES-128/192/256 in the specified mode of operation. - -#### Usage examples - -For example, to encrypt the plaintext `input.txt` - -* using AES-128 in ECB mode -* with key `0x11111111111111111111111111111111` -* and write the ciphertext to `output.txt`, - -run: - - aes_encrypt_file.exe -a aes128 -m ecb 11111111111111111111111111111111 input.txt output.txt - -To encrypt the plaintext from `input.txt` - -* using AES-192 in OFB mode -* with key `0x111111111111111111111111111111111111111111111111` -* and initialization vector `0x22222222222222222222222222222222` -* and write the ciphertext to `output.txt`: - -run - - aes_encrypt_file.exe -a aes192 -m ofb 111111111111111111111111111111111111111111111111 22222222222222222222222222222222 input.txt output.txt - -### aes_decrypt_file.exe - -Decrypts a file using AES-128/192/256 in the specified mode of operation. - -#### Usage examples - -To decrypt the ciphertext from `input.txt` - -* using AES-128 in ECB mode -* with key `0x11111111111111111111111111111111` -* and write the plaintext to `output.txt`, - -run - - aes_decrypt_file.exe -a aes128 -m ecb 11111111111111111111111111111111 input.txt output.txt - -To decrypt the ciphertext from `input.txt` - -* using AES-192 in OFB mode -* with key `0x111111111111111111111111111111111111111111111111` -* and initialization vector `0x22222222222222222222222222222222` -* and write the plaintext to `output.txt`, - -run - - aes_decrypt_file.exe -a aes192 -m ofb 111111111111111111111111111111111111111111111111 22222222222222222222222222222222 input.txt output.txt - -## Bitmap encryption - -These utilities were developed primarily to demonstrate the drawbacks of using ECB mode -(namely, the fact that identical plaintext blocks get mapped to identical ciphertext blocks). -This can be explicitly shown using 8-bit-per-pixel bitmaps: - -Plaintext BMP | Encrypted in ECB mode | Encrypted in CBC mode -------------- | --------------------- | --------------------- -![Plaintext butterfly](bmp/butterfly.bmp?raw=true) | ![Ciphertext butterfly in ECB mode](bmp/cipherfly_ecb.bmp?raw=true) | ![Ciphertext butterfly in CBC mode](bmp/cipherfly_cbc.bmp?raw=true) - -### aes_encrypt_bmp.exe - -Encrypts the pixels in a BMP image file, preserving the header. -The usage is the same as for [aes_encrypt_file.exe](#aes_encrypt_fileexe). - -### aes_decrypt_bmp.exe - -Decrypts the pixels in a BMP image file, preserving the header. -The usage is the same as for [aes_decrypt_file.exe](#aes_decrypt_fileexe). diff --git a/utils/file/cxx/aes_common.hpp b/utils/file/cxx/aes_common.hpp deleted file mode 100644 index 28e16df..0000000 --- a/utils/file/cxx/aes_common.hpp +++ /dev/null @@ -1,132 +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 - -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& program_name) - : m_program_name(program_name) - , m_options("Options") - { } - - bool parse_options(int argc, char** argv) - { - namespace po = boost::program_options; - - m_options.add_options() - ("help,h", "show this message and exit") - ("mode,m", po::value(&m_mode)->required(), "set mode of operation") - ("algorithm,a", po::value(&m_algorithm)->required(), "set algorithm"); - - po::options_description hidden_options; - hidden_options.add_options() - ("positional", po::value>(&m_args)); - - po::options_description all_options; - all_options.add(m_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: " << m_program_name << " [OPTIONS...] KEY [IV] SRC_PATH DEST_PATH\n"; - std::cout << m_options << "\n"; - } - - aesni::Mode get_mode() const - { - return m_mode; - } - - aesni::Algorithm get_algorithm() const - { - return m_algorithm; - } - - std::deque get_args() - { - return { std::make_move_iterator(m_args.begin()), std::make_move_iterator(m_args.end()) }; - } - - private: - const std::string m_program_name; - boost::program_options::options_description m_options; - - aesni::Mode m_mode; - aesni::Algorithm m_algorithm; - std::vector m_args; - }; -} diff --git a/utils/file/cxx/aes_decrypt_bmp.cpp b/utils/file/cxx/aes_decrypt_bmp.cpp deleted file mode 100644 index 85dffe5..0000000 --- a/utils/file/cxx/aes_decrypt_bmp.cpp +++ /dev/null @@ -1,191 +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. - */ - -#include "aes_common.hpp" - -#include - -#include - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include - -namespace -{ - std::ifstream::pos_type get_file_size(const std::string& path) - { - std::ifstream ifs; - ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - ifs.open(path, std::ifstream::binary | std::ifstream::ate); - return ifs.tellg(); - } - - std::vector read_file(const std::string& path) - { - const auto size = static_cast(get_file_size(path)); - - std::ifstream ifs; - ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - ifs.open(path, std::ifstream::binary); - - std::vector src_buf; - src_buf.reserve(size); - src_buf.assign(std::istreambuf_iterator(ifs), - std::istreambuf_iterator()); - return src_buf; - } - - void write_file(const std::string& path, const std::vector& src) - { - std::ofstream ofs; - ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit); - ofs.open(path, std::ofstream::binary); - ofs.write(src.data(), src.size()); - } -} - -int main(int argc, char** argv) -{ - try - { - CommandLineParser cmd_parser("aes_decrypt_bmp.exe"); - - if (!cmd_parser.parse_options(argc, argv)) - return 0; - - auto args = cmd_parser.get_args(); - - if (args.empty()) - { - cmd_parser.print_usage(); - return 1; - } - - AesNI_BoxAlgorithmParams algorithm_params; - - switch (cmd_parser.get_algorithm()) - { - case AESNI_AES128: - aesni::aes::from_string(algorithm_params.aes128_key, args.front()); - break; - - case AESNI_AES192: - aesni::aes::from_string(algorithm_params.aes192_key, args.front()); - break; - - case AESNI_AES256: - aesni::aes::from_string(algorithm_params.aes256_key, args.front()); - break; - } - - args.pop_front(); - - AesNI_BoxBlock iv; - AesNI_BoxBlock* iv_ptr = nullptr; - - switch (cmd_parser.get_mode()) - { - case AESNI_ECB: - break; - - case AESNI_CBC: - case AESNI_CFB: - case AESNI_OFB: - case AESNI_CTR: - if (args.empty()) - { - cmd_parser.print_usage(); - return 1; - } - aesni::aes::from_string(iv.aes_block, args.front()); - iv_ptr = &iv; - args.pop_front(); - break; - } - - if (args.size() != 2) - { - cmd_parser.print_usage(); - return 1; - } - - const auto src_path = args[0]; - const auto dest_path = args[1]; - - const auto src_buf = read_file(src_path); - - const auto bmp_header = reinterpret_cast(src_buf.data()); - - const auto header_size = bmp_header->bfOffBits; - const auto cipherpixels = src_buf.data() + header_size; - const auto cipherpixels_size = src_buf.size() - header_size; - - AesNI_Box box; - - aesni_box_init( - &box, - cmd_parser.get_algorithm(), - &algorithm_params, - cmd_parser.get_mode(), - iv_ptr, - aesni::ErrorDetailsThrowsInDestructor()); - - std::size_t pixels_size; - - aesni_box_decrypt_buffer( - &box, - cipherpixels, - cipherpixels_size, - nullptr, - &pixels_size, - aesni::ErrorDetailsThrowsInDestructor()); - - std::vector dest_buf; - dest_buf.resize(header_size + pixels_size); - std::memcpy(dest_buf.data(), src_buf.data(), header_size); - - aesni_box_decrypt_buffer( - &box, - cipherpixels, - cipherpixels_size, - dest_buf.data() + header_size, - &pixels_size, - aesni::ErrorDetailsThrowsInDestructor()); - - dest_buf.resize(header_size + pixels_size); - write_file(dest_path, dest_buf); - - return 0; - } - catch (const boost::program_options::error& e) - { - std::cerr << "Usage error: " << e.what() << "\n"; - return 1; - } - catch (const aesni::Error& e) - { - std::cerr << e; - return 1; - } - catch (const std::exception& e) - { - std::cerr << e.what() << "\n"; - return 1; - } -} diff --git a/utils/file/cxx/aes_decrypt_file.cpp b/utils/file/cxx/aes_decrypt_file.cpp deleted file mode 100644 index e2da979..0000000 --- a/utils/file/cxx/aes_decrypt_file.cpp +++ /dev/null @@ -1,182 +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. - */ - -#include "aes_common.hpp" - -#include - -#include - -#include - -#include - -#include -#include -#include -#include -#include -#include - -namespace -{ - std::ifstream::pos_type get_file_size(const std::string& path) - { - std::ifstream ifs; - ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - ifs.open(path, std::ifstream::binary | std::ifstream::ate); - return ifs.tellg(); - } - - std::vector read_file(const std::string& path) - { - const auto size = static_cast(get_file_size(path)); - - std::ifstream ifs; - ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - ifs.open(path, std::ifstream::binary); - - std::vector src_buf; - src_buf.reserve(size); - src_buf.assign(std::istreambuf_iterator(ifs), - std::istreambuf_iterator()); - return src_buf; - } - - void write_file(const std::string& path, const std::vector& src) - { - std::ofstream ofs; - ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit); - ofs.open(path, std::ofstream::binary); - ofs.write(src.data(), src.size()); - } -} - -int main(int argc, char** argv) -{ - try - { - CommandLineParser cmd_parser("aes_encrypt_file.exe"); - - if (!cmd_parser.parse_options(argc, argv)) - return 0; - - auto args = cmd_parser.get_args(); - - if (args.empty()) - { - cmd_parser.print_usage(); - return 1; - } - - AesNI_BoxAlgorithmParams algorithm_params; - - switch (cmd_parser.get_algorithm()) - { - case AESNI_AES128: - aesni::aes::from_string(algorithm_params.aes128_key, args.front()); - break; - - case AESNI_AES192: - aesni::aes::from_string(algorithm_params.aes192_key, args.front()); - break; - - case AESNI_AES256: - aesni::aes::from_string(algorithm_params.aes256_key, args.front()); - break; - } - - args.pop_front(); - - AesNI_BoxBlock iv; - AesNI_BoxBlock* iv_ptr = nullptr; - - switch (cmd_parser.get_mode()) - { - case AESNI_ECB: - break; - - case AESNI_CBC: - case AESNI_CFB: - case AESNI_OFB: - case AESNI_CTR: - if (args.empty()) - { - cmd_parser.print_usage(); - return 1; - } - aesni::aes::from_string(iv.aes_block, args.front()); - iv_ptr = &iv; - args.pop_front(); - break; - } - - if (args.size() != 2) - { - cmd_parser.print_usage(); - return 1; - } - - const auto src_path = args[0]; - const auto dest_path = args[1]; - - const auto src_buf = read_file(src_path); - - AesNI_Box box; - - aesni_box_init( - &box, - cmd_parser.get_algorithm(), - &algorithm_params, - cmd_parser.get_mode(), - iv_ptr, - aesni::ErrorDetailsThrowsInDestructor()); - - std::size_t dest_size; - - aesni_box_decrypt_buffer( - &box, - src_buf.data(), - src_buf.size(), - nullptr, - &dest_size, - aesni::ErrorDetailsThrowsInDestructor()); - - std::vector dest_buf; - dest_buf.resize(dest_size); - - aesni_box_decrypt_buffer( - &box, - src_buf.data(), - src_buf.size(), - dest_buf.data(), - &dest_size, - aesni::ErrorDetailsThrowsInDestructor()); - - dest_buf.resize(dest_size); - - write_file(dest_path, dest_buf); - - return 0; - } - catch (const boost::program_options::error& e) - { - std::cerr << "Usage error: " << e.what() << "\n"; - return 1; - } - catch (const aesni::Error& e) - { - std::cerr << e; - return 1; - } - catch (const std::exception& e) - { - std::cerr << e.what() << "\n"; - return 1; - } -} diff --git a/utils/file/cxx/aes_encrypt_bmp.cpp b/utils/file/cxx/aes_encrypt_bmp.cpp deleted file mode 100644 index cf55b0b..0000000 --- a/utils/file/cxx/aes_encrypt_bmp.cpp +++ /dev/null @@ -1,190 +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. - */ - -#include "aes_common.hpp" - -#include - -#include - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include - -namespace -{ - std::ifstream::pos_type get_file_size(const std::string& path) - { - std::ifstream ifs; - ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - ifs.open(path, std::ifstream::binary | std::ifstream::ate); - return ifs.tellg(); - } - - std::vector read_file(const std::string& path) - { - const auto size = static_cast(get_file_size(path)); - - std::ifstream ifs; - ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - ifs.open(path, std::ifstream::binary); - - std::vector src_buf; - src_buf.reserve(size); - src_buf.assign(std::istreambuf_iterator(ifs), - std::istreambuf_iterator()); - return src_buf; - } - - void write_file(const std::string& path, const std::vector& src) - { - std::ofstream ofs; - ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit); - ofs.open(path, std::ofstream::binary); - ofs.write(src.data(), src.size()); - } -} - -int main(int argc, char** argv) -{ - try - { - CommandLineParser cmd_parser("aes_encrypt_bmp.exe"); - - if (!cmd_parser.parse_options(argc, argv)) - return 0; - - auto args = cmd_parser.get_args(); - - if (args.empty()) - { - cmd_parser.print_usage(); - return 1; - } - - AesNI_BoxAlgorithmParams algorithm_params; - - switch (cmd_parser.get_algorithm()) - { - case AESNI_AES128: - aesni::aes::from_string(algorithm_params.aes128_key, args.front()); - break; - - case AESNI_AES192: - aesni::aes::from_string(algorithm_params.aes192_key, args.front()); - break; - - case AESNI_AES256: - aesni::aes::from_string(algorithm_params.aes256_key, args.front()); - break; - } - - args.pop_front(); - - AesNI_BoxBlock iv; - AesNI_BoxBlock* iv_ptr = nullptr; - - switch (cmd_parser.get_mode()) - { - case AESNI_ECB: - break; - - case AESNI_CBC: - case AESNI_CFB: - case AESNI_OFB: - case AESNI_CTR: - if (args.empty()) - { - cmd_parser.print_usage(); - return 1; - } - aesni::aes::from_string(iv.aes_block, args.front()); - iv_ptr = &iv; - args.pop_front(); - break; - } - - if (args.size() != 2) - { - cmd_parser.print_usage(); - return 1; - } - - const auto src_path = args[0]; - const auto dest_path = args[1]; - - const auto src_buf = read_file(src_path); - - const auto bmp_header = reinterpret_cast(src_buf.data()); - - const auto header_size = bmp_header->bfOffBits; - const auto pixels = src_buf.data() + header_size; - const auto pixels_size = src_buf.size() - header_size; - - AesNI_Box box; - - aesni_box_init( - &box, - cmd_parser.get_algorithm(), - &algorithm_params, - cmd_parser.get_mode(), - iv_ptr, - aesni::ErrorDetailsThrowsInDestructor()); - - std::size_t cipherpixels_size; - - aesni_box_encrypt_buffer( - &box, - pixels, - pixels_size, - nullptr, - &cipherpixels_size, - aesni::ErrorDetailsThrowsInDestructor()); - - std::vector dest_buf; - dest_buf.resize(header_size + cipherpixels_size); - std::memcpy(dest_buf.data(), src_buf.data(), header_size); - - aesni_box_encrypt_buffer( - &box, - pixels, - pixels_size, - dest_buf.data() + header_size, - &cipherpixels_size, - aesni::ErrorDetailsThrowsInDestructor()); - - write_file(dest_path, dest_buf); - - return 0; - } - catch (const boost::program_options::error& e) - { - std::cerr << "Usage error: " << e.what() << "\n"; - return 1; - } - catch (const aesni::Error& e) - { - std::cerr << e; - return 1; - } - catch (const std::exception& e) - { - std::cerr << e.what() << "\n"; - return 1; - } -} diff --git a/utils/file/cxx/aes_encrypt_file.cpp b/utils/file/cxx/aes_encrypt_file.cpp deleted file mode 100644 index ff6753f..0000000 --- a/utils/file/cxx/aes_encrypt_file.cpp +++ /dev/null @@ -1,182 +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. - */ - -#include "aes_common.hpp" - -#include - -#include - -#include - -#include - -#include -#include -#include -#include -#include -#include - -namespace -{ - std::ifstream::pos_type get_file_size(const std::string& path) - { - std::ifstream ifs; - ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - ifs.open(path, std::ifstream::binary | std::ifstream::ate); - return ifs.tellg(); - } - - std::vector read_file(const std::string& path) - { - const auto size = static_cast(get_file_size(path)); - - std::ifstream ifs; - ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit); - ifs.open(path, std::ifstream::binary); - - std::vector src_buf; - src_buf.reserve(size); - src_buf.assign(std::istreambuf_iterator(ifs), - std::istreambuf_iterator()); - return src_buf; - } - - void write_file(const std::string& path, const std::vector& src) - { - std::ofstream ofs; - ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit); - ofs.open(path, std::ofstream::binary); - ofs.write(src.data(), src.size()); - } -} - -int main(int argc, char** argv) -{ - try - { - CommandLineParser cmd_parser("aes_encrypt_file.exe"); - - if (!cmd_parser.parse_options(argc, argv)) - return 0; - - auto args = cmd_parser.get_args(); - - if (args.empty()) - { - cmd_parser.print_usage(); - return 1; - } - - AesNI_BoxAlgorithmParams algorithm_params; - - switch (cmd_parser.get_algorithm()) - { - case AESNI_AES128: - aesni::aes::from_string(algorithm_params.aes128_key, args.front()); - break; - - case AESNI_AES192: - aesni::aes::from_string(algorithm_params.aes192_key, args.front()); - break; - - case AESNI_AES256: - aesni::aes::from_string(algorithm_params.aes256_key, args.front()); - break; - } - - args.pop_front(); - - AesNI_BoxBlock iv; - AesNI_BoxBlock* iv_ptr = nullptr; - - switch (cmd_parser.get_mode()) - { - case AESNI_ECB: - break; - - case AESNI_CBC: - case AESNI_CFB: - case AESNI_OFB: - case AESNI_CTR: - if (args.empty()) - { - cmd_parser.print_usage(); - return 1; - } - aesni::aes::from_string(iv.aes_block, args.front()); - iv_ptr = &iv; - args.pop_front(); - break; - } - - if (args.size() != 2) - { - cmd_parser.print_usage(); - return 1; - } - - const auto src_path = args[0]; - const auto dest_path = args[1]; - - const auto src_buf = read_file(src_path); - - AesNI_Box box; - - aesni_box_init( - &box, - cmd_parser.get_algorithm(), - &algorithm_params, - cmd_parser.get_mode(), - iv_ptr, - aesni::ErrorDetailsThrowsInDestructor()); - - std::size_t dest_size; - - aesni_box_encrypt_buffer( - &box, - src_buf.data(), - src_buf.size(), - nullptr, - &dest_size, - aesni::ErrorDetailsThrowsInDestructor()); - - std::vector dest_buf; - dest_buf.resize(dest_size); - - aesni_box_encrypt_buffer( - &box, - src_buf.data(), - src_buf.size(), - dest_buf.data(), - &dest_size, - aesni::ErrorDetailsThrowsInDestructor()); - - dest_buf.resize(dest_size); - - write_file(dest_path, dest_buf); - - return 0; - } - catch (const boost::program_options::error& e) - { - std::cerr << "Usage error: " << e.what() << "\n"; - return 1; - } - catch (const aesni::Error& e) - { - std::cerr << e; - return 1; - } - catch (const std::exception& e) - { - std::cerr << e.what() << "\n"; - return 1; - } -} diff --git a/utils/file/cxx/bmp/butterfly.bmp b/utils/file/cxx/bmp/butterfly.bmp deleted file mode 100644 index 105a55a..0000000 Binary files a/utils/file/cxx/bmp/butterfly.bmp and /dev/null differ diff --git a/utils/file/cxx/bmp/cipherfly_cbc.bmp b/utils/file/cxx/bmp/cipherfly_cbc.bmp deleted file mode 100644 index 664b557..0000000 Binary files a/utils/file/cxx/bmp/cipherfly_cbc.bmp and /dev/null differ diff --git a/utils/file/cxx/bmp/cipherfly_ecb.bmp b/utils/file/cxx/bmp/cipherfly_ecb.bmp deleted file mode 100644 index 78de9a8..0000000 Binary files a/utils/file/cxx/bmp/cipherfly_ecb.bmp and /dev/null differ -- cgit v1.2.3