X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=test_digest.c;h=a931a3509d577dacb0917d06185ac25c4230b5bc;hb=55f0eb1b77c1c1bfc387927bad06210257f50f21;hp=9d3019a9cc8363848bd63d5194038177b3b35bdb;hpb=b92c6c80b9a1790933d1fd6817b674e724658dc8;p=openssl-gost%2Fengine.git diff --git a/test_digest.c b/test_digest.c index 9d3019a..a931a35 100644 --- a/test_digest.c +++ b/test_digest.c @@ -54,8 +54,10 @@ else \ printf(cGREEN " Test passed" cNORM "\n");} +#ifdef __GNUC__ /* To test older APIs. */ -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif /* * Test keys from both GOST R 34.12-2015 and GOST R 34.13-2015, @@ -637,7 +639,7 @@ static int do_mac(int iter, EVP_MAC *mac, const char *plaintext, size_t acpkm = (size_t)t->acpkm; size_t acpkm_t = (size_t)t->acpkm_t; - OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END, OSSL_PARAM_END }; + OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END, OSSL_PARAM_END, OSSL_PARAM_END }; OSSL_PARAM *p = params; if (acpkm) { *p++ = OSSL_PARAM_construct_size_t("key-mesh", &acpkm); @@ -650,8 +652,10 @@ static int do_mac(int iter, EVP_MAC *mac, const char *plaintext, if (t->outsize) T(EVP_MAC_CTX_get_mac_size(ctx) == t->outsize); size_t outsize; - if (t->truncate) + if (t->truncate) { outsize = t->truncate; + *p++ = OSSL_PARAM_construct_size_t("size", &outsize); + } else outsize = EVP_MAC_CTX_get_mac_size(ctx);