diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-05-13 18:49:52 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-05-17 09:24:36 +1000 |
| commit | a1f63873ce33abf8ffc7b234ea27b587e1bcc0f2 (patch) | |
| tree | 05b794f66dbe8d261441ecede65a95e4bd21fae3 | |
| parent | b422ba3dda5d85c295aae6205909a6eeb4921c4b (diff) | |
Fix compiler error when using config option 'enable-acvp-tests'
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15264)
| -rw-r--r-- | test/acvp_test.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/test/acvp_test.c b/test/acvp_test.c index d400a81174..339c2fb965 100644 --- a/test/acvp_test.c +++ b/test/acvp_test.c @@ -450,7 +450,7 @@ static int dsa_create_pkey(EVP_PKEY **pkey, const unsigned char *g, size_t g_len, const unsigned char *seed, size_t seed_len, int counter, - const char *validate_type, + int validate_pq, int validate_g, const unsigned char *pub, size_t pub_len, BN_CTX *bn_ctx) { @@ -463,9 +463,12 @@ static int dsa_create_pkey(EVP_PKEY **pkey, if (!TEST_ptr(bld = OSSL_PARAM_BLD_new()) || !TEST_ptr(p_bn = BN_CTX_get(bn_ctx)) || !TEST_ptr(BN_bin2bn(p, p_len, p_bn)) - || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld, - OSSL_PKEY_PARAM_FFC_VALIDATE_TYPE, - validate_type, 0)) + || !TEST_true(OSSL_PARAM_BLD_push_int(bld, + OSSL_PKEY_PARAM_FFC_VALIDATE_PQ, + validate_pq)) + || !TEST_true(OSSL_PARAM_BLD_push_int(bld, + OSSL_PKEY_PARAM_FFC_VALIDATE_G, + validate_g)) || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_P, p_bn)) || !TEST_ptr(q_bn = BN_CTX_get(bn_ctx)) || !TEST_ptr(BN_bin2bn(q, q_len, q_bn)) @@ -524,7 +527,7 @@ static int dsa_pqver_test(int id) || !TEST_true(dsa_create_pkey(¶m_key, tst->p, tst->p_len, tst->q, tst->q_len, NULL, 0, tst->seed, tst->seed_len, tst->counter, - OSSL_FFC_PARAM_VALIDATE_PQ, + 1, 0, NULL, 0, bn_ctx)) || !TEST_ptr(key_ctx = EVP_PKEY_CTX_new_from_pkey(libctx, param_key, @@ -625,7 +628,7 @@ static int dsa_sigver_test(int id) if (!TEST_ptr(bn_ctx = BN_CTX_new()) || !TEST_true(dsa_create_pkey(&pkey, tst->p, tst->p_len, tst->q, tst->q_len, tst->g, tst->g_len, - NULL, 0, 0, "", tst->pub, tst->pub_len, + NULL, 0, 0, 0, 0, tst->pub, tst->pub_len, bn_ctx))) goto err; |