diff options
Diffstat (limited to '')
| -rw-r--r-- | include/aesni/aes.h | 732 | ||||
| -rw-r--r-- | include/aesni/buffer.h | 4 |
2 files changed, 325 insertions, 411 deletions
diff --git a/include/aesni/aes.h b/include/aesni/aes.h index dcee06b..6e11b0c 100644 --- a/include/aesni/aes.h +++ b/include/aesni/aes.h @@ -85,869 +85,783 @@ AesNI_Block128 __fastcall aesni_aes256_decrypt_block_( AesNI_Block128 ciphertext, const AesNI_Aes256_RoundKeys*); - - - /** - * \brief Expands a key schedule for AES-128 encryption. + * \brief Expands an AES-128 key into 10 encryption round keys. * * \param[in] key The AES-128 key. - * \param[out] key_schedule The AES-128 encryption key schedule. Must not be - * `NULL`. + * \param[out] encryption_keys The AES-128 encryption round keys. Must not be `NULL`. */ static __inline void __fastcall aesni_aes128_expand_key( AesNI_Block128 key, - AesNI_Aes128_RoundKeys* key_schedule) + AesNI_Aes128_RoundKeys* encryption_keys) { - assert(key_schedule); + assert(encryption_keys); - aesni_aes128_expand_key_(key, key_schedule); + aesni_aes128_expand_key_(key, encryption_keys); } /** - * \brief "Inverts" an AES-128 key schedule to prepare for decryption. + * \brief Derives AES-128 decryption round keys from AES-128 encryption round keys. * - * \param[in] key_schedule The AES-128 encryption key schedule. Must not be - * `NULL`. - * \param[out] inverted_schedule The AES-128 decryption key schedule. Must not - * be `NULL`. + * \param[in] encryption_keys The AES-128 encryption round keys. Must not be `NULL`. + * \param[out] decryption_keys The AES-128 decryption round keys. Must not be `NULL`. */ static __inline void __fastcall aesni_aes128_derive_decryption_keys( - const AesNI_Aes128_RoundKeys* key_schedule, - AesNI_Aes128_RoundKeys* inverted_schedule) + const AesNI_Aes128_RoundKeys* encryption_keys, + AesNI_Aes128_RoundKeys* decryption_keys) { - assert(key_schedule); - assert(inverted_schedule); + assert(encryption_keys); + assert(decryption_keys); - aesni_aes128_derive_decryption_keys_(key_schedule, inverted_schedule); + aesni_aes128_derive_decryption_keys_(encryption_keys, decryption_keys); } /** * \brief Encrypts a 128-bit block using AES-128 in ECB mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-128 encryption key schedule. Must not be - * `NULL`. + * \param[in] plaintext The plaintext to be encrypted. + * \param[in] encryption_keys The AES-128 encryption round keys. Must not be `NULL`. + * * \return The encrypted 128-bit ciphertext. */ static __inline AesNI_Block128 __fastcall aesni_aes128_encrypt_block_ecb( - AesNI_Block128 plain, - const AesNI_Aes128_RoundKeys* key_schedule) + AesNI_Block128 plaintext, + const AesNI_Aes128_RoundKeys* encryption_keys) { - assert(key_schedule); + assert(encryption_keys); - return aesni_aes128_encrypt_block_(plain, key_schedule); + return aesni_aes128_encrypt_block_(plaintext, encryption_keys); } /** * \brief Decrypts a 128-bit block using AES-128 in ECB mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] inverted_schedule The AES-128 decryption key schedule. Must not - * be `NULL`. + * \param[in] ciphertext The ciphertext to be decrypted. + * \param[in] decryption_keys The AES-128 decryption round keys. Must not be `NULL`. + * * \return The decrypted 128-bit plaintext. */ static __inline AesNI_Block128 __fastcall aesni_aes128_decrypt_block_ecb( - AesNI_Block128 cipher, - const AesNI_Aes128_RoundKeys* inverted_schedule) + AesNI_Block128 ciphertext, + const AesNI_Aes128_RoundKeys* decryption_keys) { - assert(inverted_schedule); + assert(decryption_keys); - return aesni_aes128_decrypt_block_(cipher, inverted_schedule); + return aesni_aes128_decrypt_block_(ciphertext, decryption_keys); } /** * \brief Encrypts a 128-bit block using AES-128 in CBC mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-128 encryption key schedule. Must not be - * `NULL`. + * \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 CBC initialization vector. - * \param[out] next_init_vector The next CBC initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes128_encrypt_block_cbc( - AesNI_Block128 plain, - const AesNI_Aes128_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes128_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 cipher = aesni_aes128_encrypt_block_( - aesni_xor_block128(plain, init_vector), - key_schedule); - *next_init_vector = cipher; - return cipher; + AesNI_Block128 ciphertext = aesni_aes128_encrypt_block_(aesni_xor_block128(plaintext, init_vector), encryption_keys); + *next_init_vector = ciphertext; + return ciphertext; } /** * \brief Decrypts a 128-bit block using AES-128 in CBC mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] inverted_schedule The AES-128 decryption key schedule. Must not - * be `NULL`. + * \param[in] ciphertext The ciphertext to be decrypted. + * \param[in] decryption_keys The AES-128 decryption round keys. Must not be `NULL`. * \param[in] init_vector The CBC initialization vector. - * \param[out] next_init_vector The next CBC initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes128_decrypt_block_cbc( - AesNI_Block128 cipher, - const AesNI_Aes128_RoundKeys* inverted_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes128_RoundKeys* decryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(inverted_schedule); + assert(decryption_keys); assert(next_init_vector); - AesNI_Block128 plain = aesni_xor_block128( - aesni_aes128_decrypt_block_(cipher, inverted_schedule), - init_vector); - *next_init_vector = cipher; - return plain; + AesNI_Block128 plaintext = aesni_xor_block128(aesni_aes128_decrypt_block_(ciphertext, decryption_keys), init_vector); + *next_init_vector = ciphertext; + return plaintext; } /** * \brief Encrypts a 128-bit block using AES-128 in CFB mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-128 encryption key schedule. Must not be - * `NULL`. + * \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 CFB initialization vector. - * \param[out] next_init_vector The next CFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes128_encrypt_block_cfb( - AesNI_Block128 plain, - const AesNI_Aes128_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes128_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 cipher = aesni_xor_block128( - aesni_aes128_encrypt_block_(init_vector, key_schedule), - plain); - *next_init_vector = cipher; - return cipher; + AesNI_Block128 ciphertext = aesni_xor_block128(aesni_aes128_encrypt_block_(init_vector, encryption_keys), plaintext); + *next_init_vector = ciphertext; + return ciphertext; } /** * \brief Decrypts a 128-bit block using AES-128 in CFB mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] key_schedule The AES-128 **encryption** key schedule. Must not be - * `NULL`. + * \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 CFB initialization vector. - * \param[out] next_init_vector The next CFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes128_decrypt_block_cfb( - AesNI_Block128 cipher, - const AesNI_Aes128_RoundKeys* key_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes128_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 plain = aesni_xor_block128( - aesni_aes128_encrypt_block_(init_vector, key_schedule), - cipher); - *next_init_vector = cipher; - return plain; + AesNI_Block128 plaintext = aesni_xor_block128(aesni_aes128_encrypt_block_(init_vector, encryption_keys), ciphertext); + *next_init_vector = ciphertext; + return plaintext; } /** * \brief Encrypts a 128-bit block using AES-128 in OFB mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-128 encryption key schedule. Must not be - * `NULL`. + * \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 OFB initialization vector. - * \param[out] next_init_vector The next OFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes128_encrypt_block_ofb( - AesNI_Block128 plain, - const AesNI_Aes128_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes128_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 tmp = aesni_aes128_encrypt_block_(init_vector, key_schedule); + AesNI_Block128 tmp = aesni_aes128_encrypt_block_(init_vector, encryption_keys); *next_init_vector = tmp; - return aesni_xor_block128(tmp, plain); + return aesni_xor_block128(tmp, plaintext); } /** * \brief Decrypts a 128-bit block using AES-128 in OFB mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] key_schedule The AES-128 **encryption** key schedule. Must not be - * `NULL`. + * \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 OFB initialization vector. - * \param[out] next_init_vector The next OFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes128_decrypt_block_ofb( - AesNI_Block128 cipher, - const AesNI_Aes128_RoundKeys* key_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes128_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 tmp = aesni_aes128_encrypt_block_(init_vector, key_schedule); + AesNI_Block128 tmp = aesni_aes128_encrypt_block_(init_vector, encryption_keys); *next_init_vector = tmp; - return aesni_xor_block128(tmp, cipher); + return aesni_xor_block128(tmp, ciphertext); } /** * \brief Encrypts a 128-bit block using AES-128 in CTR mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-128 encryption key schedule. Must not be - * `NULL`. + * \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[in] counter The counter, typically incremented between consecutive calls. + * * \return The encrypted 128-bit ciphertext. */ static __inline AesNI_Block128 __fastcall aesni_aes128_encrypt_block_ctr( - AesNI_Block128 plain, - const AesNI_Aes128_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes128_RoundKeys* encryption_keys, AesNI_Block128 init_vector, int counter) { - assert(key_schedule); + assert(encryption_keys); - init_vector = aesni_be2le128(_mm_add_epi32( - aesni_le2be128(init_vector), - aesni_make_block128(0, 0, 0, counter))); + init_vector = aesni_le2be128(init_vector); + init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter)); + init_vector = aesni_be2le128(init_vector); - return aesni_xor_block128( - plain, - aesni_aes128_encrypt_block_(init_vector, key_schedule)); + return aesni_xor_block128(plaintext, aesni_aes128_encrypt_block_(init_vector, encryption_keys)); } /** * \brief Decrypts a 128-bit block using AES-128 in CTR mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] key_schedule The AES-128 **encryption** key schedule. Must not be - * `NULL`. + * \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[in] counter The counter, typically incremented between consecutive calls. + * * \return The decrypted 128-bit plaintext. */ static __inline AesNI_Block128 __fastcall aesni_aes128_decrypt_block_ctr( - AesNI_Block128 cipher, - const AesNI_Aes128_RoundKeys* key_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes128_RoundKeys* encryption_keys, AesNI_Block128 init_vector, int counter) { - assert(key_schedule); + assert(encryption_keys); - init_vector = aesni_be2le128(_mm_add_epi32( - aesni_le2be128(init_vector), - aesni_make_block128(0, 0, 0, counter))); + init_vector = aesni_le2be128(init_vector); + init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter)); + init_vector = aesni_be2le128(init_vector); - return aesni_xor_block128( - cipher, - aesni_aes128_encrypt_block_(init_vector, key_schedule)); + return aesni_xor_block128(ciphertext, aesni_aes128_encrypt_block_(init_vector, encryption_keys)); } /** - * \} - * - * \defgroup aesni_block_api_aes192 AES-192 - * \{ - */ - -/** - * \brief Expands a key schedule for AES-192 encryption. + * \brief Expands an AES-192 key into 12 encryption round keys. * - * \param[in] key The AES-192 key. Must not be `NULL`. - * \param[out] key_schedule The AES-192 encryption key schedule. Must not be - * `NULL`. + * \param[in] key The AES-192 key. + * \param[out] encryption_keys The AES-192 encryption round keys. Must not be `NULL`. */ static __inline void __fastcall aesni_aes192_expand_key( AesNI_Block192* key, - AesNI_Aes192_RoundKeys* key_schedule) + AesNI_Aes192_RoundKeys* encryption_keys) { assert(key); - assert(key_schedule); + assert(encryption_keys); - aesni_aes192_expand_key_(key->lo, key->hi, key_schedule); + aesni_aes192_expand_key_(key->lo, key->hi, encryption_keys); } /** - * \brief "Inverts" an AES-192 key schedule to prepare for decryption. + * \brief Derives AES-192 decryption round keys from AES-192 encryption round keys. * - * \param[in] key_schedule The AES-192 encryption key schedule. Must not be - * `NULL`. - * \param[out] inverted_schedule The AES-192 decryption key schedule. Must not - * be `NULL`. + * \param[in] encryption_keys The AES-192 encryption round keys. Must not be `NULL`. + * \param[out] decryption_keys The AES-192 decryption round keys. Must not be `NULL`. */ static __inline void __fastcall aesni_aes192_derive_decryption_keys( - const AesNI_Aes192_RoundKeys* key_schedule, - AesNI_Aes192_RoundKeys* inverted_schedule) + const AesNI_Aes192_RoundKeys* encryption_keys, + AesNI_Aes192_RoundKeys* decryption_keys) { - assert(key_schedule); - assert(inverted_schedule); + assert(encryption_keys); + assert(decryption_keys); - aesni_aes192_derive_decryption_keys_(key_schedule, inverted_schedule); + aesni_aes192_derive_decryption_keys_(encryption_keys, decryption_keys); } /** * \brief Encrypts a 128-bit block using AES-192 in ECB mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-192 encryption key schedule. Must not be - * `NULL`. + * \param[in] plaintext The plaintext to be encrypted. + * \param[in] encryption_keys The AES-192 encryption round keys. Must not be `NULL`. + * * \return The encrypted 128-bit ciphertext. */ static __inline AesNI_Block128 __fastcall aesni_aes192_encrypt_block_ecb( - AesNI_Block128 plain, - const AesNI_Aes192_RoundKeys* key_schedule) + AesNI_Block128 plaintext, + const AesNI_Aes192_RoundKeys* encryption_keys) { - assert(key_schedule); + assert(encryption_keys); - return aesni_aes192_encrypt_block_(plain, key_schedule); + return aesni_aes192_encrypt_block_(plaintext, encryption_keys); } /** * \brief Decrypts a 128-bit block using AES-192 in ECB mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] inverted_schedule The AES-192 decryption key schedule. Must not - * be `NULL`. + * \param[in] ciphertext The ciphertext to be decrypted. + * \param[in] decryption_keys The AES-192 decryption round keys. Must not be `NULL`. + * * \return The decrypted 128-bit plaintext. */ static __inline AesNI_Block128 __fastcall aesni_aes192_decrypt_block_ecb( - AesNI_Block128 cipher, - const AesNI_Aes192_RoundKeys* inverted_schedule) + AesNI_Block128 ciphertext, + const AesNI_Aes192_RoundKeys* decryption_keys) { - assert(inverted_schedule); + assert(decryption_keys); - return aesni_aes192_decrypt_block_(cipher, inverted_schedule); + return aesni_aes192_decrypt_block_(ciphertext, decryption_keys); } /** * \brief Encrypts a 128-bit block using AES-192 in CBC mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-192 encryption key schedule. Must not be - * `NULL`. + * \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 CBC initialization vector. - * \param[out] next_init_vector The next CBC initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes192_encrypt_block_cbc( - AesNI_Block128 plain, - const AesNI_Aes192_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes192_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 cipher = aesni_aes192_encrypt_block_( - aesni_xor_block128(plain, init_vector), - key_schedule); - *next_init_vector = cipher; - return cipher; + AesNI_Block128 ciphertext = aesni_aes192_encrypt_block_(aesni_xor_block128(plaintext, init_vector), encryption_keys); + *next_init_vector = ciphertext; + return ciphertext; } /** * \brief Decrypts a 128-bit block using AES-192 in CBC mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] inverted_schedule The AES-192 decryption key schedule. Must not - * be `NULL`. + * \param[in] ciphertext The ciphertext to be decrypted. + * \param[in] decryption_keys The AES-192 decryption round keys. Must not be `NULL`. * \param[in] init_vector The CBC initialization vector. - * \param[out] next_init_vector The next CBC initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes192_decrypt_block_cbc( - AesNI_Block128 cipher, - const AesNI_Aes192_RoundKeys* inverted_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes192_RoundKeys* decryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(inverted_schedule); + assert(decryption_keys); assert(next_init_vector); - AesNI_Block128 plain = aesni_xor_block128( - aesni_aes192_decrypt_block_(cipher, inverted_schedule), - init_vector); - *next_init_vector = cipher; - return plain; + AesNI_Block128 plaintext = aesni_xor_block128(aesni_aes192_decrypt_block_(ciphertext, decryption_keys), init_vector); + *next_init_vector = ciphertext; + return plaintext; } /** * \brief Encrypts a 128-bit block using AES-192 in CFB mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-192 encryption key schedule. Must not be - * `NULL`. + * \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 CFB initialization vector. - * \param[out] next_init_vector The next CFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes192_encrypt_block_cfb( - AesNI_Block128 plain, - const AesNI_Aes192_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes192_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 cipher = aesni_xor_block128( - aesni_aes192_encrypt_block_(init_vector, key_schedule), - plain); - *next_init_vector = cipher; - return cipher; + AesNI_Block128 ciphertext = aesni_xor_block128(aesni_aes192_encrypt_block_(init_vector, encryption_keys), plaintext); + *next_init_vector = ciphertext; + return ciphertext; } /** * \brief Decrypts a 128-bit block using AES-192 in CFB mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] key_schedule The AES-192 **encryption** key schedule. Must not be - * `NULL`. + * \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 CFB initialization vector. - * \param[out] next_init_vector The next CFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes192_decrypt_block_cfb( - AesNI_Block128 cipher, - const AesNI_Aes192_RoundKeys* key_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes192_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 plain = aesni_xor_block128( - aesni_aes192_encrypt_block_(init_vector, key_schedule), - cipher); - *next_init_vector = cipher; - return plain; + AesNI_Block128 plaintext = aesni_xor_block128(aesni_aes192_encrypt_block_(init_vector, encryption_keys), ciphertext); + *next_init_vector = ciphertext; + return plaintext; } /** * \brief Encrypts a 128-bit block using AES-192 in OFB mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-192 encryption key schedule. Must not be - * `NULL`. + * \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 OFB initialization vector. - * \param[out] next_init_vector The next OFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes192_encrypt_block_ofb( - AesNI_Block128 plain, - const AesNI_Aes192_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes192_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 tmp = aesni_aes192_encrypt_block_(init_vector, key_schedule); + AesNI_Block128 tmp = aesni_aes192_encrypt_block_(init_vector, encryption_keys); *next_init_vector = tmp; - return aesni_xor_block128(tmp, plain); + return aesni_xor_block128(tmp, plaintext); } /** * \brief Decrypts a 128-bit block using AES-192 in OFB mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] key_schedule The AES-192 **encryption** key schedule. Must not be - * `NULL`. + * \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 OFB initialization vector. - * \param[out] next_init_vector The next OFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes192_decrypt_block_ofb( - AesNI_Block128 cipher, - const AesNI_Aes192_RoundKeys* key_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes192_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 tmp = aesni_aes192_encrypt_block_(init_vector, key_schedule); + AesNI_Block128 tmp = aesni_aes192_encrypt_block_(init_vector, encryption_keys); *next_init_vector = tmp; - return aesni_xor_block128(tmp, cipher); + return aesni_xor_block128(tmp, ciphertext); } /** * \brief Encrypts a 128-bit block using AES-192 in CTR mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-192 encryption key schedule. Must not be - * `NULL`. + * \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[in] counter The counter, typically incremented between consecutive calls. + * * \return The encrypted 128-bit ciphertext. */ static __inline AesNI_Block128 __fastcall aesni_aes192_encrypt_block_ctr( - AesNI_Block128 plain, - const AesNI_Aes192_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes192_RoundKeys* encryption_keys, AesNI_Block128 init_vector, int counter) { - assert(key_schedule); + assert(encryption_keys); - init_vector = aesni_be2le128(_mm_add_epi32( - aesni_le2be128(init_vector), - aesni_make_block128(0, 0, 0, counter))); + init_vector = aesni_le2be128(init_vector); + init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter)); + init_vector = aesni_be2le128(init_vector); - return aesni_xor_block128( - plain, - aesni_aes192_encrypt_block_(init_vector, key_schedule)); + return aesni_xor_block128(plaintext, aesni_aes192_encrypt_block_(init_vector, encryption_keys)); } /** * \brief Decrypts a 128-bit block using AES-192 in CTR mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] key_schedule The AES-192 **encryption** key schedule. Must not be - * `NULL`. + * \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[in] counter The counter, typically incremented between consecutive calls. + * * \return The decrypted 128-bit plaintext. */ static __inline AesNI_Block128 __fastcall aesni_aes192_decrypt_block_ctr( - AesNI_Block128 cipher, - const AesNI_Aes192_RoundKeys* key_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes192_RoundKeys* encryption_keys, AesNI_Block128 init_vector, int counter) { - assert(key_schedule); + assert(encryption_keys); - init_vector = aesni_be2le128(_mm_add_epi32( - aesni_le2be128(init_vector), - aesni_make_block128(0, 0, 0, counter))); + init_vector = aesni_le2be128(init_vector); + init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter)); + init_vector = aesni_be2le128(init_vector); - return aesni_xor_block128( - cipher, - aesni_aes192_encrypt_block_(init_vector, key_schedule)); + return aesni_xor_block128(ciphertext, aesni_aes192_encrypt_block_(init_vector, encryption_keys)); } /** - * \} - * - * \defgroup aesni_block_api_aes256 AES-256 - * \{ - */ - -/** - * \brief Expands a key schedule for AES-256 encryption. + * \brief Expands an AES-256 key into 14 encryption round keys. * - * \param[in] key The AES-256 key. Must not be `NULL`. - * \param[out] key_schedule The AES-256 encryption key schedule. Must not be - * `NULL`. + * \param[in] key The AES-256 key. + * \param[out] encryption_keys The AES-256 encryption round keys. Must not be `NULL`. */ static __inline void __fastcall aesni_aes256_expand_key( const AesNI_Block256* key, - AesNI_Aes256_RoundKeys* key_schedule) + AesNI_Aes256_RoundKeys* encryption_keys) { assert(key); - assert(key_schedule); + assert(encryption_keys); - aesni_aes256_expand_key_(key->lo, key->hi, key_schedule); + aesni_aes256_expand_key_(key->lo, key->hi, encryption_keys); } /** - * \brief "Inverts" an AES-256 key schedule to prepare for decryption. + * \brief Derives AES-256 decryption round keys from AES-256 encryption round keys. * - * \param[in] key_schedule The AES-256 encryption key schedule. Must not be - * `NULL`. - * \param[out] inverted_schedule The AES-256 decryption key schedule. Must not - * be `NULL`. + * \param[in] encryption_keys The AES-256 encryption round keys. Must not be `NULL`. + * \param[out] decryption_keys The AES-256 decryption round keys. Must not be `NULL`. */ static __inline void __fastcall aesni_aes256_derive_decryption_keys( - const AesNI_Aes256_RoundKeys* key_schedule, - AesNI_Aes256_RoundKeys* inverted_schedule) + const AesNI_Aes256_RoundKeys* encryption_keys, + AesNI_Aes256_RoundKeys* decryption_keys) { - assert(key_schedule); - assert(inverted_schedule); + assert(encryption_keys); + assert(decryption_keys); - aesni_aes256_derive_decryption_keys_(key_schedule, inverted_schedule); + aesni_aes256_derive_decryption_keys_(encryption_keys, decryption_keys); } /** * \brief Encrypts a 128-bit block using AES-256 in ECB mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-256 encryption key schedule. Must not be - * `NULL`. + * \param[in] plaintext The plaintext to be encrypted. + * \param[in] encryption_keys The AES-256 encryption round keys. Must not be `NULL`. + * * \return The encrypted 128-bit ciphertext. */ static __inline AesNI_Block128 __fastcall aesni_aes256_encrypt_block_ecb( - AesNI_Block128 plain, - const AesNI_Aes256_RoundKeys* key_schedule) + AesNI_Block128 plaintext, + const AesNI_Aes256_RoundKeys* encryption_keys) { - assert(key_schedule); + assert(encryption_keys); - return aesni_aes256_encrypt_block_(plain, key_schedule); + return aesni_aes256_encrypt_block_(plaintext, encryption_keys); } /** * \brief Decrypts a 128-bit block using AES-256 in ECB mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] inverted_schedule The AES-256 decryption key schedule. Must not - * be `NULL`. + * \param[in] ciphertext The ciphertext to be decrypted. + * \param[in] decryption_keys The AES-256 decryption round keys. Must not be `NULL`. + * * \return The decrypted 128-bit plaintext. */ static __inline AesNI_Block128 __fastcall aesni_aes256_decrypt_block_ecb( - AesNI_Block128 cipher, - const AesNI_Aes256_RoundKeys* inverted_schedule) + AesNI_Block128 ciphertext, + const AesNI_Aes256_RoundKeys* decryption_keys) { - assert(inverted_schedule); + assert(decryption_keys); - return aesni_aes256_decrypt_block_(cipher, inverted_schedule); + return aesni_aes256_decrypt_block_(ciphertext, decryption_keys); } /** * \brief Encrypts a 128-bit block using AES-256 in CBC mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-256 encryption key schedule. Must not be - * `NULL`. + * \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 CBC initialization vector. - * \param[out] next_init_vector The next CBC initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes256_encrypt_block_cbc( - AesNI_Block128 plain, - const AesNI_Aes256_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes256_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 cipher = aesni_aes256_encrypt_block_( - aesni_xor_block128(plain, init_vector), - key_schedule); - *next_init_vector = cipher; - return cipher; + AesNI_Block128 ciphertext = aesni_aes256_encrypt_block_(aesni_xor_block128(plaintext, init_vector), encryption_keys); + *next_init_vector = ciphertext; + return ciphertext; } /** * \brief Decrypts a 128-bit block using AES-256 in CBC mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] inverted_schedule The AES-256 decryption key schedule. Must not - * be `NULL`. + * \param[in] ciphertext The ciphertext to be decrypted. + * \param[in] decryption_keys The AES-256 decryption round keys. Must not be `NULL`. * \param[in] init_vector The CBC initialization vector. - * \param[out] next_init_vector The next CBC initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes256_decrypt_block_cbc( - AesNI_Block128 cipher, - const AesNI_Aes256_RoundKeys* inverted_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes256_RoundKeys* decryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(inverted_schedule); + assert(decryption_keys); assert(next_init_vector); - AesNI_Block128 plain = aesni_xor_block128( - aesni_aes256_decrypt_block_(cipher, inverted_schedule), - init_vector); - *next_init_vector = cipher; - return plain; + AesNI_Block128 plaintext = aesni_xor_block128(aesni_aes256_decrypt_block_(ciphertext, decryption_keys), init_vector); + *next_init_vector = ciphertext; + return plaintext; } /** * \brief Encrypts a 128-bit block using AES-256 in CFB mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-256 encryption key schedule. Must not be - * `NULL`. + * \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 CFB initialization vector. - * \param[out] next_init_vector The next CFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes256_encrypt_block_cfb( - AesNI_Block128 plain, - const AesNI_Aes256_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes256_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 cipher = aesni_xor_block128( - aesni_aes256_encrypt_block_(init_vector, key_schedule), - plain); - *next_init_vector = cipher; - return cipher; + AesNI_Block128 ciphertext = aesni_xor_block128(aesni_aes256_encrypt_block_(init_vector, encryption_keys), plaintext); + *next_init_vector = ciphertext; + return ciphertext; } /** * \brief Decrypts a 128-bit block using AES-256 in CFB mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] key_schedule The AES-256 **encryption** key schedule. Must not be - * `NULL`. + * \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 CFB initialization vector. - * \param[out] next_init_vector The next CFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes256_decrypt_block_cfb( - AesNI_Block128 cipher, - const AesNI_Aes256_RoundKeys* key_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes256_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 plain = aesni_xor_block128( - aesni_aes256_encrypt_block_(init_vector, key_schedule), - cipher); - *next_init_vector = cipher; - return plain; + AesNI_Block128 plaintext = aesni_xor_block128(aesni_aes256_encrypt_block_(init_vector, encryption_keys), ciphertext); + *next_init_vector = ciphertext; + return plaintext; } /** * \brief Encrypts a 128-bit block using AES-256 in OFB mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-256 encryption key schedule. Must not be - * `NULL`. + * \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 OFB initialization vector. - * \param[out] next_init_vector The next OFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes256_encrypt_block_ofb( - AesNI_Block128 plain, - const AesNI_Aes256_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes256_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 tmp = aesni_aes256_encrypt_block_(init_vector, key_schedule); + AesNI_Block128 tmp = aesni_aes256_encrypt_block_(init_vector, encryption_keys); *next_init_vector = tmp; - return aesni_xor_block128(tmp, plain); + return aesni_xor_block128(tmp, plaintext); } /** * \brief Decrypts a 128-bit block using AES-256 in OFB mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] key_schedule The AES-256 **encryption** key schedule. Must not be - * `NULL`. + * \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 OFB initialization vector. - * \param[out] next_init_vector The next OFB initialization vector to be used - * as the initialization vector for the next call. Must not be `NULL`. + * \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. */ static __inline AesNI_Block128 __fastcall aesni_aes256_decrypt_block_ofb( - AesNI_Block128 cipher, - const AesNI_Aes256_RoundKeys* key_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes256_RoundKeys* encryption_keys, AesNI_Block128 init_vector, AesNI_Block128* next_init_vector) { - assert(key_schedule); + assert(encryption_keys); assert(next_init_vector); - AesNI_Block128 tmp = aesni_aes256_encrypt_block_(init_vector, key_schedule); + AesNI_Block128 tmp = aesni_aes256_encrypt_block_(init_vector, encryption_keys); *next_init_vector = tmp; - return aesni_xor_block128(tmp, cipher); + return aesni_xor_block128(tmp, ciphertext); } /** * \brief Encrypts a 128-bit block using AES-256 in CTR mode of operation. * - * \param[in] plain The plaintext to be encrypted. - * \param[in] key_schedule The AES-256 encryption key schedule. Must not be - * `NULL`. + * \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[in] counter The counter, typically incremented between consecutive calls. + * * \return The encrypted 128-bit ciphertext. */ static __inline AesNI_Block128 __fastcall aesni_aes256_encrypt_block_ctr( - AesNI_Block128 plain, - const AesNI_Aes256_RoundKeys* key_schedule, + AesNI_Block128 plaintext, + const AesNI_Aes256_RoundKeys* encryption_keys, AesNI_Block128 init_vector, int counter) { - assert(key_schedule); + assert(encryption_keys); - init_vector = aesni_be2le128(_mm_add_epi32( - aesni_le2be128(init_vector), - aesni_make_block128(0, 0, 0, counter))); + init_vector = aesni_le2be128(init_vector); + init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter)); + init_vector = aesni_be2le128(init_vector); - return aesni_xor_block128( - plain, - aesni_aes256_encrypt_block_(init_vector, key_schedule)); + return aesni_xor_block128(plaintext, aesni_aes256_encrypt_block_(init_vector, encryption_keys)); } /** * \brief Decrypts a 128-bit block using AES-256 in CTR mode of operation. * - * \param[in] cipher The ciphertext to be decrypted. - * \param[in] key_schedule The AES-256 **encryption** key schedule. Must not be - * `NULL`. + * \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[in] counter The counter, typically incremented between consecutive calls. + * * \return The decrypted 128-bit plaintext. */ static __inline AesNI_Block128 __fastcall aesni_aes256_decrypt_block_ctr( - AesNI_Block128 cipher, - const AesNI_Aes256_RoundKeys* key_schedule, + AesNI_Block128 ciphertext, + const AesNI_Aes256_RoundKeys* encryption_keys, AesNI_Block128 init_vector, int counter) { - assert(key_schedule); + assert(encryption_keys); - init_vector = aesni_be2le128(_mm_add_epi32( - aesni_le2be128(init_vector), - aesni_make_block128(0, 0, 0, counter))); + init_vector = aesni_le2be128(init_vector); + init_vector = _mm_add_epi32(init_vector, aesni_make_block128(0, 0, 0, counter)); + init_vector = aesni_be2le128(init_vector); - return aesni_xor_block128( - cipher, - aesni_aes256_encrypt_block_(init_vector, key_schedule)); + return aesni_xor_block128(ciphertext, aesni_aes256_encrypt_block_(init_vector, encryption_keys)); } #ifdef __cplusplus diff --git a/include/aesni/buffer.h b/include/aesni/buffer.h index d153c1b..489c206 100644 --- a/include/aesni/buffer.h +++ b/include/aesni/buffer.h @@ -24,14 +24,14 @@ AesNI_StatusCode aesni_encrypt_buffer_ecb128( size_t src_size, void* dest, size_t* dest_size, - AesNI_Aes128_RoundKeys* key_schedule, + AesNI_Aes128_RoundKeys* encryption_keys, AesNI_ErrorDetails* err_details); AesNI_StatusCode aesni_decrypt_buffer_ecb128( const void* src, size_t src_size, void* dest, size_t* dest_size, - AesNI_Aes128_RoundKeys* inverted_schedule, + AesNI_Aes128_RoundKeys* decryption_keys, AesNI_ErrorDetails* err_details); #ifdef __cplusplus |