aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2015-06-19 01:29:53 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2015-06-19 01:29:53 +0300
commita483e9bd8a7efe3fbad0f0c8ec70d9f5041d86b2 (patch)
tree2b067b04a87a26f68b9a92f40b891c4ff9ddbdda
parentadd more block arithmetic functions (diff)
downloadaes-tools-a483e9bd8a7efe3fbad0f0c8ec70d9f5041d86b2.tar.gz
aes-tools-a483e9bd8a7efe3fbad0f0c8ec70d9f5041d86b2.zip
respect the generic interface in CTR functions
-rw-r--r--examples/aes128ctr.cpp7
-rw-r--r--examples/aes192ctr.cpp7
-rw-r--r--examples/aes256ctr.cpp7
-rw-r--r--include/aesni/aes.h85
4 files changed, 58 insertions, 48 deletions
diff --git a/examples/aes128ctr.cpp b/examples/aes128ctr.cpp
index 671a5f3..ebd8793 100644
--- a/examples/aes128ctr.cpp
+++ b/examples/aes128ctr.cpp
@@ -32,11 +32,14 @@ int main()
aesni_aes128_expand_key(&key, &encryption_keys);
dump_encryption_keys(encryption_keys);
- const auto ciphertext = aesni_aes128_encrypt_block_ctr(plaintext, &encryption_keys, iv, 0);
+ aesni::aes::Block next_iv;
+ const auto ciphertext = aesni_aes128_encrypt_block_ctr(plaintext, &encryption_keys, iv, &next_iv);
dump_ciphertext(ciphertext);
+ dump_next_iv(next_iv);
- const auto decrypted = aesni_aes128_decrypt_block_ctr(ciphertext, &encryption_keys, iv, 0);
+ const auto decrypted = aesni_aes128_decrypt_block_ctr(ciphertext, &encryption_keys, iv, &next_iv);
dump_decrypted(decrypted);
+ dump_next_iv(next_iv);
return 0;
}
diff --git a/examples/aes192ctr.cpp b/examples/aes192ctr.cpp
index bdd34cf..d53cb38 100644
--- a/examples/aes192ctr.cpp
+++ b/examples/aes192ctr.cpp
@@ -32,11 +32,14 @@ int main()
aesni_aes192_expand_key(&key, &encryption_keys);
dump_encryption_keys(encryption_keys);
- const auto ciphertext = aesni_aes192_encrypt_block_ctr(plaintext, &encryption_keys, iv, 0);
+ aesni::aes::Block next_iv;
+ const auto ciphertext = aesni_aes192_encrypt_block_ctr(plaintext, &encryption_keys, iv, &next_iv);
dump_ciphertext(ciphertext);
+ dump_next_iv(next_iv);
- const auto decrypted = aesni_aes192_decrypt_block_ctr(ciphertext, &encryption_keys, iv, 0);
+ const auto decrypted = aesni_aes192_decrypt_block_ctr(ciphertext, &encryption_keys, iv, &next_iv);
dump_decrypted(decrypted);
+ dump_next_iv(next_iv);
}
catch (const std::exception& e)
{
diff --git a/examples/aes256ctr.cpp b/examples/aes256ctr.cpp
index c27d177..1431992 100644
--- a/examples/aes256ctr.cpp
+++ b/examples/aes256ctr.cpp
@@ -32,11 +32,14 @@ int main()
aesni_aes256_expand_key(&key, &encryption_keys);
dump_encryption_keys(encryption_keys);
- const auto ciphertext = aesni_aes256_encrypt_block_ctr(plaintext, &encryption_keys, iv, 0);
+ aesni::aes::Block next_iv;
+ const auto ciphertext = aesni_aes256_encrypt_block_ctr(plaintext, &encryption_keys, iv, &next_iv);
dump_ciphertext(ciphertext);
+ dump_next_iv(next_iv);
- const auto decrypted = aesni_aes256_decrypt_block_ctr(ciphertext, &encryption_keys, iv, 0);
+ const auto decrypted = aesni_aes256_decrypt_block_ctr(ciphertext, &encryption_keys, iv, &next_iv);
dump_decrypted(decrypted);
+ dump_next_iv(next_iv);
}
catch (const std::exception& e)
{
diff --git a/include/aesni/aes.h b/include/aesni/aes.h
index bcc1cf1..b7a2854 100644
--- a/include/aesni/aes.h
+++ b/include/aesni/aes.h
@@ -202,6 +202,13 @@ AesNI_Aes_Block __fastcall aesni_aes256_decrypt_block_(
AesNI_Aes_Block ciphertext,
const AesNI_Aes256_RoundKeys*);
+static __inline AesNI_Aes_Block __fastcall aesni_aes_inc_counter(AesNI_Aes_Block block)
+{
+ block = aesni_reverse_byte_order_block128(block);
+ block = aesni_inc_block128(block);
+ return aesni_reverse_byte_order_block128(block);
+}
+
/**
* \brief Expands an AES-128 key into 10 encryption round keys.
*
@@ -417,7 +424,7 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes128_decrypt_block_ofb(
* \param[in] plaintext The plaintext to be encrypted.
* \param[in] encryption_keys The AES-128 encryption round keys. Must not be `NULL`.
* \param[in] init_vector The CTR initialization vector.
- * \param[in] counter The counter, typically incremented between consecutive calls.
+ * \param[out] next_init_vector The initialization vector to be used for the next call. Must not be `NULL`.
*
* \return The encrypted 128-bit ciphertext.
*/
@@ -425,15 +432,14 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes128_encrypt_block_ctr(
AesNI_Aes_Block plaintext,
const AesNI_Aes128_RoundKeys* encryption_keys,
AesNI_Aes_Block init_vector,
- int counter)
+ AesNI_Aes_Block* next_init_vector)
{
assert(encryption_keys);
+ assert(next_init_vector);
- init_vector = aesni_reverse_bytes_block128(init_vector);
- init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter));
- init_vector = aesni_reverse_bytes_block128(init_vector);
-
- return aesni_xor_block128(plaintext, aesni_aes128_encrypt_block_(init_vector, encryption_keys));
+ AesNI_Aes_Block ciphertext = aesni_xor_block128(plaintext, aesni_aes128_encrypt_block_(init_vector, encryption_keys));
+ *next_init_vector = aesni_aes_inc_counter(init_vector);
+ return ciphertext;
}
/**
@@ -442,7 +448,7 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes128_encrypt_block_ctr(
* \param[in] ciphertext The ciphertext to be decrypted.
* \param[in] encryption_keys The AES-128 **encryption** round keys. Must not be `NULL`.
* \param[in] init_vector The CTR initialization vector.
- * \param[in] counter The counter, typically incremented between consecutive calls.
+ * \param[out] next_init_vector The initialization vector to be used for the next call. Must not be `NULL`.
*
* \return The decrypted 128-bit plaintext.
*/
@@ -450,15 +456,14 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes128_decrypt_block_ctr(
AesNI_Aes_Block ciphertext,
const AesNI_Aes128_RoundKeys* encryption_keys,
AesNI_Aes_Block init_vector,
- int counter)
+ AesNI_Aes_Block* next_init_vector)
{
assert(encryption_keys);
+ assert(next_init_vector);
- init_vector = aesni_reverse_bytes_block128(init_vector);
- init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter));
- init_vector = aesni_reverse_bytes_block128(init_vector);
-
- return aesni_xor_block128(ciphertext, aesni_aes128_encrypt_block_(init_vector, encryption_keys));
+ AesNI_Aes_Block plaintext = aesni_xor_block128(ciphertext, aesni_aes128_encrypt_block_(init_vector, encryption_keys));
+ *next_init_vector = aesni_aes_inc_counter(init_vector);
+ return plaintext;
}
/**
@@ -677,7 +682,7 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes192_decrypt_block_ofb(
* \param[in] plaintext The plaintext to be encrypted.
* \param[in] encryption_keys The AES-192 encryption round keys. Must not be `NULL`.
* \param[in] init_vector The CTR initialization vector.
- * \param[in] counter The counter, typically incremented between consecutive calls.
+ * \param[out] next_init_vector The initialization vector to be used for the next call. Must not be `NULL`.
*
* \return The encrypted 128-bit ciphertext.
*/
@@ -685,15 +690,14 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes192_encrypt_block_ctr(
AesNI_Aes_Block plaintext,
const AesNI_Aes192_RoundKeys* encryption_keys,
AesNI_Aes_Block init_vector,
- int counter)
+ AesNI_Aes_Block* next_init_vector)
{
assert(encryption_keys);
+ assert(next_init_vector);
- init_vector = aesni_reverse_bytes_block128(init_vector);
- init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter));
- init_vector = aesni_reverse_bytes_block128(init_vector);
-
- return aesni_xor_block128(plaintext, aesni_aes192_encrypt_block_(init_vector, encryption_keys));
+ AesNI_Aes_Block ciphertext = aesni_xor_block128(plaintext, aesni_aes192_encrypt_block_(init_vector, encryption_keys));
+ *next_init_vector = aesni_aes_inc_counter(init_vector);
+ return ciphertext;
}
/**
@@ -702,7 +706,7 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes192_encrypt_block_ctr(
* \param[in] ciphertext The ciphertext to be decrypted.
* \param[in] encryption_keys The AES-192 **encryption** round keys. Must not be `NULL`.
* \param[in] init_vector The CTR initialization vector.
- * \param[in] counter The counter, typically incremented between consecutive calls.
+ * \param[out] next_init_vector The initialization vector to be used for the next call. Must not be `NULL`.
*
* \return The decrypted 128-bit plaintext.
*/
@@ -710,15 +714,14 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes192_decrypt_block_ctr(
AesNI_Aes_Block ciphertext,
const AesNI_Aes192_RoundKeys* encryption_keys,
AesNI_Aes_Block init_vector,
- int counter)
+ AesNI_Aes_Block* next_init_vector)
{
assert(encryption_keys);
+ assert(next_init_vector);
- init_vector = aesni_reverse_bytes_block128(init_vector);
- init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter));
- init_vector = aesni_reverse_bytes_block128(init_vector);
-
- return aesni_xor_block128(ciphertext, aesni_aes192_encrypt_block_(init_vector, encryption_keys));
+ AesNI_Aes_Block plaintext = aesni_xor_block128(ciphertext, aesni_aes192_encrypt_block_(init_vector, encryption_keys));
+ *next_init_vector = aesni_aes_inc_counter(init_vector);
+ return plaintext;
}
/**
@@ -937,7 +940,7 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes256_decrypt_block_ofb(
* \param[in] plaintext The plaintext to be encrypted.
* \param[in] encryption_keys The AES-256 encryption round keys. Must not be `NULL`.
* \param[in] init_vector The CTR initialization vector.
- * \param[in] counter The counter, typically incremented between consecutive calls.
+ * \param[out] next_init_vector The initialization vector to be used for the next call. Must not be `NULL`.
*
* \return The encrypted 128-bit ciphertext.
*/
@@ -945,15 +948,14 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes256_encrypt_block_ctr(
AesNI_Aes_Block plaintext,
const AesNI_Aes256_RoundKeys* encryption_keys,
AesNI_Aes_Block init_vector,
- int counter)
+ AesNI_Aes_Block* next_init_vector)
{
assert(encryption_keys);
+ assert(next_init_vector);
- init_vector = aesni_reverse_bytes_block128(init_vector);
- init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter));
- init_vector = aesni_reverse_bytes_block128(init_vector);
-
- return aesni_xor_block128(plaintext, aesni_aes256_encrypt_block_(init_vector, encryption_keys));
+ AesNI_Aes_Block ciphertext = aesni_xor_block128(plaintext, aesni_aes256_encrypt_block_(init_vector, encryption_keys));
+ *next_init_vector = aesni_aes_inc_counter(init_vector);
+ return ciphertext;
}
/**
@@ -962,7 +964,7 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes256_encrypt_block_ctr(
* \param[in] ciphertext The ciphertext to be decrypted.
* \param[in] encryption_keys The AES-256 **encryption** round keys. Must not be `NULL`.
* \param[in] init_vector The CTR initialization vector.
- * \param[in] counter The counter, typically incremented between consecutive calls.
+ * \param[out] next_init_vector The initialization vector to be used for the next call. Must not be `NULL`.
*
* \return The decrypted 128-bit plaintext.
*/
@@ -970,15 +972,14 @@ static __inline AesNI_Aes_Block __fastcall aesni_aes256_decrypt_block_ctr(
AesNI_Aes_Block ciphertext,
const AesNI_Aes256_RoundKeys* encryption_keys,
AesNI_Aes_Block init_vector,
- int counter)
+ AesNI_Aes_Block* next_init_vector)
{
assert(encryption_keys);
+ assert(next_init_vector);
- init_vector = aesni_reverse_bytes_block128(init_vector);
- init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter));
- init_vector = aesni_reverse_bytes_block128(init_vector);
-
- return aesni_xor_block128(ciphertext, aesni_aes256_encrypt_block_(init_vector, encryption_keys));
+ AesNI_Aes_Block plaintext = aesni_xor_block128(ciphertext, aesni_aes256_encrypt_block_(init_vector, encryption_keys));
+ *next_init_vector = aesni_aes_inc_counter(init_vector);
+ return plaintext;
}
#ifdef __cplusplus