Update openssl-3.0.0-alpha17 -> openssl-3.0.0-beta2 for codeql as well

[openssl-gost/engine.git] / test_digest.c

diff --git a/test_digest.c b/test_digest.c
index 6a355337dce2a479af876f2c54241656dd29e594..8500233a03d2dd4d486e6367157f45fa54ee3b8d 100644 (file)
--- a/test_digest.c
+++ b/test_digest.c
@@ -49,9 +49,9 @@
 #define cMAGENT "\033[1;35m"
 #define cNORM  "\033[m"
 #define TEST_ASSERT(e) {if ((test = (e))) \
-                printf(cRED "  Test FAILED\n" cNORM); \
+                printf(cRED "  Test FAILED" cNORM "\n"); \
             else \
-                printf(cGREEN "  Test passed\n" cNORM);}
+                printf(cGREEN "  Test passed" cNORM "\n");}
 
 /* To test older APIs. */
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
@@ -509,7 +509,7 @@ static int do_hmac_old(int iter, const EVP_MD *type, const char *plaintext,
     if (t->mdsize)
        T(len == t->mdsize);
     if (memcmp(md, t->hmac, len) != 0) {
-       printf(cRED "hmac mismatch\n" cNORM);
+       printf(cRED "hmac mismatch" cNORM "\n");
        hexdump(t->hmac, len);
        hexdump(md, len);
        return 1;
@@ -533,12 +533,9 @@ static int do_hmac_prov(int iter, const EVP_MD *type, const char *plaintext,
     OSSL_PARAM params[] = {
        OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_DIGEST,
            (char *)EVP_MD_name(type), 0),
-       OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY,
-           (char *)t->key, t->key_size),
        OSSL_PARAM_END
     };
-    T(EVP_MAC_CTX_set_params(ctx, params));
-    T(EVP_MAC_init(ctx));
+    T(EVP_MAC_init(ctx, (const unsigned char *)t->key, t->key_size, params));
     T(EVP_MAC_update(ctx, (unsigned char *)plaintext, t->psize));
     T(EVP_MAC_final(ctx, md, &len, EVP_MAX_MD_SIZE));
     EVP_MAC_CTX_free(ctx);
@@ -547,7 +544,7 @@ static int do_hmac_prov(int iter, const EVP_MD *type, const char *plaintext,
     if (t->mdsize)
        T(len == t->mdsize);
     if (memcmp(md, t->hmac, len) != 0) {
-       printf(cRED "hmac mismatch\n" cNORM);
+       printf(cRED "hmac mismatch" cNORM "\n");
        hexdump(t->hmac, len);
        hexdump(md, len);
        return 1;
@@ -609,11 +606,10 @@ static int do_cmac_prov(int iter, const char *plaintext,
     T(ctx = EVP_MAC_CTX_new(cmac));
     OSSL_PARAM params[] = {
        OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_CIPHER, mdname, 0),
-       OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, (char *)t->key, t->key_size),
        OSSL_PARAM_END
     };
     T(EVP_MAC_CTX_set_params(ctx, params));
-    T(EVP_MAC_init(ctx));
+    T(EVP_MAC_init(ctx, (const unsigned char *)t->key, t->key_size, params));
     T(EVP_MAC_update(ctx, (unsigned char *)plaintext, t->psize));
     T(EVP_MAC_final(ctx, md, &len, EVP_MAX_MD_SIZE));
     EVP_MAC_CTX_free(ctx);
@@ -623,7 +619,7 @@ static int do_cmac_prov(int iter, const char *plaintext,
      * So, just compare until what we need. */
     T(mdsize <= len);
     if (memcmp(md, t->digest, mdsize) != 0) {
-       printf(cRED "cmac mismatch\n" cNORM);
+       printf(cRED "cmac mismatch" cNORM "\n");
        hexdump(t->digest, mdsize);
        hexdump(md, len);
        return 1;
@@ -673,7 +669,7 @@ static int do_digest(int iter, const EVP_MD *type, const char *plaintext,
     EVP_MD_CTX_free(ctx);
     T(len == mdsize);
     if (memcmp(md, t->digest, mdsize) != 0) {
-       printf(cRED "digest mismatch\n" cNORM);
+       printf(cRED "digest mismatch" cNORM "\n");
        hexdump(t->digest, mdsize);
        hexdump(md, mdsize);
        return 1;
@@ -711,9 +707,9 @@ static int do_test(const struct hash_testvec *tv)
     OPENSSL_free(buf);
 
     if (!ret)
-       printf(cGREEN "success\n" cNORM);
+       printf(cGREEN "success" cNORM "\n");
     else
-       printf(cRED "fail\n" cNORM);
+       printf(cRED "fail" cNORM "\n");
     return ret;
 }
 
@@ -775,13 +771,13 @@ static int do_synthetic_once(const struct hash_testvec *tv, unsigned int shifts)
     EVP_MD_CTX_free(ctx2);
 
     if (len != mdlen) {
-       printf(cRED "digest output len mismatch %u != %u (expected)\n" cNORM,
+       printf(cRED "digest output len mismatch %u != %u (expected)" cNORM "\n",
            len, mdlen);
        goto err;
     }
 
     if (memcmp(md, tv->digest, mdlen) != 0) {
-       printf(cRED "digest mismatch\n" cNORM);
+       printf(cRED "digest mismatch" cNORM "\n");
 
        unsigned int i;
        printf("  Expected value is: ");
@@ -811,9 +807,9 @@ static int do_synthetic_test(const struct hash_testvec *tv)
        ret |= do_synthetic_once(tv, shifts);
 
     if (!ret)
-       printf(cGREEN "success\n" cNORM);
+       printf(cGREEN "success" cNORM "\n");
     else
-       printf(cRED "fail\n" cNORM);
+       printf(cRED "fail" cNORM "\n");
     return 0;
 }
 
@@ -825,13 +821,7 @@ int main(int argc, char **argv)
     /* Trigger SIGBUS for unaligned access. */
     sysmips(MIPS_FIXADE, 0);
 #endif
-    setenv("OPENSSL_ENGINES", ENGINE_DIR, 0);
     OPENSSL_add_all_algorithms_conf();
-    ERR_load_crypto_strings();
-    ENGINE *eng;
-    T(eng = ENGINE_by_id("gost"));
-    T(ENGINE_init(eng));
-    T(ENGINE_set_default(eng, ENGINE_METHOD_ALL));
 
     const struct hash_testvec *tv;
     for (tv = testvecs; tv->nid; tv++) {
@@ -841,7 +831,9 @@ int main(int argc, char **argv)
            ret |= do_synthetic_test(tv);
     }
 
+    ENGINE *eng;
     ENGINE_DIGESTS_PTR fn_c;
+    T(eng = ENGINE_by_id("gost"));
     T(fn_c = ENGINE_get_digests(eng));
     const int *nids;
     int n, k;
@@ -851,15 +843,13 @@ int main(int argc, char **argv)
            if (tv->nid == nids[k])
                break;
        if (!tv->nid)
-           printf(cMAGENT "Digest %s is untested!\n" cNORM, OBJ_nid2sn(nids[k]));
+           printf(cMAGENT "Digest %s is untested!" cNORM "\n", OBJ_nid2sn(nids[k]));
     }
-
-    ENGINE_finish(eng);
     ENGINE_free(eng);
 
     if (ret)
-       printf(cDRED "= Some tests FAILED!\n" cNORM);
+       printf(cDRED "= Some tests FAILED!" cNORM "\n");
     else
-       printf(cDGREEN "= All tests passed!\n" cNORM);
+       printf(cDGREEN "= All tests passed!" cNORM "\n");
     return ret;
 }