C++ compat

This commit is contained in:
Frank Denis 2015-10-21 17:42:22 +02:00
parent 61a4b75ba5
commit 5d0236c25e

View File

@ -1301,9 +1301,9 @@ tv(void)
size_t i = 0U; size_t i = 0U;
size_t in_len; size_t in_len;
key = sodium_malloc(crypto_generichash_KEYBYTES_MAX); key = (unsigned char *) sodium_malloc(crypto_generichash_KEYBYTES_MAX);
out = sodium_malloc(crypto_generichash_BYTES_MAX); out = (unsigned char *) sodium_malloc(crypto_generichash_BYTES_MAX);
expected_out = sodium_malloc(crypto_generichash_BYTES_MAX); expected_out = (unsigned char *) sodium_malloc(crypto_generichash_BYTES_MAX);
do { do {
assert(strlen(tests[i].key_hex) == 2 * crypto_generichash_KEYBYTES_MAX); assert(strlen(tests[i].key_hex) == 2 * crypto_generichash_KEYBYTES_MAX);
sodium_hex2bin(key, crypto_generichash_KEYBYTES_MAX, sodium_hex2bin(key, crypto_generichash_KEYBYTES_MAX,
@ -1314,7 +1314,7 @@ tv(void)
tests[i].out_hex, strlen(tests[i].out_hex), tests[i].out_hex, strlen(tests[i].out_hex),
NULL, NULL, NULL); NULL, NULL, NULL);
in_len = strlen(tests[i].in_hex) / 2; in_len = strlen(tests[i].in_hex) / 2;
in = sodium_malloc(in_len); in = (unsigned char *) sodium_malloc(in_len);
sodium_hex2bin(in, in_len, tests[i].in_hex, strlen(tests[i].in_hex), sodium_hex2bin(in, in_len, tests[i].in_hex, strlen(tests[i].in_hex),
NULL, NULL, NULL); NULL, NULL, NULL);
crypto_generichash(out, crypto_generichash_BYTES_MAX, crypto_generichash(out, crypto_generichash_BYTES_MAX,