diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-24 10:42:23 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-01 09:25:20 +0100 |
| commit | d8652be06e2778e8898453a391deb7253e1a35a2 (patch) | |
| tree | fe40e22edb39642aa7ae633320c1900388f2e7ee /test/acvp_test.c | |
| parent | aedac96c1172ca9a9efe72e027e935504b599e2f (diff) | |
| download | openssl-d8652be06e2778e8898453a391deb7253e1a35a2.zip openssl-d8652be06e2778e8898453a391deb7253e1a35a2.tar.gz openssl-d8652be06e2778e8898453a391deb7253e1a35a2.tar.bz2 | |
Run the withlibctx.pl script
Automatically rename all instances of _with_libctx() to _ex() as per
our coding style.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12970)
Diffstat (limited to 'test/acvp_test.c')
| -rw-r--r-- | test/acvp_test.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/test/acvp_test.c b/test/acvp_test.c index 74e2eac..9fa259e 100644 --- a/test/acvp_test.c +++ b/test/acvp_test.c @@ -101,9 +101,8 @@ static int sig_gen(EVP_PKEY *pkey, OSSL_PARAM *params, const char *digest_name, if (!TEST_ptr(sig = OPENSSL_malloc(sz)) || !TEST_ptr(md_ctx = EVP_MD_CTX_new()) - || !TEST_int_eq(EVP_DigestSignInit_with_libctx(md_ctx, NULL, - digest_name, libctx, NULL, - pkey), 1) + || !TEST_int_eq(EVP_DigestSignInit_ex(md_ctx, NULL, digest_name, libctx, + NULL, pkey), 1) || !TEST_int_gt(EVP_DigestSign(md_ctx, sig, &sig_len, msg, msg_len), 0)) goto err; *sig_out = sig; @@ -311,9 +310,8 @@ static int ecdsa_sigver_test(int id) ret = TEST_int_gt((sig_len = i2d_ECDSA_SIG(sign, &sig)), 0) && TEST_ptr(md_ctx = EVP_MD_CTX_new()) - && TEST_true(EVP_DigestVerifyInit_with_libctx(md_ctx, NULL, - tst->digest_alg, - libctx, NULL, pkey) + && TEST_true(EVP_DigestVerifyInit_ex(md_ctx, NULL, tst->digest_alg, + libctx, NULL, pkey) && TEST_int_eq(EVP_DigestVerify(md_ctx, sig, sig_len, tst->msg, tst->msg_len), tst->pass)); err: @@ -1254,9 +1252,9 @@ static int rsa_sigver_test(int id) || !TEST_true(rsa_create_pkey(&pkey, tst->n, tst->n_len, tst->e, tst->e_len, NULL, 0, bn_ctx)) || !TEST_ptr(md_ctx = EVP_MD_CTX_new()) - || !TEST_true(EVP_DigestVerifyInit_with_libctx(md_ctx, &pkey_ctx, - tst->digest_alg, - libctx, NULL, pkey) + || !TEST_true(EVP_DigestVerifyInit_ex(md_ctx, &pkey_ctx, + tst->digest_alg, libctx, NULL, + pkey) || !TEST_true(EVP_PKEY_CTX_set_params(pkey_ctx, params)) || !TEST_int_eq(EVP_DigestVerify(md_ctx, tst->sig, tst->sig_len, tst->msg, tst->msg_len), tst->pass))) |