From 53dfe511dc29beb8d399e95dfa93b6d3baed6b57 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Tue, 28 Jul 2015 21:34:15 +0300
Subject: refactoring
Namely, rename API functions to facilitate metaprogramming using
preprocessor macros.
---
cxx/include/aesnixx/aes.hpp | 122 ++++++++++++++++++++++----------------------
1 file changed, 61 insertions(+), 61 deletions(-)
(limited to 'cxx/include')
diff --git a/cxx/include/aesnixx/aes.hpp b/cxx/include/aesnixx/aes.hpp
index 231e223..358e24f 100644
--- a/cxx/include/aesnixx/aes.hpp
+++ b/cxx/include/aesnixx/aes.hpp
@@ -20,49 +20,49 @@ namespace aesni
{
namespace aes
{
- typedef AesNI_Aes_Block Block;
+ typedef AesNI_AES_Block Block;
- typedef AesNI_Aes128_Key Key128;
- typedef AesNI_Aes192_Key Key192;
- typedef AesNI_Aes256_Key Key256;
+ typedef AesNI_AES128_Key Key128;
+ typedef AesNI_AES192_Key Key192;
+ typedef AesNI_AES256_Key Key256;
inline void make_block(Block& dest, int hi3, int hi2, int lo1, int lo0)
{
- aesni_aes_make_block(&dest, hi3, hi2, lo1, lo0);
+ aesni_AES_make_block(&dest, hi3, hi2, lo1, lo0);
}
inline void make_key(Key128& dest, int hi3, int hi2, int lo1, int lo0)
{
- aesni_aes128_make_key(&dest, hi3, hi2, lo1, lo0);
+ aesni_AES128_make_key(&dest, hi3, hi2, lo1, lo0);
}
inline void make_key(Key192& dest, int hi5, int hi4, int hi3, int lo2, int lo1, int lo0)
{
- aesni_aes192_make_key(&dest, hi5, hi4, hi3, lo2, lo1, lo0);
+ aesni_AES192_make_key(&dest, hi5, hi4, hi3, lo2, lo1, lo0);
}
inline void make_key(Key256& dest, int hi7, int hi6, int hi5, int hi4, int lo3, int lo2, int lo1, int lo0)
{
- aesni_aes256_make_key(&dest, hi7, hi6, hi5, hi4, lo3, lo2, lo1, lo0);
+ aesni_AES256_make_key(&dest, hi7, hi6, hi5, hi4, lo3, lo2, lo1, lo0);
}
std::string to_string(const Block& block)
{
- AesNI_Aes_BlockString str;
- aesni_aes_format_block(&str, &block, ErrorDetailsThrowsInDestructor());
+ AesNI_AES_BlockString str;
+ aesni_AES_format_block(&str, &block, ErrorDetailsThrowsInDestructor());
return std::string(str.str);
}
std::string to_matrix_string(const Block& block)
{
- AesNI_Aes_BlockMatrixString str;
- aesni_aes_format_block_as_matrix(&str, &block, ErrorDetailsThrowsInDestructor());
+ AesNI_AES_BlockMatrixString str;
+ aesni_AES_format_block_as_matrix(&str, &block, ErrorDetailsThrowsInDestructor());
return std::string(str.str);
}
inline void from_string(Block& dest, const char* src)
{
- aesni_aes_parse_block(&dest, src, ErrorDetailsThrowsInDestructor());
+ aesni_AES_parse_block(&dest, src, ErrorDetailsThrowsInDestructor());
}
inline void from_string(Block& dest, const std::string& src)
@@ -72,38 +72,38 @@ namespace aesni
std::string to_string(const Key128& block)
{
- AesNI_Aes128_KeyString str;
- aesni_aes128_format_key(&str, &block, ErrorDetailsThrowsInDestructor());
+ AesNI_AES128_KeyString str;
+ aesni_AES128_format_key(&str, &block, ErrorDetailsThrowsInDestructor());
return std::string(str.str);
}
std::string to_string(const Key192& block)
{
- AesNI_Aes192_KeyString str;
- aesni_aes192_format_key(&str, &block, ErrorDetailsThrowsInDestructor());
+ AesNI_AES192_KeyString str;
+ aesni_AES192_format_key(&str, &block, ErrorDetailsThrowsInDestructor());
return std::string(str.str);
}
std::string to_string(const Key256& block)
{
- AesNI_Aes256_KeyString str;
- aesni_aes256_format_key(&str, &block, ErrorDetailsThrowsInDestructor());
+ AesNI_AES256_KeyString str;
+ aesni_AES256_format_key(&str, &block, ErrorDetailsThrowsInDestructor());
return std::string(str.str);
}
inline void from_string(Key128& dest, const char* src)
{
- aesni_aes128_parse_key(&dest, src, ErrorDetailsThrowsInDestructor());
+ aesni_AES128_parse_key(&dest, src, ErrorDetailsThrowsInDestructor());
}
inline void from_string(Key192& dest, const char* src)
{
- aesni_aes192_parse_key(&dest, src, ErrorDetailsThrowsInDestructor());
+ aesni_AES192_parse_key(&dest, src, ErrorDetailsThrowsInDestructor());
}
inline void from_string(Key256& dest, const char* src)
{
- aesni_aes256_parse_key(&dest, src, ErrorDetailsThrowsInDestructor());
+ aesni_AES256_parse_key(&dest, src, ErrorDetailsThrowsInDestructor());
}
inline void from_string(Key128& dest, const std::string& src)
@@ -121,9 +121,9 @@ namespace aesni
return from_string(dest, src.c_str());
}
- typedef AesNI_Aes128_RoundKeys RoundKeys128;
- typedef AesNI_Aes192_RoundKeys RoundKeys192;
- typedef AesNI_Aes256_RoundKeys RoundKeys256;
+ typedef AesNI_AES128_RoundKeys RoundKeys128;
+ typedef AesNI_AES192_RoundKeys RoundKeys192;
+ typedef AesNI_AES256_RoundKeys RoundKeys256;
template <typename RoundKeysT>
inline std::size_t get_number_of_rounds(const RoundKeysT& round_keys)
@@ -135,28 +135,28 @@ namespace aesni
const Key128& key,
RoundKeys128& encryption_keys)
{
- aesni_aes128_expand_key(&key, &encryption_keys);
+ aesni_AES128_expand_key(&key, &encryption_keys);
}
inline void expand_key(
const Key192& key,
RoundKeys192& encryption_keys)
{
- aesni_aes192_expand_key(&key, &encryption_keys);
+ aesni_AES192_expand_key(&key, &encryption_keys);
}
inline void expand_key(
const Key256& key,
RoundKeys256& encryption_keys)
{
- aesni_aes256_expand_key(&key, &encryption_keys);
+ aesni_AES256_expand_key(&key, &encryption_keys);
}
inline void derive_decryption_keys(
const RoundKeys128& encryption_keys,
RoundKeys128& decryption_keys)
{
- aesni_aes128_derive_decryption_keys(
+ aesni_AES128_derive_decryption_keys(
&encryption_keys, &decryption_keys);
}
@@ -164,7 +164,7 @@ namespace aesni
const RoundKeys192& encryption_keys,
RoundKeys192& decryption_keys)
{
- aesni_aes192_derive_decryption_keys(
+ aesni_AES192_derive_decryption_keys(
&encryption_keys, &decryption_keys);
}
@@ -172,7 +172,7 @@ namespace aesni
const RoundKeys256& encryption_keys,
RoundKeys256& decryption_keys)
{
- aesni_aes256_derive_decryption_keys(
+ aesni_AES256_derive_decryption_keys(
&encryption_keys, &decryption_keys);
}
@@ -180,14 +180,14 @@ namespace aesni
const Block& plaintext,
const RoundKeys128& encryption_keys)
{
- return aesni_aes128_encrypt_block_ecb(plaintext, &encryption_keys);
+ return aesni_AES128_encrypt_block_ECB(plaintext, &encryption_keys);
}
inline Block decrypt_ecb(
const Block& ciphertext,
const RoundKeys128& decryption_keys)
{
- return aesni_aes128_decrypt_block_ecb(ciphertext, &decryption_keys);
+ return aesni_AES128_decrypt_block_ECB(ciphertext, &decryption_keys);
}
inline Block encrypt_cbc(
@@ -196,7 +196,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes128_encrypt_block_cbc(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES128_encrypt_block_CBC(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_cbc(
@@ -205,7 +205,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes128_decrypt_block_cbc(ciphertext, &decryption_keys, iv, &next_iv);
+ return aesni_AES128_decrypt_block_CBC(ciphertext, &decryption_keys, iv, &next_iv);
}
inline Block encrypt_cfb(
@@ -214,7 +214,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes128_encrypt_block_cfb(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES128_encrypt_block_CFB(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_cfb(
@@ -223,7 +223,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes128_decrypt_block_cfb(ciphertext, &encryption_keys, iv, &next_iv);
+ return aesni_AES128_decrypt_block_CFB(ciphertext, &encryption_keys, iv, &next_iv);
}
inline Block encrypt_ofb(
@@ -232,7 +232,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes128_encrypt_block_ofb(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES128_encrypt_block_OFB(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_ofb(
@@ -241,7 +241,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes128_decrypt_block_ofb(ciphertext, &encryption_keys, iv, &next_iv);
+ return aesni_AES128_decrypt_block_OFB(ciphertext, &encryption_keys, iv, &next_iv);
}
inline Block encrypt_ctr(
@@ -250,7 +250,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes128_encrypt_block_ctr(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES128_encrypt_block_CTR(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_ctr(
@@ -259,21 +259,21 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes128_decrypt_block_ctr(ciphertext, &encryption_keys, iv, &next_iv);
+ return aesni_AES128_decrypt_block_CTR(ciphertext, &encryption_keys, iv, &next_iv);
}
inline Block encrypt_ecb(
const Block& plaintext,
const RoundKeys192& encryption_keys)
{
- return aesni_aes192_encrypt_block_ecb(plaintext, &encryption_keys);
+ return aesni_AES192_encrypt_block_ECB(plaintext, &encryption_keys);
}
inline Block decrypt_ecb(
const Block& ciphertext,
const RoundKeys192& decryption_keys)
{
- return aesni_aes192_decrypt_block_ecb(ciphertext, &decryption_keys);
+ return aesni_AES192_decrypt_block_ECB(ciphertext, &decryption_keys);
}
inline Block encrypt_cbc(
@@ -282,7 +282,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes192_encrypt_block_cbc(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES192_encrypt_block_CBC(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_cbc(
@@ -291,7 +291,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes192_decrypt_block_cbc(ciphertext, &decryption_keys, iv, &next_iv);
+ return aesni_AES192_decrypt_block_CBC(ciphertext, &decryption_keys, iv, &next_iv);
}
inline Block encrypt_cfb(
@@ -300,7 +300,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes192_encrypt_block_cfb(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES192_encrypt_block_CFB(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_cfb(
@@ -309,7 +309,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes192_decrypt_block_cfb(ciphertext, &encryption_keys, iv, &next_iv);
+ return aesni_AES192_decrypt_block_CFB(ciphertext, &encryption_keys, iv, &next_iv);
}
inline Block encrypt_ofb(
@@ -318,7 +318,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes192_encrypt_block_ofb(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES192_encrypt_block_OFB(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_ofb(
@@ -327,7 +327,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes192_decrypt_block_ofb(ciphertext, &encryption_keys, iv, &next_iv);
+ return aesni_AES192_decrypt_block_OFB(ciphertext, &encryption_keys, iv, &next_iv);
}
inline Block encrypt_ctr(
@@ -336,7 +336,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes192_encrypt_block_ctr(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES192_encrypt_block_CTR(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_ctr(
@@ -345,21 +345,21 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes192_decrypt_block_ctr(ciphertext, &encryption_keys, iv, &next_iv);
+ return aesni_AES192_decrypt_block_CTR(ciphertext, &encryption_keys, iv, &next_iv);
}
inline Block encrypt_ecb(
const Block& plaintext,
const RoundKeys256& encryption_keys)
{
- return aesni_aes256_encrypt_block_ecb(plaintext, &encryption_keys);
+ return aesni_AES256_encrypt_block_ECB(plaintext, &encryption_keys);
}
inline Block decrypt_ecb(
const Block& ciphertext,
const RoundKeys256& decryption_keys)
{
- return aesni_aes256_decrypt_block_ecb(ciphertext, &decryption_keys);
+ return aesni_AES256_decrypt_block_ECB(ciphertext, &decryption_keys);
}
inline Block encrypt_cbc(
@@ -368,7 +368,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes256_encrypt_block_cbc(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES256_encrypt_block_CBC(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_cbc(
@@ -377,7 +377,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes256_decrypt_block_cbc(ciphertext, &decryption_keys, iv, &next_iv);
+ return aesni_AES256_decrypt_block_CBC(ciphertext, &decryption_keys, iv, &next_iv);
}
inline Block encrypt_cfb(
@@ -386,7 +386,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes256_encrypt_block_cfb(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES256_encrypt_block_CFB(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_cfb(
@@ -395,7 +395,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes256_decrypt_block_cfb(ciphertext, &encryption_keys, iv, &next_iv);
+ return aesni_AES256_decrypt_block_CFB(ciphertext, &encryption_keys, iv, &next_iv);
}
inline Block encrypt_ofb(
@@ -404,7 +404,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes256_encrypt_block_ofb(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES256_encrypt_block_OFB(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_ofb(
@@ -413,7 +413,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes256_decrypt_block_ofb(ciphertext, &encryption_keys, iv, &next_iv);
+ return aesni_AES256_decrypt_block_OFB(ciphertext, &encryption_keys, iv, &next_iv);
}
inline Block encrypt_ctr(
@@ -422,7 +422,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes256_encrypt_block_ctr(plaintext, &encryption_keys, iv, &next_iv);
+ return aesni_AES256_encrypt_block_CTR(plaintext, &encryption_keys, iv, &next_iv);
}
inline Block decrypt_ctr(
@@ -431,7 +431,7 @@ namespace aesni
const Block& iv,
Block& next_iv)
{
- return aesni_aes256_decrypt_block_ctr(ciphertext, &encryption_keys, iv, &next_iv);
+ return aesni_AES256_decrypt_block_CTR(ciphertext, &encryption_keys, iv, &next_iv);
}
template <Algorithm>
--
cgit v1.2.3