aesxx: factor out key stuff into key.hpp

6 files changed, 6 insertions, 18 deletions

diff --git a/aesxx/utils/decrypt_block.cpp b/aesxx/utils/decrypt_block.cpp
index 9f9ee2a..d1dd059 100644
--- a/aesxx/utils/decrypt_block.cpp
+++ b/aesxx/utils/decrypt_block.cpp
@@ -23,9 +23,7 @@ void decrypt_blocks(
     const BlockSettings::Input& input,
     bool verbose = false
 ) {
-    aes::Box::Key key;
-    aes::Box::parse_key(key, algorithm, input.get_key());
-
+    const auto key = aes::Key::parse(input.get_key(), algorithm);
     aes::Box box{algorithm, key, mode, input.get_iv(), verbose};
 
     for (const auto& ciphertext : input.get_blocks()) {
diff --git a/aesxx/utils/decrypt_bmp.cpp b/aesxx/utils/decrypt_bmp.cpp
index e78adfc..384c32d 100644
--- a/aesxx/utils/decrypt_bmp.cpp
+++ b/aesxx/utils/decrypt_bmp.cpp
@@ -33,9 +33,7 @@ void decrypt_bmp(
 void decrypt_bmp(const FileSettings& settings) {
     const auto algorithm = settings.get_algorithm();
     const auto mode = settings.get_mode();
-
-    aes::Box::Key key;
-    aes::Box::parse_key(key, algorithm, settings.get_key());
+    const auto key = aes::Key::parse(settings.get_key(), algorithm);
 
     aes::Box box{algorithm, key, mode, settings.get_iv()};
     decrypt_bmp(box, settings.get_input_path(), settings.get_output_path());
diff --git a/aesxx/utils/decrypt_file.cpp b/aesxx/utils/decrypt_file.cpp
index 6419c35..811fe51 100644
--- a/aesxx/utils/decrypt_file.cpp
+++ b/aesxx/utils/decrypt_file.cpp
@@ -31,9 +31,7 @@ void decrypt_file(
 void decrypt_file(const FileSettings& settings) {
     const auto algorithm = settings.get_algorithm();
     const auto mode = settings.get_mode();
-
-    aes::Box::Key key;
-    aes::Box::parse_key(key, algorithm, settings.get_key());
+    const auto key = aes::Key::parse(settings.get_key(), algorithm);
 
     aes::Box box{algorithm, key, mode, settings.get_iv()};
     decrypt_file(box, settings.get_input_path(), settings.get_output_path());
diff --git a/aesxx/utils/encrypt_block.cpp b/aesxx/utils/encrypt_block.cpp
index 5f84922..acb9191 100644
--- a/aesxx/utils/encrypt_block.cpp
+++ b/aesxx/utils/encrypt_block.cpp
@@ -23,9 +23,7 @@ void encrypt_blocks(
     const BlockSettings::Input& input,
     bool verbose = false
 ) {
-    aes::Box::Key key;
-    aes::Box::parse_key(key, algorithm, input.get_key());
-
+    const auto key = aes::Key::parse(input.get_key(), algorithm);
     aes::Box box{algorithm, key, mode, input.get_iv(), verbose};
 
     for (const auto& plaintext : input.get_blocks()) {
diff --git a/aesxx/utils/encrypt_bmp.cpp b/aesxx/utils/encrypt_bmp.cpp
index 858755c..e140d70 100644
--- a/aesxx/utils/encrypt_bmp.cpp
+++ b/aesxx/utils/encrypt_bmp.cpp
@@ -31,9 +31,7 @@ void encrypt_bmp(
 void encrypt_bmp(const FileSettings& settings) {
     const auto algorithm = settings.get_algorithm();
     const auto mode = settings.get_mode();
-
-    aes::Box::Key key;
-    aes::Box::parse_key(key, algorithm, settings.get_key());
+    const auto key = aes::Key::parse(settings.get_key(), algorithm);
 
     aes::Box box{algorithm, key, mode, settings.get_iv()};
     encrypt_bmp(box, settings.get_input_path(), settings.get_output_path());
diff --git a/aesxx/utils/encrypt_file.cpp b/aesxx/utils/encrypt_file.cpp
index 7be07ad..c94f6ee 100644
--- a/aesxx/utils/encrypt_file.cpp
+++ b/aesxx/utils/encrypt_file.cpp
@@ -31,9 +31,7 @@ void encrypt_file(
 void encrypt_file(const FileSettings& settings) {
     const auto algorithm = settings.get_algorithm();
     const auto mode = settings.get_mode();
-
-    aes::Box::Key key;
-    aes::Box::parse_key(key, algorithm, settings.get_key());
+    const auto key = aes::Key::parse(settings.get_key(), algorithm);
 
     aes::Box box{algorithm, key, mode, settings.get_iv()};
     encrypt_file(box, settings.get_input_path(), settings.get_output_path());