factoring out AES-specific stuff

1 files changed, 4 insertions, 4 deletions

diff --git a/test/decrypt_block_aes.cpp b/test/decrypt_block_aes.cpp
index 6cb9ce7..e0c289a 100644
--- a/test/decrypt_block_aes.cpp
+++ b/test/decrypt_block_aes.cpp
@@ -35,10 +35,10 @@ int main(int argc, char** argv)
                 exit_with_usage();
 
             AesNI_BoxAlgorithmParams algorithm_params;
-            aesni::from_string(algorithm_params.aes128_key, argv[0]);
+            aesni::aes::from_string(algorithm_params.aes128_key, argv[0]);
 
             AesNI_BoxBlock iv;
-            aesni::from_string(iv.aes_block, argv[1]);
+            aesni::aes::from_string(iv.aes_block, argv[1]);
 
             AesNI_Box box;
             aesni_box_init(
@@ -55,7 +55,7 @@ int main(int argc, char** argv)
                     break;
 
                 AesNI_BoxBlock ciphertext;
-                aesni::from_string(ciphertext.aes_block, argv[0]);
+                aesni::aes::from_string(ciphertext.aes_block, argv[0]);
 
                 AesNI_BoxBlock plaintext;
                 aesni_box_decrypt(
@@ -64,7 +64,7 @@ int main(int argc, char** argv)
                     &plaintext,
                     aesni::ErrorDetailsThrowsInDestructor());
 
-                std::cout << plaintext.aes_block << "\n";
+                std::cout << aesni::aes::to_string(plaintext.aes_block) << "\n";
             }
         }