1 files changed, 57 insertions, 28 deletions
diff --git a/test/default/sodium_utils.c b/test/default/sodium_utils.c
index e50de24..89274de 100644
--- a/test/default/sodium_utils.c
+++ b/test/default/sodium_utils.c
@@ -1,35 +1,64 @@
-#include <stdio.h>
-#include <string.h>
 
 #define TEST_NAME "sodium_utils"
 #include "cmptest.h"
 
 int main(void)
 {
-  unsigned char buf1[1000];
-  unsigned char buf2[1000];
-  char          buf3[33];
-  unsigned char buf4[4];
-  const char   *hex;
-  size_t        bin_len;
-
-  randombytes(buf1, sizeof buf1);
-  memcpy(buf2, buf1, sizeof buf2);
-  printf("%d\n", sodium_memcmp(buf1, buf2, sizeof buf1));
-  sodium_memzero(buf1, 0U);
-  printf("%d\n", sodium_memcmp(buf1, buf2, sizeof buf1));
-  sodium_memzero(buf1, sizeof buf1 / 2);
-  printf("%d\n", sodium_memcmp(buf1, buf2, sizeof buf1));
-  printf("%d\n", sodium_memcmp(buf1, buf2, 0U));
-  sodium_memzero(buf2, sizeof buf2 / 2);
-  printf("%d\n", sodium_memcmp(buf1, buf2, sizeof buf1));
-  printf("%s\n", sodium_bin2hex(buf3, 33U,
-                                (const unsigned char *)
-                                "0123456789ABCDEF", 16U));
-  hex = "Cafe : 6942";
-  sodium_hex2bin(buf4, sizeof buf4, hex, strlen(hex), ": ", &bin_len, NULL);
-  printf("%lu:%02x%02x%02x%02x\n", (unsigned long) bin_len,
-         buf4[0], buf4[1], buf4[2], buf4[3]);
-
-  return 0;
+    unsigned char buf1[1000];
+    unsigned char buf2[1000];
+    char buf3[33];
+    unsigned char buf4[4];
+    const char *hex;
+    const char *hex_end;
+    size_t bin_len;
+
+    randombytes_buf(buf1, sizeof buf1);
+    memcpy(buf2, buf1, sizeof buf2);
+    printf("%d\n", sodium_memcmp(buf1, buf2, sizeof buf1));
+    sodium_memzero(buf1, 0U);
+    printf("%d\n", sodium_memcmp(buf1, buf2, sizeof buf1));
+    sodium_memzero(buf1, sizeof buf1 / 2);
+    printf("%d\n", sodium_memcmp(buf1, buf2, sizeof buf1));
+    printf("%d\n", sodium_memcmp(buf1, buf2, 0U));
+    sodium_memzero(buf2, sizeof buf2 / 2);
+    printf("%d\n", sodium_memcmp(buf1, buf2, sizeof buf1));
+    printf("%s\n",
+           sodium_bin2hex(buf3, 33U, (const unsigned char *)"0123456789ABCDEF",
+                          16U));
+    hex = "Cafe : 6942";
+    sodium_hex2bin(buf4, sizeof buf4, hex, strlen(hex), ": ", &bin_len, &hex_end);
+    printf("%lu:%02x%02x%02x%02x\n", (unsigned long)bin_len, buf4[0], buf4[1],
+           buf4[2], buf4[3]);
+    printf("dt1: %ld\n", (long) (hex_end - hex));
+
+    hex = "Cafe : 6942";
+    sodium_hex2bin(buf4, sizeof buf4, hex, strlen(hex), ": ", &bin_len, NULL);
+    printf("%lu:%02x%02x%02x%02x\n", (unsigned long)bin_len, buf4[2], buf4[3],
+           buf4[2], buf4[3]);
+
+    hex = "deadbeef";
+    if (sodium_hex2bin(buf1, 1U, hex, 8U, NULL, &bin_len, &hex_end) != -1) {
+        printf("sodium_hex2bin() overflow not detected\n");
+    }
+    printf("dt2: %ld\n", (long) (hex_end - hex));
+
+    hex = "de:ad:be:eff";
+    if (sodium_hex2bin(buf1, 4U, hex, 12U, ":", &bin_len, &hex_end) != -1) {
+        printf("sodium_hex2bin() with an odd input length and a short output buffer\n");
+    }
+    printf("dt3: %ld\n", (long) (hex_end - hex));
+
+    hex = "de:ad:be:eff";
+    if (sodium_hex2bin(buf1, sizeof buf1, hex, 12U, ":", &bin_len, &hex_end) != 0) {
+        printf("sodium_hex2bin() with an odd input length\n");
+    }
+    printf("dt4: %ld\n", (long) (hex_end - hex));
+
+    hex = "de:ad:be:eff";
+    if (sodium_hex2bin(buf1, sizeof buf1, hex, 13U, ":", &bin_len, &hex_end) != 0) {
+        printf("sodium_hex2bin() with an odd input length\n");
+    }
+    printf("dt5: %ld\n", (long) (hex_end - hex));
+
+    return 0;
 }