aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/buffer.c
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2015-06-18 04:30:28 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2015-06-18 04:30:28 +0300
commit962e48d3ffb90308513fd8908d73753049a27f3d (patch)
treec54909153762ae8d017dc815721f6ea35fbe6086 /src/buffer.c
parenttest/toolkit.py: capture stderr (diff)
downloadaes-tools-962e48d3ffb90308513fd8908d73753049a27f3d.tar.gz
aes-tools-962e48d3ffb90308513fd8908d73753049a27f3d.zip
better error messages + refactoring
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 80120db..593a5b8 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -22,7 +22,7 @@ AesNI_StatusCode aesni_encrypt_buffer_ecb128(
AesNI_ErrorDetails* err_details)
{
if (dest_size == NULL)
- return aesni_make_null_argument_error(err_details, "dest_size");
+ return aesni_error_null_argument(err_details, "dest_size");
const size_t rem_size = src_size % 16;
const size_t padding_size = 16 - rem_size;
@@ -31,9 +31,9 @@ AesNI_StatusCode aesni_encrypt_buffer_ecb128(
if (dest == NULL)
return AESNI_SUCCESS;
if (src == NULL)
- return aesni_make_null_argument_error(err_details, "src");
+ return aesni_error_null_argument(err_details, "src");
if (encryption_keys == NULL)
- return aesni_make_null_argument_error(err_details, "encryption_keys");
+ return aesni_error_null_argument(err_details, "encryption_keys");
const size_t src_len = src_size / 16;
@@ -84,16 +84,16 @@ AesNI_StatusCode aesni_decrypt_buffer_ecb128(
AesNI_ErrorDetails* err_details)
{
if (dest_size == NULL)
- return aesni_make_null_argument_error(err_details, "dest_size");
+ return aesni_error_null_argument(err_details, "dest_size");
*dest_size = src_size;
if (dest == NULL)
return 0;
if (src == NULL)
- return aesni_make_null_argument_error(err_details, "src");
+ return aesni_error_null_argument(err_details, "src");
if (decryption_keys == NULL)
- return aesni_make_null_argument_error(err_details, "decryption_keys");
+ return aesni_error_null_argument(err_details, "decryption_keys");
const size_t src_len = src_size / 16;
@@ -112,7 +112,7 @@ AesNI_StatusCode aesni_decrypt_buffer_ecb128(
unsigned char padding_size = get_pkcs7_padding_size(padding);
if (padding_size == 0)
- return aesni_make_invalid_pkcs7_padding_error(err_details);
+ return aesni_error_invalid_pkcs7_padding(err_details);
memcpy(dest, padding, 16 - padding_size);
*dest_size -= padding_size;