diff options
author | Tomas Mraz <tomas@openssl.org> | 2021-02-11 16:57:37 +0100 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-02-17 15:26:12 +0100 |
commit | fe75766c9c2919f649df7b3ad209df2bc5e56dd0 (patch) | |
tree | e7be8f417b0102fffe05865c41a4fbf384993587 /test/endecode_test.c | |
parent | Fix backward incompatibility revolving around OSSL_HTTP_REQ_CTX_sendreq_d2i() (diff) | |
download | openssl-fe75766c9c2919f649df7b3ad209df2bc5e56dd0.tar.xz openssl-fe75766c9c2919f649df7b3ad209df2bc5e56dd0.zip |
Rename OSSL_ENCODER_CTX_new_by_EVP_PKEY and OSSL_DECODER_CTX_new_by_EVP_PKEY
Additional renames done in encoder and decoder implementation
to follow the style.
Fixes #13622
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14155)
Diffstat (limited to 'test/endecode_test.c')
-rw-r--r-- | test/endecode_test.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/endecode_test.c b/test/endecode_test.c index 178d0ca77f..b5da47d338 100644 --- a/test/endecode_test.c +++ b/test/endecode_test.c @@ -198,10 +198,10 @@ static int encode_EVP_PKEY_prov(void **encoded, long *encoded_len, const unsigned char *upass = (const unsigned char *)pass; int ok = 0; - if (!TEST_ptr(ectx = OSSL_ENCODER_CTX_new_by_EVP_PKEY(pkey, selection, - output_type, - output_structure, - NULL)) + if (!TEST_ptr(ectx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection, + output_type, + output_structure, + NULL)) || !TEST_int_gt(OSSL_ENCODER_CTX_get_num_encoders(ectx), 0) || (pass != NULL && !TEST_true(OSSL_ENCODER_CTX_set_passphrase(ectx, upass, @@ -256,12 +256,12 @@ static int decode_EVP_PKEY_prov(void **object, void *encoded, long encoded_len, const char *testtype = (i == 0) ? input_type : ((i == 1) ? NULL : badtype); - if (!TEST_ptr(dctx = OSSL_DECODER_CTX_new_by_EVP_PKEY(&testpkey, - testtype, - NULL, - keytype, - selection, - NULL, NULL)) + if (!TEST_ptr(dctx = OSSL_DECODER_CTX_new_for_pkey(&testpkey, + testtype, + NULL, + keytype, + selection, + NULL, NULL)) || (pass != NULL && !OSSL_DECODER_CTX_set_passphrase(dctx, upass, strlen(pass))) || !TEST_int_gt(BIO_reset(encoded_bio), 0) |