From 4ec7fb481dc732292d1f1007c93240a43c26e003 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 27 Nov 2015 11:00:29 +0100 Subject: [PATCH] Remove generichash tests with invalid parameters They must be reintroduced at some point, probably by overriding the `abort` symbol. --- test/default/generichash.c | 15 --------------- test/default/generichash.exp | 1 - test/default/generichash3.c | 22 +--------------------- test/default/generichash3.exp | 2 +- 4 files changed, 2 insertions(+), 38 deletions(-) diff --git a/test/default/generichash.c b/test/default/generichash.c index 045562b3..056559ca 100644 --- a/test/default/generichash.c +++ b/test/default/generichash.c @@ -1366,21 +1366,6 @@ main(void) printf("%02x", (unsigned int) out[j]); } printf("\n"); - - memset(out, 0, sizeof out); - crypto_generichash(out, crypto_generichash_BYTES_MAX, in, - (unsigned long long) i, NULL, 1U); - for (j = 0; j < crypto_generichash_BYTES_MAX; ++j) { - printf("%02x", (unsigned int) out[j]); - } - printf("\n"); - - assert(crypto_generichash(out, 0U, in, sizeof in, k, sizeof k) == -1); - assert(crypto_generichash(out, crypto_generichash_BYTES_MAX + 1U, - in, sizeof in, k, sizeof k) == -1); - assert(crypto_generichash(out, sizeof out, in, sizeof in, - k, crypto_generichash_KEYBYTES_MAX + 1U) == -1); - assert(crypto_generichash_bytes_min() > 0U); assert(crypto_generichash_bytes_max() > 0U); assert(crypto_generichash_bytes() > 0U); diff --git a/test/default/generichash.exp b/test/default/generichash.exp index 9ddebde2..ac46f325 100644 --- a/test/default/generichash.exp +++ b/test/default/generichash.exp @@ -63,4 +63,3 @@ cc66a891768e95a2717b040c111996f14942f10f2475c33aa5f1c97476e6f8386733d6b21c16102d bdd3d0fafe8ba2b29d1ac0b79aa46e249cc9d3a82d0f772d690637bbdd353722356658d00436ff5dd5239ab747979329345eb8c7ed11b7331456ae87350fcf bd965bf31e87d70327536f2a341cebc4768eca275fa05ef98f7f1b71a0351298de006fba73fe6733ed01d75801b4a928e54231b38e38c562b2e33ea1284992fa 2fc6e69fa26a89a5ed269092cb9b2a449a4409a7a44011eecad13d7c4b0456602d402fa5844f1a7a758136ce3d5d8d0e8b86921ffff4f692dd95bdc8e5ff0052 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/test/default/generichash3.c b/test/default/generichash3.c index 829b2ba0..e430b725 100644 --- a/test/default/generichash3.c +++ b/test/default/generichash3.c @@ -77,8 +77,6 @@ main(void) &st, k, crypto_generichash_blake2b_KEYBYTES_MAX, crypto_generichash_blake2b_BYTES_MAX, salt, NULL); crypto_generichash_blake2b_update(&st, in, MAXLEN); - assert(crypto_generichash_blake2b_final( - &st, out, crypto_generichash_blake2b_BYTES_MAX + 1U) == -1); crypto_generichash_blake2b_final( &st, out, crypto_generichash_blake2b_BYTES_MAX); for (j = 0; j < crypto_generichash_blake2b_BYTES_MAX; ++j) { @@ -98,7 +96,7 @@ main(void) memset(out, 0, sizeof out); crypto_generichash_blake2b_salt_personal( out, crypto_generichash_blake2b_BYTES_MAX, in, MAXLEN, - NULL, crypto_generichash_blake2b_KEYBYTES_MAX, salt, personal); + NULL, 0U, salt, personal); for (j = 0; j < crypto_generichash_blake2b_BYTES_MAX; ++j) { printf("%02x", (unsigned int) out[j]); } @@ -149,24 +147,6 @@ main(void) } printf("\n"); - assert(crypto_generichash_blake2b_init_salt_personal(&st, k, sizeof k, 0U, - salt, personal) == -1); - assert(crypto_generichash_blake2b_init_salt_personal(&st, k, sizeof k, - crypto_generichash_BYTES_MAX + 1U, - salt, personal) == -1); - assert(crypto_generichash_blake2b_init_salt_personal(&st, k, - crypto_generichash_KEYBYTES_MAX + 1U, - sizeof out, salt, personal) == -1); - - assert(crypto_generichash_blake2b_salt_personal(out, 0U, in, MAXLEN, - k, sizeof k, - salt, personal) == -1); - assert(crypto_generichash_blake2b_salt_personal(out, crypto_generichash_BYTES_MAX + 1U, - in, MAXLEN, k, sizeof k, - salt, personal) == -1); - assert(crypto_generichash_blake2b_salt_personal(out, sizeof out, in, MAXLEN, - k, crypto_generichash_KEYBYTES_MAX + 1U, - salt, personal) == -1); assert(crypto_generichash_blake2b_init_salt_personal(&st, k, sizeof k, crypto_generichash_BYTES, NULL, personal) == 0); assert(crypto_generichash_blake2b_init_salt_personal(&st, k, sizeof k, crypto_generichash_BYTES, diff --git a/test/default/generichash3.exp b/test/default/generichash3.exp index 3123c2bc..75a62d43 100644 --- a/test/default/generichash3.exp +++ b/test/default/generichash3.exp @@ -67,7 +67,7 @@ c6d6722a916651a8671383d8260873347d9c248696b4cb3dac4dea9ba57ed971127cb18e44211d7e 5789f474edd5206ededaccfc35e7dd3ed730748125b5395abf802b2601126b19b109a1db67556945bc79bb25e1ab59610599d155070e0e04354f11a6a5d6f3ac e78efc663a5547c089f2b3b08973c974c4bfd365eac18b80c68bdb3b1ba4554b54d6b8465a68a3b9aa0bc020621f16efd5b8dd8c7c01ed9ee3ec5544aae465ff 1afc8ec818bef0a479d2b4cac81d40a52cafa27f6d80c42fc23cbaf4141882ab59ab1101922fcb6e707ef2f61efd07cce5d09094e6bee420b1b96998c7cee96d -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +1afc8ec818bef0a479d2b4cac81d40a52cafa27f6d80c42fc23cbaf4141882ab59ab1101922fcb6e707ef2f61efd07cce5d09094e6bee420b1b96998c7cee96d fb4e2ad6b7fe6afd2ba06d5c1d79379c5bf10e336a35c89a1aaf408a805171716e0635a5b1d18190131e15b6888510bcb3e3752b050f892a09dbbde60b051495 5789f474edd5206ededaccfc35e7dd3ed730748125b5395abf802b2601126b19b109a1db67556945bc79bb25e1ab59610599d155070e0e04354f11a6a5d6f3ac e78efc663a5547c089f2b3b08973c974c4bfd365eac18b80c68bdb3b1ba4554b54d6b8465a68a3b9aa0bc020621f16efd5b8dd8c7c01ed9ee3ec5544aae465ff