aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/aes/src/aes.c
diff options
context:
space:
mode:
Diffstat (limited to 'aes/src/aes.c')
-rw-r--r--aes/src/aes.c92
1 files changed, 40 insertions, 52 deletions
diff --git a/aes/src/aes.c b/aes/src/aes.c
index 95b532d..e2db120 100644
--- a/aes/src/aes.c
+++ b/aes/src/aes.c
@@ -12,8 +12,8 @@
#include <string.h>
AES_StatusCode aes_AES_format_block(
- AES_AES_BlockString* str,
- const AES_AES_Block* block,
+ AES_BlockString* str,
+ const AES_Block* block,
AES_ErrorDetails* err_details
) {
assert(str);
@@ -27,7 +27,7 @@ AES_StatusCode aes_AES_format_block(
char* cursor = str->str;
AES_ALIGN(unsigned char, 16) bytes[16];
- aes_store_block128_aligned(bytes, *block);
+ aes_store_block_aligned(bytes, *block);
for (int i = 0; i < 16; ++i, cursor += 2)
sprintf(cursor, "%02x", bytes[i]);
@@ -37,8 +37,8 @@ AES_StatusCode aes_AES_format_block(
}
AES_StatusCode aes_AES_format_block_as_matrix(
- AES_AES_BlockMatrixString* str,
- const AES_AES_Block* block,
+ AES_BlockMatrixString* str,
+ const AES_Block* block,
AES_ErrorDetails* err_details
) {
assert(str);
@@ -52,7 +52,7 @@ AES_StatusCode aes_AES_format_block_as_matrix(
char* cursor = str->str;
AES_ALIGN(unsigned char, 16) bytes[4][4];
- aes_store_block128_aligned(bytes, *block);
+ aes_store_block_aligned(bytes, *block);
for (int i = 0; i < 4; ++i, cursor += 3) {
for (int j = 0; j < 3; ++j, cursor += 3)
@@ -64,14 +64,14 @@ AES_StatusCode aes_AES_format_block_as_matrix(
return AES_SUCCESS;
}
-AES_StatusCode aes_AES_print_block(const AES_AES_Block* block, AES_ErrorDetails* err_details) {
+AES_StatusCode aes_AES_print_block(const AES_Block* block, AES_ErrorDetails* err_details) {
assert(block);
if (block == NULL)
return aes_error_null_argument(err_details, "block");
AES_StatusCode ec = AES_SUCCESS;
- AES_AES_BlockString str;
+ AES_BlockString str;
if (aes_is_error(ec = aes_AES_format_block(&str, block, err_details)))
return ec;
@@ -81,7 +81,7 @@ AES_StatusCode aes_AES_print_block(const AES_AES_Block* block, AES_ErrorDetails*
}
AES_StatusCode aes_AES_print_block_as_matrix(
- const AES_AES_Block* block,
+ const AES_Block* block,
AES_ErrorDetails* err_details
) {
assert(block);
@@ -90,7 +90,7 @@ AES_StatusCode aes_AES_print_block_as_matrix(
return aes_error_null_argument(err_details, "block");
AES_StatusCode ec = AES_SUCCESS;
- AES_AES_BlockMatrixString str;
+ AES_BlockMatrixString str;
if (aes_is_error(ec = aes_AES_format_block_as_matrix(&str, block, err_details)))
return ec;
@@ -100,7 +100,7 @@ AES_StatusCode aes_AES_print_block_as_matrix(
}
AES_StatusCode aes_AES_parse_block(
- AES_AES_Block* dest,
+ AES_Block* dest,
const char* src,
AES_ErrorDetails* err_details
) {
@@ -125,13 +125,13 @@ AES_StatusCode aes_AES_parse_block(
cursor += n;
}
- *dest = aes_load_block128_aligned(bytes);
+ *dest = aes_load_block_aligned(bytes);
return AES_SUCCESS;
}
-AES_StatusCode aes_AES128_format_key(
- AES_AES128_KeyString* str,
- const AES_AES128_Key* key,
+AES_StatusCode aes128_format_key(
+ AES128_KeyString* str,
+ const AES128_Key* key,
AES_ErrorDetails* err_details
) {
assert(str);
@@ -145,7 +145,7 @@ AES_StatusCode aes_AES128_format_key(
char* cursor = str->str;
AES_ALIGN(unsigned char, 16) bytes[16];
- aes_store_block128_aligned(bytes, key->key);
+ aes_store_block_aligned(bytes, key->key);
for (int i = 0; i < 16; ++i, cursor += 2)
sprintf(cursor, "%02x", bytes[i]);
@@ -154,9 +154,9 @@ AES_StatusCode aes_AES128_format_key(
return AES_SUCCESS;
}
-AES_StatusCode aes_AES192_format_key(
- AES_AES192_KeyString* str,
- const AES_AES192_Key* key,
+AES_StatusCode aes192_format_key(
+ AES192_KeyString* str,
+ const AES192_Key* key,
AES_ErrorDetails* err_details
) {
assert(str);
@@ -171,7 +171,7 @@ AES_StatusCode aes_AES192_format_key(
{
AES_ALIGN(unsigned char, 16) bytes[16];
- aes_store_block128_aligned(bytes, key->lo);
+ aes_store_block_aligned(bytes, key->lo);
for (int i = 0; i < 16; ++i, cursor += 2)
sprintf(cursor, "%02x", bytes[i]);
@@ -179,7 +179,7 @@ AES_StatusCode aes_AES192_format_key(
{
AES_ALIGN(unsigned char, 16) bytes[16];
- aes_store_block128_aligned(bytes, key->hi);
+ aes_store_block_aligned(bytes, key->hi);
for (int i = 0; i < 8; ++i, cursor += 2)
sprintf(cursor, "%02x", bytes[i]);
@@ -189,9 +189,9 @@ AES_StatusCode aes_AES192_format_key(
return AES_SUCCESS;
}
-AES_StatusCode aes_AES256_format_key(
- AES_AES256_KeyString* str,
- const AES_AES256_Key* key,
+AES_StatusCode aes256_format_key(
+ AES256_KeyString* str,
+ const AES256_Key* key,
AES_ErrorDetails* err_details
) {
assert(str);
@@ -206,7 +206,7 @@ AES_StatusCode aes_AES256_format_key(
{
AES_ALIGN(unsigned char, 16) bytes[16];
- aes_store_block128_aligned(bytes, key->lo);
+ aes_store_block_aligned(bytes, key->lo);
for (int i = 0; i < 16; ++i, cursor += 2)
sprintf(cursor, "%02x", bytes[i]);
@@ -214,7 +214,7 @@ AES_StatusCode aes_AES256_format_key(
{
AES_ALIGN(unsigned char, 16) bytes[16];
- aes_store_block128_aligned(bytes, key->hi);
+ aes_store_block_aligned(bytes, key->hi);
for (int i = 0; i < 16; ++i, cursor += 2)
sprintf(cursor, "%02x", bytes[i]);
@@ -224,55 +224,47 @@ AES_StatusCode aes_AES256_format_key(
return AES_SUCCESS;
}
-AES_StatusCode aes_AES128_print_key(const AES_AES128_Key* key, AES_ErrorDetails* err_details) {
+AES_StatusCode aes128_print_key(const AES128_Key* key, AES_ErrorDetails* err_details) {
return aes_AES_print_block(&key->key, err_details);
}
-AES_StatusCode aes_AES192_print_key(const AES_AES192_Key* key, AES_ErrorDetails* err_details) {
+AES_StatusCode aes192_print_key(const AES192_Key* key, AES_ErrorDetails* err_details) {
assert(key);
if (key == NULL)
return aes_error_null_argument(err_details, "key");
AES_StatusCode ec = AES_SUCCESS;
- AES_AES192_KeyString str;
+ AES192_KeyString str;
- if (aes_is_error(ec = aes_AES192_format_key(&str, key, err_details)))
+ if (aes_is_error(ec = aes192_format_key(&str, key, err_details)))
return ec;
printf("%s\n", str.str);
return ec;
}
-AES_StatusCode aes_AES256_print_key(const AES_AES256_Key* key, AES_ErrorDetails* err_details) {
+AES_StatusCode aes256_print_key(const AES256_Key* key, AES_ErrorDetails* err_details) {
assert(key);
if (key == NULL)
return aes_error_null_argument(err_details, "key");
AES_StatusCode ec = AES_SUCCESS;
- AES_AES256_KeyString str;
+ AES256_KeyString str;
- if (aes_is_error(ec = aes_AES256_format_key(&str, key, err_details)))
+ if (aes_is_error(ec = aes256_format_key(&str, key, err_details)))
return ec;
printf("%s\n", str.str);
return ec;
}
-AES_StatusCode aes_AES128_parse_key(
- AES_AES128_Key* dest,
- const char* src,
- AES_ErrorDetails* err_details
-) {
+AES_StatusCode aes128_parse_key(AES128_Key* dest, const char* src, AES_ErrorDetails* err_details) {
return aes_AES_parse_block(&dest->key, src, err_details);
}
-AES_StatusCode aes_AES192_parse_key(
- AES_AES192_Key* dest,
- const char* src,
- AES_ErrorDetails* err_details
-) {
+AES_StatusCode aes192_parse_key(AES192_Key* dest, const char* src, AES_ErrorDetails* err_details) {
assert(dest);
assert(src);
@@ -295,7 +287,7 @@ AES_StatusCode aes_AES192_parse_key(
cursor += n;
}
- dest->lo = aes_load_block128_aligned(bytes);
+ dest->lo = aes_load_block_aligned(bytes);
}
{
@@ -311,17 +303,13 @@ AES_StatusCode aes_AES192_parse_key(
}
memset(bytes + 8, 0x00, 8);
- dest->hi = aes_load_block128_aligned(bytes);
+ dest->hi = aes_load_block_aligned(bytes);
}
return AES_SUCCESS;
}
-AES_StatusCode aes_AES256_parse_key(
- AES_AES256_Key* dest,
- const char* src,
- AES_ErrorDetails* err_details
-) {
+AES_StatusCode aes256_parse_key(AES256_Key* dest, const char* src, AES_ErrorDetails* err_details) {
assert(dest);
assert(src);
@@ -344,7 +332,7 @@ AES_StatusCode aes_AES256_parse_key(
cursor += n;
}
- dest->lo = aes_load_block128_aligned(bytes);
+ dest->lo = aes_load_block_aligned(bytes);
}
{
@@ -359,7 +347,7 @@ AES_StatusCode aes_AES256_parse_key(
cursor += n;
}
- dest->hi = aes_load_block128_aligned(bytes);
+ dest->hi = aes_load_block_aligned(bytes);
}
return AES_SUCCESS;
generated by cgit v1.3 (git 2.53.0) at 2026-10-25 05:48:35 +0000