From 3f5df3abf1386ce9071046bb00e5eae27a10e2ef Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Mon, 15 Jun 2015 21:32:42 +0300
Subject: handle block parsing errors the standard way

---
 test/aes128cbc_decrypt_block.c | 6 +++---
 test/aes128cbc_encrypt_block.c | 6 +++---
 test/aes128cfb_decrypt_block.c | 6 +++---
 test/aes128cfb_encrypt_block.c | 6 +++---
 test/aes128ctr_decrypt_block.c | 6 +++---
 test/aes128ctr_encrypt_block.c | 6 +++---
 test/aes128ecb_decrypt_block.c | 4 ++--
 test/aes128ecb_encrypt_block.c | 4 ++--
 test/aes128ofb_decrypt_block.c | 6 +++---
 test/aes128ofb_encrypt_block.c | 6 +++---
 test/aes192cbc_decrypt_block.c | 6 +++---
 test/aes192cbc_encrypt_block.c | 6 +++---
 test/aes192cfb_decrypt_block.c | 6 +++---
 test/aes192cfb_encrypt_block.c | 6 +++---
 test/aes192ctr_decrypt_block.c | 6 +++---
 test/aes192ctr_encrypt_block.c | 6 +++---
 test/aes192ecb_decrypt_block.c | 4 ++--
 test/aes192ecb_encrypt_block.c | 4 ++--
 test/aes192ofb_decrypt_block.c | 6 +++---
 test/aes192ofb_encrypt_block.c | 6 +++---
 test/aes256cbc_decrypt_block.c | 6 +++---
 test/aes256cbc_encrypt_block.c | 6 +++---
 test/aes256cfb_decrypt_block.c | 6 +++---
 test/aes256cfb_encrypt_block.c | 6 +++---
 test/aes256ctr_decrypt_block.c | 6 +++---
 test/aes256ctr_encrypt_block.c | 6 +++---
 test/aes256ecb_decrypt_block.c | 4 ++--
 test/aes256ecb_encrypt_block.c | 4 ++--
 test/aes256ofb_decrypt_block.c | 6 +++---
 test/aes256ofb_encrypt_block.c | 6 +++---
 30 files changed, 84 insertions(+), 84 deletions(-)

(limited to 'test')

diff --git a/test/aes128cbc_decrypt_block.c b/test/aes128cbc_decrypt_block.c
index c7ab933..f702e4a 100644
--- a/test/aes128cbc_decrypt_block.c
+++ b/test/aes128cbc_decrypt_block.c
@@ -28,13 +28,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block128(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block128(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes128cbc_encrypt_block.c b/test/aes128cbc_encrypt_block.c
index 301d791..7ee7734 100644
--- a/test/aes128cbc_encrypt_block.c
+++ b/test/aes128cbc_encrypt_block.c
@@ -28,13 +28,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block128(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block128(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -47,7 +47,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes128cfb_decrypt_block.c b/test/aes128cfb_decrypt_block.c
index 8e14fcc..e84e5fa 100644
--- a/test/aes128cfb_decrypt_block.c
+++ b/test/aes128cfb_decrypt_block.c
@@ -28,13 +28,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block128(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block128(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -47,7 +47,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes128cfb_encrypt_block.c b/test/aes128cfb_encrypt_block.c
index d322fce..9ef1df4 100644
--- a/test/aes128cfb_encrypt_block.c
+++ b/test/aes128cfb_encrypt_block.c
@@ -28,13 +28,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block128(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block128(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -47,7 +47,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes128ctr_decrypt_block.c b/test/aes128ctr_decrypt_block.c
index 1b25653..354626a 100644
--- a/test/aes128ctr_decrypt_block.c
+++ b/test/aes128ctr_decrypt_block.c
@@ -28,13 +28,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block128(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block128(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -49,7 +49,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes128ctr_encrypt_block.c b/test/aes128ctr_encrypt_block.c
index 5ab0689..3bab709 100644
--- a/test/aes128ctr_encrypt_block.c
+++ b/test/aes128ctr_encrypt_block.c
@@ -28,13 +28,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block128(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block128(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -49,7 +49,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes128ecb_decrypt_block.c b/test/aes128ecb_decrypt_block.c
index 156dbdf..7b34641 100644
--- a/test/aes128ecb_decrypt_block.c
+++ b/test/aes128ecb_decrypt_block.c
@@ -28,7 +28,7 @@ int main(int argc, char** argv)
         if (argc < 1)
             exit_with_usage();
 
-        if (aesni_parse_block128(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block128(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes128ecb_encrypt_block.c b/test/aes128ecb_encrypt_block.c
index c071c6c..502cc65 100644
--- a/test/aes128ecb_encrypt_block.c
+++ b/test/aes128ecb_encrypt_block.c
@@ -28,7 +28,7 @@ int main(int argc, char** argv)
         if (argc < 1)
             exit_with_usage();
 
-        if (aesni_parse_block128(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block128(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
@@ -41,7 +41,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes128ofb_decrypt_block.c b/test/aes128ofb_decrypt_block.c
index d1c60b8..ac29f05 100644
--- a/test/aes128ofb_decrypt_block.c
+++ b/test/aes128ofb_decrypt_block.c
@@ -28,13 +28,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block128(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block128(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -47,7 +47,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes128ofb_encrypt_block.c b/test/aes128ofb_encrypt_block.c
index 7839bc3..e25aac8 100644
--- a/test/aes128ofb_encrypt_block.c
+++ b/test/aes128ofb_encrypt_block.c
@@ -28,13 +28,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block128(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block128(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -47,7 +47,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes192cbc_decrypt_block.c b/test/aes192cbc_decrypt_block.c
index 85fafca..8a034ba 100644
--- a/test/aes192cbc_decrypt_block.c
+++ b/test/aes192cbc_decrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block192(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block192(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 192-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -49,7 +49,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes192cbc_encrypt_block.c b/test/aes192cbc_encrypt_block.c
index 27b5384..6d8f15e 100644
--- a/test/aes192cbc_encrypt_block.c
+++ b/test/aes192cbc_encrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block192(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block192(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 192-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes192cfb_decrypt_block.c b/test/aes192cfb_decrypt_block.c
index 38df143..13abb88 100644
--- a/test/aes192cfb_decrypt_block.c
+++ b/test/aes192cfb_decrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block192(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block192(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 192-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes192cfb_encrypt_block.c b/test/aes192cfb_encrypt_block.c
index cee6f11..19137b2 100644
--- a/test/aes192cfb_encrypt_block.c
+++ b/test/aes192cfb_encrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block192(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block192(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 192-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes192ctr_decrypt_block.c b/test/aes192ctr_decrypt_block.c
index 64eb9e8..ce90f3a 100644
--- a/test/aes192ctr_decrypt_block.c
+++ b/test/aes192ctr_decrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block192(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block192(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 192-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes192ctr_encrypt_block.c b/test/aes192ctr_encrypt_block.c
index 1b0985a..5258efa 100644
--- a/test/aes192ctr_encrypt_block.c
+++ b/test/aes192ctr_encrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block192(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block192(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 192-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes192ecb_decrypt_block.c b/test/aes192ecb_decrypt_block.c
index 4e247f4..5d209ae 100644
--- a/test/aes192ecb_decrypt_block.c
+++ b/test/aes192ecb_decrypt_block.c
@@ -29,7 +29,7 @@ int main(int argc, char** argv)
         if (argc < 1)
             exit_with_usage();
 
-        if (aesni_parse_block192(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block192(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
@@ -43,7 +43,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes192ecb_encrypt_block.c b/test/aes192ecb_encrypt_block.c
index 095307c..82f6821 100644
--- a/test/aes192ecb_encrypt_block.c
+++ b/test/aes192ecb_encrypt_block.c
@@ -29,7 +29,7 @@ int main(int argc, char** argv)
         if (argc < 1)
             exit_with_usage();
 
-        if (aesni_parse_block192(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block192(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 192-bit AES block '%s'\n", *argv);
             exit_with_usage();
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes192ofb_decrypt_block.c b/test/aes192ofb_decrypt_block.c
index 6b49a54..64bb708 100644
--- a/test/aes192ofb_decrypt_block.c
+++ b/test/aes192ofb_decrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block192(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block192(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 192-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes192ofb_encrypt_block.c b/test/aes192ofb_encrypt_block.c
index eb40be2..986ac37 100644
--- a/test/aes192ofb_encrypt_block.c
+++ b/test/aes192ofb_encrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block192(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block192(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 192-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes256cbc_decrypt_block.c b/test/aes256cbc_decrypt_block.c
index 1066b7f..89ead21 100644
--- a/test/aes256cbc_decrypt_block.c
+++ b/test/aes256cbc_decrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block256(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block256(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 256-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -49,7 +49,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes256cbc_encrypt_block.c b/test/aes256cbc_encrypt_block.c
index 965a962..f6e067e 100644
--- a/test/aes256cbc_encrypt_block.c
+++ b/test/aes256cbc_encrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block256(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block256(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 256-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes256cfb_decrypt_block.c b/test/aes256cfb_decrypt_block.c
index 9662431..249f413 100644
--- a/test/aes256cfb_decrypt_block.c
+++ b/test/aes256cfb_decrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block256(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block256(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 256-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes256cfb_encrypt_block.c b/test/aes256cfb_encrypt_block.c
index 0da1799..7713db5 100644
--- a/test/aes256cfb_encrypt_block.c
+++ b/test/aes256cfb_encrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block256(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block256(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 256-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes256ctr_decrypt_block.c b/test/aes256ctr_decrypt_block.c
index 7923f4c..e2669e6 100644
--- a/test/aes256ctr_decrypt_block.c
+++ b/test/aes256ctr_decrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block256(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block256(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 256-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes256ctr_encrypt_block.c b/test/aes256ctr_encrypt_block.c
index df52bcd..7d1d8e7 100644
--- a/test/aes256ctr_encrypt_block.c
+++ b/test/aes256ctr_encrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block256(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block256(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 256-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes256ecb_decrypt_block.c b/test/aes256ecb_decrypt_block.c
index 4583bed..134b33f 100644
--- a/test/aes256ecb_decrypt_block.c
+++ b/test/aes256ecb_decrypt_block.c
@@ -29,7 +29,7 @@ int main(int argc, char** argv)
         if (argc < 1)
             exit_with_usage();
 
-        if (aesni_parse_block256(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block256(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 256-bit AES block '%s'\n", *argv);
             exit_with_usage();
@@ -43,7 +43,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes256ecb_encrypt_block.c b/test/aes256ecb_encrypt_block.c
index 9aa771d..3d0a8ee 100644
--- a/test/aes256ecb_encrypt_block.c
+++ b/test/aes256ecb_encrypt_block.c
@@ -29,7 +29,7 @@ int main(int argc, char** argv)
         if (argc < 1)
             exit_with_usage();
 
-        if (aesni_parse_block256(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block256(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 256-bit AES block '%s'\n", *argv);
             exit_with_usage();
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes256ofb_decrypt_block.c b/test/aes256ofb_decrypt_block.c
index 8eed57e..1033df7 100644
--- a/test/aes256ofb_decrypt_block.c
+++ b/test/aes256ofb_decrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block256(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block256(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 256-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&cipher, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&cipher, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
diff --git a/test/aes256ofb_encrypt_block.c b/test/aes256ofb_encrypt_block.c
index 98ed6a8..71dfea9 100644
--- a/test/aes256ofb_encrypt_block.c
+++ b/test/aes256ofb_encrypt_block.c
@@ -29,13 +29,13 @@ int main(int argc, char** argv)
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_parse_block256(&key, *argv) != 0)
+        if (aesni_is_error(aesni_parse_block256(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 256-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_parse_block128(&iv, argv[1]) != 0)
+        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_parse_block128(&plain, *argv) != 0)
+            if (aesni_is_error(aesni_parse_block128(&plain, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
-- 
cgit v1.2.3