[openssl-commits] [openssl] master update
Rich Salz
rsalz at openssl.org
Thu Apr 20 18:13:35 UTC 2017
The branch master has been updated
via 623d1056de175ee5cd17839617fbfabac72cba91 (commit)
from 9d9d2879627ba796db9dd7c688302f36c635a3c6 (commit)
- Log -----------------------------------------------------------------
commit 623d1056de175ee5cd17839617fbfabac72cba91
Author: Rich Salz <rsalz at openssl.org>
Date: Thu Apr 20 14:00:52 2017 -0400
Convert hmactest to new test framework
Updated after code review, and fix indenting
Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3175)
-----------------------------------------------------------------------
Summary of changes:
test/build.info | 2 +-
test/hmactest.c | 332 +++++++++++++++++++++++---------------------------------
2 files changed, 135 insertions(+), 199 deletions(-)
diff --git a/test/build.info b/test/build.info
index 0b0bf8e..4525362 100644
--- a/test/build.info
+++ b/test/build.info
@@ -75,7 +75,7 @@ IF[{- !$disabled{tests} -}]
INCLUDE[md2test]=../include
DEPEND[md2test]=../libcrypto
- SOURCE[hmactest]=hmactest.c
+ SOURCE[hmactest]=hmactest.c testutil.c test_main.c
INCLUDE[hmactest]=../include
DEPEND[hmactest]=../libcrypto
diff --git a/test/hmactest.c b/test/hmactest.c
index a5c6e74..d7e68b4 100644
--- a/test/hmactest.c
+++ b/test/hmactest.c
@@ -23,6 +23,9 @@
# include <openssl/ebcdic.h>
# endif
+#include "test_main.h"
+#include "testutil.h"
+
# ifndef OPENSSL_NO_MD5
static struct test_st {
unsigned char key[16];
@@ -79,21 +82,11 @@ static struct test_st {
static char *pt(unsigned char *md, unsigned int len);
-int main(int argc, char *argv[])
-{
+
# ifndef OPENSSL_NO_MD5
- int i;
+static int test_hmac_md5(int idx)
+{
char *p;
-# endif
- int err = 0;
- HMAC_CTX *ctx = NULL, *ctx2 = NULL;
- unsigned char buf[EVP_MAX_MD_SIZE];
- unsigned int len;
-
-# ifdef OPENSSL_NO_MD5
- printf("test skipped: MD5 disabled\n");
-# else
-
# ifdef CHARSET_EBCDIC
ebcdic2ascii(test[0].data, test[0].data, test[0].data_len);
ebcdic2ascii(test[1].data, test[1].data, test[1].data_len);
@@ -101,202 +94,135 @@ int main(int argc, char *argv[])
ebcdic2ascii(test[2].data, test[2].data, test[2].data_len);
# endif
- for (i = 0; i < 4; i++) {
- p = pt(HMAC(EVP_md5(),
- test[i].key, test[i].key_len,
- test[i].data, test[i].data_len, NULL, NULL),
- MD5_DIGEST_LENGTH);
-
- if (strcmp(p, (char *)test[i].digest) != 0) {
- printf("Error calculating HMAC on %d entry'\n", i);
- printf("got %s instead of %s\n", p, test[i].digest);
- err++;
- } else
- printf("test %d ok\n", i);
- }
-# endif /* OPENSSL_NO_MD5 */
+ p = pt(HMAC(EVP_md5(),
+ test[idx].key, test[idx].key_len,
+ test[idx].data, test[idx].data_len, NULL, NULL),
+ MD5_DIGEST_LENGTH);
+
+ if (!TEST_str_eq(p, (char *)test[idx].digest))
+ return 0;
+
+ return 1;
+}
+# endif
+
+static int test_hmac_bad()
+{
+ HMAC_CTX *ctx = NULL;
+ int ret = 0;
-/* test4 */
ctx = HMAC_CTX_new();
- if (ctx == NULL) {
- printf("HMAC malloc failure (test 4)\n");
- err++;
- goto end;
- }
- if (HMAC_CTX_get_md(ctx) != NULL) {
- printf("Message digest not NULL for HMAC (test 4)\n");
- err++;
- goto test5;
- }
- if (HMAC_Init_ex(ctx, NULL, 0, NULL, NULL)) {
- printf("Should fail to initialise HMAC with empty MD and key (test 4)\n");
- err++;
- goto test5;
- }
- if (HMAC_Update(ctx, test[4].data, test[4].data_len)) {
- printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
- err++;
- goto test5;
- }
- if (HMAC_Init_ex(ctx, NULL, 0, EVP_sha1(), NULL)) {
- printf("Should fail to initialise HMAC with empty key (test 4)\n");
- err++;
- goto test5;
- }
- if (HMAC_Update(ctx, test[4].data, test[4].data_len)) {
- printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
- err++;
- goto test5;
- }
- printf("test 4 ok\n");
-test5:
- /* Test 5 has empty key; test that single-shot accepts a NULL key. */
- p = pt(HMAC(EVP_sha1(), NULL, 0, test[4].data, test[4].data_len,
- NULL, NULL), SHA_DIGEST_LENGTH);
- if (strcmp(p, (char *)test[4].digest) != 0) {
- printf("Error calculating HMAC on %d entry'\n", i);
- printf("got %s instead of %s\n", p, test[4].digest);
- err++;
- }
+ if (!TEST_ptr(ctx)
+ || !TEST_ptr_null(HMAC_CTX_get_md(ctx))
+ || !TEST_false(HMAC_Init_ex(ctx, NULL, 0, NULL, NULL))
+ || !TEST_false(HMAC_Update(ctx, test[4].data, test[4].data_len))
+ || !TEST_false(HMAC_Init_ex(ctx, NULL, 0, EVP_sha1(), NULL))
+ || !TEST_false(HMAC_Update(ctx, test[4].data, test[4].data_len)))
+ goto err;
+
+ ret = 1;
+err:
+ HMAC_CTX_free(ctx);
+ return ret;
+}
+
+static int test_hmac_run()
+{
+ char *p;
+ HMAC_CTX *ctx = NULL;
+ unsigned char buf[EVP_MAX_MD_SIZE];
+ unsigned int len;
+ int ret = 0;
+ ctx = HMAC_CTX_new();
HMAC_CTX_reset(ctx);
- if (HMAC_CTX_get_md(ctx) != NULL) {
- printf("Message digest not NULL for HMAC (test 5)\n");
- err++;
- goto test6;
- }
- if (HMAC_Init_ex(ctx, test[4].key, test[4].key_len, NULL, NULL)) {
- printf("Should fail to initialise HMAC with empty MD (test 5)\n");
- err++;
- goto test6;
- }
- if (HMAC_Update(ctx, test[4].data, test[4].data_len)) {
- printf("Should fail HMAC_Update with ctx not set up (test 5)\n");
- err++;
- goto test6;
- }
- if (HMAC_Init_ex(ctx, test[4].key, -1, EVP_sha1(), NULL)) {
- printf("Should fail to initialise HMAC with invalid key len(test 5)\n");
- err++;
- goto test6;
- }
- if (!HMAC_Init_ex(ctx, test[4].key, test[4].key_len, EVP_sha1(), NULL)) {
- printf("Failed to initialise HMAC (test 5)\n");
- err++;
- goto test6;
- }
- if (!HMAC_Update(ctx, test[4].data, test[4].data_len)) {
- printf("Error updating HMAC with data (test 5)\n");
- err++;
- goto test6;
- }
- if (!HMAC_Final(ctx, buf, &len)) {
- printf("Error finalising data (test 5)\n");
- err++;
- goto test6;
- }
+
+ if (!TEST_ptr(ctx)
+ || !TEST_ptr_null(HMAC_CTX_get_md(ctx))
+ || !TEST_false(HMAC_Init_ex(ctx, NULL, 0, NULL, NULL))
+ || !TEST_false(HMAC_Update(ctx, test[4].data, test[4].data_len))
+ || !TEST_false(HMAC_Init_ex(ctx, test[4].key, -1, EVP_sha1(), NULL)))
+ goto err;
+
+ if (!TEST_true(HMAC_Init_ex(ctx, test[4].key, test[4].key_len, EVP_sha1(), NULL))
+ || !TEST_true(HMAC_Update(ctx, test[4].data, test[4].data_len))
+ || !TEST_true(HMAC_Final(ctx, buf, &len)))
+ goto err;
+
p = pt(buf, len);
- if (strcmp(p, (char *)test[4].digest) != 0) {
- printf("Error calculating interim HMAC on test 5\n");
- printf("got %s instead of %s\n", p, test[4].digest);
- err++;
- goto test6;
- }
- if (HMAC_Init_ex(ctx, NULL, 0, EVP_sha256(), NULL)) {
- printf("Should disallow changing MD without a new key (test 5)\n");
- err++;
- goto test6;
- }
- if (!HMAC_Init_ex(ctx, test[5].key, test[5].key_len, EVP_sha256(), NULL)) {
- printf("Failed to reinitialise HMAC (test 5)\n");
- err++;
- goto test6;
- }
- if (HMAC_CTX_get_md(ctx) != EVP_sha256()) {
- printf("Unexpected message digest for HMAC (test 5)\n");
- err++;
- goto test6;
- }
- if (!HMAC_Update(ctx, test[5].data, test[5].data_len)) {
- printf("Error updating HMAC with data (sha256) (test 5)\n");
- err++;
- goto test6;
- }
- if (!HMAC_Final(ctx, buf, &len)) {
- printf("Error finalising data (sha256) (test 5)\n");
- err++;
- goto test6;
- }
+ if (!TEST_str_eq(p, (char *)test[4].digest))
+ goto err;
+
+ if (!TEST_false(HMAC_Init_ex(ctx, NULL, 0, EVP_sha256(), NULL)))
+ goto err;
+
+ if (!TEST_true(HMAC_Init_ex(ctx, test[5].key, test[5].key_len, EVP_sha256(), NULL))
+ || !TEST_ptr_eq(HMAC_CTX_get_md(ctx), EVP_sha256())
+ || !TEST_true(HMAC_Update(ctx, test[5].data, test[5].data_len))
+ || !TEST_true(HMAC_Final(ctx, buf, &len)))
+ goto err;
+
p = pt(buf, len);
- if (strcmp(p, (char *)test[5].digest) != 0) {
- printf("Error calculating 2nd interim HMAC on test 5\n");
- printf("got %s instead of %s\n", p, test[5].digest);
- err++;
- goto test6;
- }
- if (!HMAC_Init_ex(ctx, test[6].key, test[6].key_len, NULL, NULL)) {
- printf("Failed to reinitialise HMAC with key (test 5)\n");
- err++;
- goto test6;
- }
- if (!HMAC_Update(ctx, test[6].data, test[6].data_len)) {
- printf("Error updating HMAC with data (new key) (test 5)\n");
- err++;
- goto test6;
- }
- if (!HMAC_Final(ctx, buf, &len)) {
- printf("Error finalising data (new key) (test 5)\n");
- err++;
- goto test6;
- }
+ if (!TEST_str_eq(p, (char *)test[5].digest))
+ goto err;
+
+ if (!TEST_true(HMAC_Init_ex(ctx, test[6].key, test[6].key_len, NULL, NULL))
+ || !TEST_true(HMAC_Update(ctx, test[6].data, test[6].data_len))
+ || !TEST_true(HMAC_Final(ctx, buf, &len)))
+ goto err;
p = pt(buf, len);
- if (strcmp(p, (char *)test[6].digest) != 0) {
- printf("error calculating HMAC on test 5\n");
- printf("got %s instead of %s\n", p, test[6].digest);
- err++;
- } else {
- printf("test 5 ok\n");
- }
-test6:
- HMAC_CTX_reset(ctx);
+ if (!TEST_str_eq(p, (char *)test[6].digest))
+ goto err;
+
+ ret = 1;
+err:
+ HMAC_CTX_free(ctx);
+ return ret;
+}
+
+
+static int test_hmac_single_shot()
+{
+ char *p;
+
+ /* Test single-shot with an empty key. */
+ p = pt(HMAC(EVP_sha1(), NULL, 0, test[4].data, test[4].data_len,
+ NULL, NULL), SHA_DIGEST_LENGTH);
+ if (!TEST_str_eq(p, (char *)test[4].digest))
+ return 0;
+
+ return 1;
+}
+
+
+static int test_hmac_copy()
+{
+ char *p;
+ HMAC_CTX *ctx = NULL, *ctx2 = NULL;
+ unsigned char buf[EVP_MAX_MD_SIZE];
+ unsigned int len;
+ int ret = 0;
+
+ ctx = HMAC_CTX_new();
ctx2 = HMAC_CTX_new();
- if (ctx2 == NULL) {
- printf("HMAC malloc failure (test 6)\n");
- err++;
- goto end;
- }
- if (!HMAC_Init_ex(ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL)) {
- printf("Failed to initialise HMAC (test 6)\n");
- err++;
- goto end;
- }
- if (!HMAC_Update(ctx, test[7].data, test[7].data_len)) {
- printf("Error updating HMAC with data (test 6)\n");
- err++;
- goto end;
- }
- if (!HMAC_CTX_copy(ctx2, ctx)) {
- printf("Failed to copy HMAC_CTX (test 6)\n");
- err++;
- goto end;
- }
- if (!HMAC_Final(ctx2, buf, &len)) {
- printf("Error finalising data (test 6)\n");
- err++;
- goto end;
- }
+ if (!TEST_ptr(ctx) || !TEST_ptr(ctx2))
+ goto err;
+
+ if (!TEST_true(HMAC_Init_ex(ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL))
+ || !TEST_true(HMAC_Update(ctx, test[7].data, test[7].data_len))
+ || !TEST_true(HMAC_CTX_copy(ctx2, ctx))
+ || !TEST_true(HMAC_Final(ctx2, buf, &len)))
+ goto err;
+
p = pt(buf, len);
- if (strcmp(p, (char *)test[7].digest) != 0) {
- printf("Error calculating HMAC on test 6\n");
- printf("got %s instead of %s\n", p, test[7].digest);
- err++;
- } else {
- printf("test 6 ok\n");
- }
-end:
+ if (!TEST_str_eq(p, (char *)test[7].digest))
+ goto err;
+
+ ret = 1;
+err:
HMAC_CTX_free(ctx2);
HMAC_CTX_free(ctx);
- EXIT(err);
+ return ret;
}
# ifndef OPENSSL_NO_MD5
@@ -310,3 +236,13 @@ static char *pt(unsigned char *md, unsigned int len)
return (buf);
}
# endif
+
+void register_tests(void)
+{
+ ADD_ALL_TESTS(test_hmac_md5, 4);
+ ADD_TEST(test_hmac_single_shot);
+ ADD_TEST(test_hmac_bad);
+ ADD_TEST(test_hmac_run);
+ ADD_TEST(test_hmac_copy);
+}
+
More information about the openssl-commits
mailing list