diff options
Diffstat (limited to 'tests/vb2_sha_tests.c')
| -rw-r--r-- | tests/vb2_sha_tests.c | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/tests/vb2_sha_tests.c b/tests/vb2_sha_tests.c index cbcd7282..c60bbd15 100644 --- a/tests/vb2_sha_tests.c +++ b/tests/vb2_sha_tests.c @@ -5,18 +5,13 @@ /* FIPS 180-2 Tests for message digest functions. */ -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "test_common.h" - +#include "2sysincludes.h" #include "2rsa.h" #include "2sha.h" +#include "2return_codes.h" -#include "cryptolib.h" #include "sha_test_vectors.h" +#include "test_common.h" static int vb2_digest(const uint8_t *buf, uint32_t size, @@ -49,17 +44,18 @@ void sha1_tests(void) test_inputs[2] = (uint8_t *) long_msg; for (i = 0; i < 3; i++) { - TEST_EQ(vb2_digest(test_inputs[i], - strlen((char *)test_inputs[i]), - VB2_ALG_RSA1024_SHA1, digest, - sizeof(digest)), 0, "vb2_digest() SHA1"); + TEST_SUCC(vb2_digest(test_inputs[i], + strlen((char *)test_inputs[i]), + VB2_ALG_RSA1024_SHA1, digest, + sizeof(digest)), + "vb2_digest() SHA1"); TEST_EQ(memcmp(digest, sha1_results[i], sizeof(digest)), 0, "SHA1 digest"); } - TEST_NEQ(vb2_digest(test_inputs[0], strlen((char *)test_inputs[0]), + TEST_EQ(vb2_digest(test_inputs[0], strlen((char *)test_inputs[0]), VB2_ALG_RSA1024_SHA1, digest, sizeof(digest) - 1), - 0, "vb2_digest() too small"); + VB2_ERROR_SHA_FINALIZE_DIGEST_SIZE, "vb2_digest() too small"); } void sha256_tests(void) @@ -73,17 +69,18 @@ void sha256_tests(void) test_inputs[2] = (uint8_t *) long_msg; for (i = 0; i < 3; i++) { - TEST_EQ(vb2_digest(test_inputs[i], - strlen((char *)test_inputs[i]), - VB2_ALG_RSA1024_SHA256, digest, - sizeof(digest)), 0, "vb2_digest() SHA256"); + TEST_SUCC(vb2_digest(test_inputs[i], + strlen((char *)test_inputs[i]), + VB2_ALG_RSA1024_SHA256, digest, + sizeof(digest)), + "vb2_digest() SHA256"); TEST_EQ(memcmp(digest, sha256_results[i], sizeof(digest)), 0, "SHA-256 digest"); } - TEST_NEQ(vb2_digest(test_inputs[0], strlen((char *)test_inputs[0]), - VB2_ALG_RSA1024_SHA256, digest, sizeof(digest) - 1), - 0, "vb2_digest() too small"); + TEST_EQ(vb2_digest(test_inputs[0], strlen((char *)test_inputs[0]), + VB2_ALG_RSA1024_SHA256, digest, sizeof(digest) - 1), + VB2_ERROR_SHA_FINALIZE_DIGEST_SIZE, "vb2_digest() too small"); } void sha512_tests(void) @@ -97,17 +94,18 @@ void sha512_tests(void) test_inputs[2] = (uint8_t *) long_msg; for (i = 0; i < 3; i++) { - TEST_EQ(vb2_digest(test_inputs[i], - strlen((char *)test_inputs[i]), - VB2_ALG_RSA1024_SHA512, digest, - sizeof(digest)), 0, "vb2_digest() SHA512"); + TEST_SUCC(vb2_digest(test_inputs[i], + strlen((char *)test_inputs[i]), + VB2_ALG_RSA1024_SHA512, digest, + sizeof(digest)), + "vb2_digest() SHA512"); TEST_EQ(memcmp(digest, sha512_results[i], sizeof(digest)), 0, "SHA-512 digest"); } - TEST_NEQ(vb2_digest(test_inputs[0], strlen((char *)test_inputs[0]), - VB2_ALG_RSA1024_SHA512, digest, sizeof(digest) - 1), - 0, "vb2_digest() too small"); + TEST_EQ(vb2_digest(test_inputs[0], strlen((char *)test_inputs[0]), + VB2_ALG_RSA1024_SHA512, digest, sizeof(digest) - 1), + VB2_ERROR_SHA_FINALIZE_DIGEST_SIZE, "vb2_digest() too small"); } void misc_tests(void) @@ -117,17 +115,20 @@ void misc_tests(void) TEST_EQ(vb2_digest_size(VB2_ALG_COUNT), 0, "digest size invalid alg"); - TEST_NEQ(vb2_digest((uint8_t *)oneblock_msg, strlen(oneblock_msg), - VB2_ALG_COUNT, digest, sizeof(digest)), - 0, "vb2_digest() invalid alg"); + TEST_EQ(vb2_digest((uint8_t *)oneblock_msg, strlen(oneblock_msg), + VB2_ALG_COUNT, digest, sizeof(digest)), + VB2_ERROR_SHA_INIT_ALGORITHM, + "vb2_digest() invalid alg"); /* Test bad algorithm inside extend and finalize */ vb2_digest_init(&dc, VB2_ALG_RSA1024_SHA1); dc.algorithm = VB2_ALG_COUNT; - TEST_NEQ(vb2_digest_extend(&dc, digest, sizeof(digest)), - 0, "vb2_digest_extend() invalid alg"); - TEST_NEQ(vb2_digest_finalize(&dc, digest, sizeof(digest)), - 0, "vb2_digest_finalize() invalid alg"); + TEST_EQ(vb2_digest_extend(&dc, digest, sizeof(digest)), + VB2_ERROR_SHA_EXTEND_ALGORITHM, + "vb2_digest_extend() invalid alg"); + TEST_EQ(vb2_digest_finalize(&dc, digest, sizeof(digest)), + VB2_ERROR_SHA_FINALIZE_ALGORITHM, + "vb2_digest_finalize() invalid alg"); } int main(int argc, char *argv[]) |