diff options
| -rw-r--r-- | aes/include/aes/aes.h | 60 | ||||
| -rw-r--r-- | aes/src/error.c | 3 | ||||
| -rw-r--r-- | aesxx/include/aesxx/debug.hpp | 1 |
3 files changed, 32 insertions, 32 deletions
diff --git a/aes/include/aes/aes.h b/aes/include/aes/aes.h index 6c70918..9203841 100644 --- a/aes/include/aes/aes.h +++ b/aes/include/aes/aes.h @@ -402,38 +402,38 @@ static __inline AES_AES_Block __fastcall aes_AES256_inc_block(AES_AES256_Block b return aes_AES_inc_block(block); } -AES_ENCRYPT_BLOCK_ECB(AES128); -AES_DECRYPT_BLOCK_ECB(AES128); -AES_ENCRYPT_BLOCK_CBC(AES128); -AES_DECRYPT_BLOCK_CBC(AES128); -AES_ENCRYPT_BLOCK_CFB(AES128); -AES_DECRYPT_BLOCK_CFB(AES128); -AES_ENCRYPT_BLOCK_OFB(AES128); -AES_DECRYPT_BLOCK_OFB(AES128); -AES_ENCRYPT_BLOCK_CTR(AES128); -AES_DECRYPT_BLOCK_CTR(AES128); +AES_ENCRYPT_BLOCK_ECB(AES128) +AES_DECRYPT_BLOCK_ECB(AES128) +AES_ENCRYPT_BLOCK_CBC(AES128) +AES_DECRYPT_BLOCK_CBC(AES128) +AES_ENCRYPT_BLOCK_CFB(AES128) +AES_DECRYPT_BLOCK_CFB(AES128) +AES_ENCRYPT_BLOCK_OFB(AES128) +AES_DECRYPT_BLOCK_OFB(AES128) +AES_ENCRYPT_BLOCK_CTR(AES128) +AES_DECRYPT_BLOCK_CTR(AES128) -AES_ENCRYPT_BLOCK_ECB(AES192); -AES_DECRYPT_BLOCK_ECB(AES192); -AES_ENCRYPT_BLOCK_CBC(AES192); -AES_DECRYPT_BLOCK_CBC(AES192); -AES_ENCRYPT_BLOCK_CFB(AES192); -AES_DECRYPT_BLOCK_CFB(AES192); -AES_ENCRYPT_BLOCK_OFB(AES192); -AES_DECRYPT_BLOCK_OFB(AES192); -AES_ENCRYPT_BLOCK_CTR(AES192); -AES_DECRYPT_BLOCK_CTR(AES192); +AES_ENCRYPT_BLOCK_ECB(AES192) +AES_DECRYPT_BLOCK_ECB(AES192) +AES_ENCRYPT_BLOCK_CBC(AES192) +AES_DECRYPT_BLOCK_CBC(AES192) +AES_ENCRYPT_BLOCK_CFB(AES192) +AES_DECRYPT_BLOCK_CFB(AES192) +AES_ENCRYPT_BLOCK_OFB(AES192) +AES_DECRYPT_BLOCK_OFB(AES192) +AES_ENCRYPT_BLOCK_CTR(AES192) +AES_DECRYPT_BLOCK_CTR(AES192) -AES_ENCRYPT_BLOCK_ECB(AES256); -AES_DECRYPT_BLOCK_ECB(AES256); -AES_ENCRYPT_BLOCK_CBC(AES256); -AES_DECRYPT_BLOCK_CBC(AES256); -AES_ENCRYPT_BLOCK_CFB(AES256); -AES_DECRYPT_BLOCK_CFB(AES256); -AES_ENCRYPT_BLOCK_OFB(AES256); -AES_DECRYPT_BLOCK_OFB(AES256); -AES_ENCRYPT_BLOCK_CTR(AES256); -AES_DECRYPT_BLOCK_CTR(AES256); +AES_ENCRYPT_BLOCK_ECB(AES256) +AES_DECRYPT_BLOCK_ECB(AES256) +AES_ENCRYPT_BLOCK_CBC(AES256) +AES_DECRYPT_BLOCK_CBC(AES256) +AES_ENCRYPT_BLOCK_CFB(AES256) +AES_DECRYPT_BLOCK_CFB(AES256) +AES_ENCRYPT_BLOCK_OFB(AES256) +AES_DECRYPT_BLOCK_OFB(AES256) +AES_ENCRYPT_BLOCK_CTR(AES256) +AES_DECRYPT_BLOCK_CTR(AES256) /** * \brief Expands an AES-128 key into 10 encryption round keys. diff --git a/aes/src/error.c b/aes/src/error.c index 7c6594f..8de8a5d 100644 --- a/aes/src/error.c +++ b/aes/src/error.c @@ -43,7 +43,8 @@ static int c99_snprintf(char* dest, size_t dest_size, const char* fmt, ...) { #endif static void aes_fill_string(char* dest, size_t dest_size, const char* src) { - strncpy(dest, src, dest_size); + assert(dest_size != 0); + strncpy(dest, src, dest_size - 1); dest[dest_size - 1] = '\0'; } diff --git a/aesxx/include/aesxx/debug.hpp b/aesxx/include/aesxx/debug.hpp index 845986e..959934b 100644 --- a/aesxx/include/aesxx/debug.hpp +++ b/aesxx/include/aesxx/debug.hpp @@ -9,7 +9,6 @@ #include <windows.h> #include <dbghelp.h> -#pragma comment(lib, "dbghelp.lib") #endif #include <cstddef> |