'aesni' -> 'aes'

1 files changed, 75 insertions, 75 deletions

diff --git a/cxx/include/aesxx/mode.hpp b/cxx/include/aesxx/mode.hpp
index 706c4b5..70f16c6 100644
--- a/cxx/include/aesxx/mode.hpp
+++ b/cxx/include/aesxx/mode.hpp
@@ -12,16 +12,16 @@
 
 #include <type_traits>
 
-namespace aesni
+namespace aes
 {
-    typedef AesNI_Mode Mode;
+    typedef AES_Mode Mode;
 
     template <Mode mode>
     struct ModeRequiresInitializationVector : public std::true_type
     { };
 
     template <>
-    struct ModeRequiresInitializationVector<AESNI_ECB> : public std::false_type
+    struct ModeRequiresInitializationVector<AES_ECB> : public std::false_type
     { };
 
     template <Mode mode>
@@ -30,127 +30,127 @@ namespace aesni
 
     inline bool mode_requires_initialization_vector(Mode mode)
     {
-        return mode != AESNI_ECB;
+        return mode != AES_ECB;
     }
 
     template <>
-    struct ModeUsesEncryptionKeysOnly<AESNI_ECB> : public std::false_type
+    struct ModeUsesEncryptionKeysOnly<AES_ECB> : public std::false_type
     { };
 
     template <>
-    struct ModeUsesEncryptionKeysOnly<AESNI_CBC> : public std::false_type
+    struct ModeUsesEncryptionKeysOnly<AES_CBC> : public std::false_type
     { };
 
     inline bool mode_uses_encryption_keys_only(Mode mode)
     {
-        return mode != AESNI_ECB && mode != AESNI_CBC;
+        return mode != AES_ECB && mode != AES_CBC;
     }
 
-#define AESNIXX_ENCRYPT_BLOCK_ECB(prefix) \
+#define AESXX_ENCRYPT_BLOCK_ECB(prefix) \
     template <> \
-    inline void encrypt_block<AESNI_## prefix, AESNI_ECB>( \
-        const typename Types<AESNI_## prefix>::Block& plaintext, \
-        const typename Types<AESNI_## prefix>::RoundKeys& encryption_keys, \
-        typename Types<AESNI_## prefix>::Block& ciphertext) \
+    inline void encrypt_block<AES_## prefix, AES_ECB>( \
+        const typename Types<AES_## prefix>::Block& plaintext, \
+        const typename Types<AES_## prefix>::RoundKeys& encryption_keys, \
+        typename Types<AES_## prefix>::Block& ciphertext) \
     { \
-        ciphertext = aesni_## prefix ##_encrypt_block_ECB(plaintext, &encryption_keys); \
+        ciphertext = aes_## prefix ##_encrypt_block_ECB(plaintext, &encryption_keys); \
     }
 
-#define AESNIXX_DECRYPT_BLOCK_ECB(prefix) \
+#define AESXX_DECRYPT_BLOCK_ECB(prefix) \
     template <> \
-    inline void decrypt_block<AESNI_## prefix, AESNI_ECB>( \
-        const typename Types<AESNI_## prefix>::Block& ciphertext, \
-        const typename Types<AESNI_## prefix>::RoundKeys& decryption_keys, \
-        typename Types<AESNI_## prefix>::Block& plaintext) \
+    inline void decrypt_block<AES_## prefix, AES_ECB>( \
+        const typename Types<AES_## prefix>::Block& ciphertext, \
+        const typename Types<AES_## prefix>::RoundKeys& decryption_keys, \
+        typename Types<AES_## prefix>::Block& plaintext) \
     { \
-        plaintext = aesni_## prefix ##_decrypt_block_ECB(ciphertext, &decryption_keys); \
+        plaintext = aes_## prefix ##_decrypt_block_ECB(ciphertext, &decryption_keys); \
     }
 
-#define AESNIXX_ENCRYPT_BLOCK_CBC(prefix) \
+#define AESXX_ENCRYPT_BLOCK_CBC(prefix) \
     template <> \
-    inline void encrypt_block<AESNI_## prefix, AESNI_CBC>( \
-        const typename Types<AESNI_## prefix>::Block& plaintext, \
-        const typename Types<AESNI_## prefix>::RoundKeys& encryption_keys, \
-        typename Types<AESNI_## prefix>::Block& iv, \
-        typename Types<AESNI_## prefix>::Block& ciphertext) \
+    inline void encrypt_block<AES_## prefix, AES_CBC>( \
+        const typename Types<AES_## prefix>::Block& plaintext, \
+        const typename Types<AES_## prefix>::RoundKeys& encryption_keys, \
+        typename Types<AES_## prefix>::Block& iv, \
+        typename Types<AES_## prefix>::Block& ciphertext) \
     { \
-        ciphertext = aesni_## prefix ##_encrypt_block_CBC(plaintext, &encryption_keys, iv, &iv); \
+        ciphertext = aes_## prefix ##_encrypt_block_CBC(plaintext, &encryption_keys, iv, &iv); \
     }
 
-#define AESNIXX_DECRYPT_BLOCK_CBC(prefix) \
+#define AESXX_DECRYPT_BLOCK_CBC(prefix) \
     template <> \
-    inline void decrypt_block<AESNI_## prefix, AESNI_CBC>( \
-        const typename Types<AESNI_## prefix>::Block& ciphertext, \
-        const typename Types<AESNI_## prefix>::RoundKeys& decryption_keys, \
-        typename Types<AESNI_## prefix>::Block& iv, \
-        typename Types<AESNI_## prefix>::Block& plaintext) \
+    inline void decrypt_block<AES_## prefix, AES_CBC>( \
+        const typename Types<AES_## prefix>::Block& ciphertext, \
+        const typename Types<AES_## prefix>::RoundKeys& decryption_keys, \
+        typename Types<AES_## prefix>::Block& iv, \
+        typename Types<AES_## prefix>::Block& plaintext) \
     { \
-        plaintext = aesni_## prefix ##_decrypt_block_CBC(ciphertext, &decryption_keys, iv, &iv); \
+        plaintext = aes_## prefix ##_decrypt_block_CBC(ciphertext, &decryption_keys, iv, &iv); \
     }
 
-#define AESNIXX_ENCRYPT_BLOCK_CFB(prefix) \
+#define AESXX_ENCRYPT_BLOCK_CFB(prefix) \
     template <> \
-    inline void encrypt_block<AESNI_## prefix, AESNI_CFB>( \
-        const typename Types<AESNI_## prefix>::Block& plaintext, \
-        const typename Types<AESNI_## prefix>::RoundKeys& encryption_keys, \
-        typename Types<AESNI_## prefix>::Block& iv, \
-        typename Types<AESNI_## prefix>::Block& ciphertext) \
+    inline void encrypt_block<AES_## prefix, AES_CFB>( \
+        const typename Types<AES_## prefix>::Block& plaintext, \
+        const typename Types<AES_## prefix>::RoundKeys& encryption_keys, \
+        typename Types<AES_## prefix>::Block& iv, \
+        typename Types<AES_## prefix>::Block& ciphertext) \
     { \
-        ciphertext = aesni_## prefix ##_encrypt_block_CFB(plaintext, &encryption_keys, iv, &iv); \
+        ciphertext = aes_## prefix ##_encrypt_block_CFB(plaintext, &encryption_keys, iv, &iv); \
     }
 
-#define AESNIXX_DECRYPT_BLOCK_CFB(prefix) \
+#define AESXX_DECRYPT_BLOCK_CFB(prefix) \
     template <> \
-    inline void decrypt_block<AESNI_## prefix, AESNI_CFB>( \
-        const typename Types<AESNI_## prefix>::Block& ciphertext, \
-        const typename Types<AESNI_## prefix>::RoundKeys& encryption_keys, \
-        typename Types<AESNI_## prefix>::Block& iv, \
-        typename Types<AESNI_## prefix>::Block& plaintext) \
+    inline void decrypt_block<AES_## prefix, AES_CFB>( \
+        const typename Types<AES_## prefix>::Block& ciphertext, \
+        const typename Types<AES_## prefix>::RoundKeys& encryption_keys, \
+        typename Types<AES_## prefix>::Block& iv, \
+        typename Types<AES_## prefix>::Block& plaintext) \
     { \
-        plaintext = aesni_## prefix ##_decrypt_block_CFB(ciphertext, &encryption_keys, iv, &iv); \
+        plaintext = aes_## prefix ##_decrypt_block_CFB(ciphertext, &encryption_keys, iv, &iv); \
     }
 
-#define AESNIXX_ENCRYPT_BLOCK_OFB(prefix) \
+#define AESXX_ENCRYPT_BLOCK_OFB(prefix) \
     template <> \
-    inline void encrypt_block<AESNI_## prefix, AESNI_OFB>( \
-        const typename Types<AESNI_## prefix>::Block& plaintext, \
-        const typename Types<AESNI_## prefix>::RoundKeys& encryption_keys, \
-        typename Types<AESNI_## prefix>::Block& iv, \
-        typename Types<AESNI_## prefix>::Block& ciphertext) \
+    inline void encrypt_block<AES_## prefix, AES_OFB>( \
+        const typename Types<AES_## prefix>::Block& plaintext, \
+        const typename Types<AES_## prefix>::RoundKeys& encryption_keys, \
+        typename Types<AES_## prefix>::Block& iv, \
+        typename Types<AES_## prefix>::Block& ciphertext) \
     { \
-        ciphertext = aesni_## prefix ##_encrypt_block_OFB(plaintext, &encryption_keys, iv, &iv); \
+        ciphertext = aes_## prefix ##_encrypt_block_OFB(plaintext, &encryption_keys, iv, &iv); \
     }
 
-#define AESNIXX_DECRYPT_BLOCK_OFB(prefix) \
+#define AESXX_DECRYPT_BLOCK_OFB(prefix) \
     template <> \
-    inline void decrypt_block<AESNI_## prefix, AESNI_OFB>( \
-        const typename Types<AESNI_## prefix>::Block& ciphertext, \
-        const typename Types<AESNI_## prefix>::RoundKeys& encryption_keys, \
-        typename Types<AESNI_## prefix>::Block& iv, \
-        typename Types<AESNI_## prefix>::Block& plaintext) \
+    inline void decrypt_block<AES_## prefix, AES_OFB>( \
+        const typename Types<AES_## prefix>::Block& ciphertext, \
+        const typename Types<AES_## prefix>::RoundKeys& encryption_keys, \
+        typename Types<AES_## prefix>::Block& iv, \
+        typename Types<AES_## prefix>::Block& plaintext) \
     { \
-        plaintext = aesni_## prefix ##_decrypt_block_OFB(ciphertext, &encryption_keys, iv, &iv); \
+        plaintext = aes_## prefix ##_decrypt_block_OFB(ciphertext, &encryption_keys, iv, &iv); \
     }
 
-#define AESNIXX_ENCRYPT_BLOCK_CTR(prefix) \
+#define AESXX_ENCRYPT_BLOCK_CTR(prefix) \
     template <> \
-    inline void encrypt_block<AESNI_## prefix, AESNI_CTR>( \
-        const typename Types<AESNI_## prefix>::Block& plaintext, \
-        const typename Types<AESNI_## prefix>::RoundKeys& encryption_keys, \
-        typename Types<AESNI_## prefix>::Block& iv, \
-        typename Types<AESNI_## prefix>::Block& ciphertext) \
+    inline void encrypt_block<AES_## prefix, AES_CTR>( \
+        const typename Types<AES_## prefix>::Block& plaintext, \
+        const typename Types<AES_## prefix>::RoundKeys& encryption_keys, \
+        typename Types<AES_## prefix>::Block& iv, \
+        typename Types<AES_## prefix>::Block& ciphertext) \
     { \
-        ciphertext = aesni_## prefix ##_encrypt_block_CTR(plaintext, &encryption_keys, iv, &iv); \
+        ciphertext = aes_## prefix ##_encrypt_block_CTR(plaintext, &encryption_keys, iv, &iv); \
     }
 
-#define AESNIXX_DECRYPT_BLOCK_CTR(prefix) \
+#define AESXX_DECRYPT_BLOCK_CTR(prefix) \
     template <> \
-    inline void decrypt_block<AESNI_## prefix, AESNI_CTR>( \
-        const typename Types<AESNI_## prefix>::Block& ciphertext, \
-        const typename Types<AESNI_## prefix>::RoundKeys& encryption_keys, \
-        typename Types<AESNI_## prefix>::Block& iv, \
-        typename Types<AESNI_## prefix>::Block& plaintext) \
+    inline void decrypt_block<AES_## prefix, AES_CTR>( \
+        const typename Types<AES_## prefix>::Block& ciphertext, \
+        const typename Types<AES_## prefix>::RoundKeys& encryption_keys, \
+        typename Types<AES_## prefix>::Block& iv, \
+        typename Types<AES_## prefix>::Block& plaintext) \
     { \
-        plaintext = aesni_## prefix ##_decrypt_block_CTR(ciphertext, &encryption_keys, iv, &iv); \
+        plaintext = aes_## prefix ##_decrypt_block_CTR(ciphertext, &encryption_keys, iv, &iv); \
     }
 }