projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename the field 'provctx and data' to 'algctx' inside some objects containing
[openssl.git]
/
crypto
/
evp
/
pmeth_lib.c
diff --git
a/crypto/evp/pmeth_lib.c
b/crypto/evp/pmeth_lib.c
index 506e90fed86e9207a395094ba2fcd86809aaf225..47062c02c18e4fcf48f1f7ac5bcd764a8f137a93 100644
(file)
--- a/
crypto/evp/pmeth_lib.c
+++ b/
crypto/evp/pmeth_lib.c
@@
-160,15
+160,15
@@
int evp_pkey_ctx_state(const EVP_PKEY_CTX *ctx)
return EVP_PKEY_STATE_UNKNOWN;
if ((EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
return EVP_PKEY_STATE_UNKNOWN;
if ((EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
- && ctx->op.kex.
exchprov
ctx != NULL)
+ && ctx->op.kex.
alg
ctx != NULL)
|| (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
|| (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
- && ctx->op.sig.
sigprov
ctx != NULL)
+ && ctx->op.sig.
alg
ctx != NULL)
|| (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
|| (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
- && ctx->op.ciph.
ciphprov
ctx != NULL)
+ && ctx->op.ciph.
alg
ctx != NULL)
|| (EVP_PKEY_CTX_IS_GEN_OP(ctx)
&& ctx->op.keymgmt.genctx != NULL)
|| (EVP_PKEY_CTX_IS_KEM_OP(ctx)
|| (EVP_PKEY_CTX_IS_GEN_OP(ctx)
&& ctx->op.keymgmt.genctx != NULL)
|| (EVP_PKEY_CTX_IS_KEM_OP(ctx)
- && ctx->op.encap.
kemprov
ctx != NULL))
+ && ctx->op.encap.
alg
ctx != NULL))
return EVP_PKEY_STATE_PROVIDER;
return EVP_PKEY_STATE_LEGACY;
return EVP_PKEY_STATE_PROVIDER;
return EVP_PKEY_STATE_LEGACY;
@@
-360,29
+360,29
@@
EVP_PKEY_CTX *EVP_PKEY_CTX_new_from_pkey(OSSL_LIB_CTX *libctx, EVP_PKEY *pkey,
void evp_pkey_ctx_free_old_ops(EVP_PKEY_CTX *ctx)
{
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)) {
void evp_pkey_ctx_free_old_ops(EVP_PKEY_CTX *ctx)
{
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)) {
- if (ctx->op.sig.
sigprov
ctx != NULL && ctx->op.sig.signature != NULL)
- ctx->op.sig.signature->freectx(ctx->op.sig.
sigprov
ctx);
+ if (ctx->op.sig.
alg
ctx != NULL && ctx->op.sig.signature != NULL)
+ ctx->op.sig.signature->freectx(ctx->op.sig.
alg
ctx);
EVP_SIGNATURE_free(ctx->op.sig.signature);
EVP_SIGNATURE_free(ctx->op.sig.signature);
- ctx->op.sig.
sigprov
ctx = NULL;
+ ctx->op.sig.
alg
ctx = NULL;
ctx->op.sig.signature = NULL;
} else if (EVP_PKEY_CTX_IS_DERIVE_OP(ctx)) {
ctx->op.sig.signature = NULL;
} else if (EVP_PKEY_CTX_IS_DERIVE_OP(ctx)) {
- if (ctx->op.kex.
exchprov
ctx != NULL && ctx->op.kex.exchange != NULL)
- ctx->op.kex.exchange->freectx(ctx->op.kex.
exchprov
ctx);
+ if (ctx->op.kex.
alg
ctx != NULL && ctx->op.kex.exchange != NULL)
+ ctx->op.kex.exchange->freectx(ctx->op.kex.
alg
ctx);
EVP_KEYEXCH_free(ctx->op.kex.exchange);
EVP_KEYEXCH_free(ctx->op.kex.exchange);
- ctx->op.kex.
exchprov
ctx = NULL;
+ ctx->op.kex.
alg
ctx = NULL;
ctx->op.kex.exchange = NULL;
} else if (EVP_PKEY_CTX_IS_KEM_OP(ctx)) {
ctx->op.kex.exchange = NULL;
} else if (EVP_PKEY_CTX_IS_KEM_OP(ctx)) {
- if (ctx->op.encap.
kemprov
ctx != NULL && ctx->op.encap.kem != NULL)
- ctx->op.encap.kem->freectx(ctx->op.encap.
kemprov
ctx);
+ if (ctx->op.encap.
alg
ctx != NULL && ctx->op.encap.kem != NULL)
+ ctx->op.encap.kem->freectx(ctx->op.encap.
alg
ctx);
EVP_KEM_free(ctx->op.encap.kem);
EVP_KEM_free(ctx->op.encap.kem);
- ctx->op.encap.
kemprov
ctx = NULL;
+ ctx->op.encap.
alg
ctx = NULL;
ctx->op.encap.kem = NULL;
}
else if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)) {
ctx->op.encap.kem = NULL;
}
else if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)) {
- if (ctx->op.ciph.
ciphprov
ctx != NULL && ctx->op.ciph.cipher != NULL)
- ctx->op.ciph.cipher->freectx(ctx->op.ciph.
ciphprov
ctx);
+ if (ctx->op.ciph.
alg
ctx != NULL && ctx->op.ciph.cipher != NULL)
+ ctx->op.ciph.cipher->freectx(ctx->op.ciph.
alg
ctx);
EVP_ASYM_CIPHER_free(ctx->op.ciph.cipher);
EVP_ASYM_CIPHER_free(ctx->op.ciph.cipher);
- ctx->op.ciph.
ciphprov
ctx = NULL;
+ ctx->op.ciph.
alg
ctx = NULL;
ctx->op.ciph.cipher = NULL;
} else if (EVP_PKEY_CTX_IS_GEN_OP(ctx)) {
if (ctx->op.keymgmt.genctx != NULL && ctx->keymgmt != NULL)
ctx->op.ciph.cipher = NULL;
} else if (EVP_PKEY_CTX_IS_GEN_OP(ctx)) {
if (ctx->op.keymgmt.genctx != NULL && ctx->keymgmt != NULL)
@@
-489,12
+489,12
@@
EVP_PKEY_CTX *EVP_PKEY_CTX_dup(const EVP_PKEY_CTX *pctx)
if (!EVP_KEYEXCH_up_ref(rctx->op.kex.exchange))
goto err;
}
if (!EVP_KEYEXCH_up_ref(rctx->op.kex.exchange))
goto err;
}
- if (pctx->op.kex.
exchprov
ctx != NULL) {
+ if (pctx->op.kex.
alg
ctx != NULL) {
if (!ossl_assert(pctx->op.kex.exchange != NULL))
goto err;
if (!ossl_assert(pctx->op.kex.exchange != NULL))
goto err;
- rctx->op.kex.
exchprov
ctx
- = pctx->op.kex.exchange->dupctx(pctx->op.kex.
exchprov
ctx);
- if (rctx->op.kex.
exchprov
ctx == NULL) {
+ rctx->op.kex.
alg
ctx
+ = pctx->op.kex.exchange->dupctx(pctx->op.kex.
alg
ctx);
+ if (rctx->op.kex.
alg
ctx == NULL) {
EVP_KEYEXCH_free(rctx->op.kex.exchange);
goto err;
}
EVP_KEYEXCH_free(rctx->op.kex.exchange);
goto err;
}
@@
-506,12
+506,12
@@
EVP_PKEY_CTX *EVP_PKEY_CTX_dup(const EVP_PKEY_CTX *pctx)
if (!EVP_SIGNATURE_up_ref(rctx->op.sig.signature))
goto err;
}
if (!EVP_SIGNATURE_up_ref(rctx->op.sig.signature))
goto err;
}
- if (pctx->op.sig.
sigprov
ctx != NULL) {
+ if (pctx->op.sig.
alg
ctx != NULL) {
if (!ossl_assert(pctx->op.sig.signature != NULL))
goto err;
if (!ossl_assert(pctx->op.sig.signature != NULL))
goto err;
- rctx->op.sig.
sigprov
ctx
- = pctx->op.sig.signature->dupctx(pctx->op.sig.
sigprov
ctx);
- if (rctx->op.sig.
sigprov
ctx == NULL) {
+ rctx->op.sig.
alg
ctx
+ = pctx->op.sig.signature->dupctx(pctx->op.sig.
alg
ctx);
+ if (rctx->op.sig.
alg
ctx == NULL) {
EVP_SIGNATURE_free(rctx->op.sig.signature);
goto err;
}
EVP_SIGNATURE_free(rctx->op.sig.signature);
goto err;
}
@@
-523,12
+523,12
@@
EVP_PKEY_CTX *EVP_PKEY_CTX_dup(const EVP_PKEY_CTX *pctx)
if (!EVP_ASYM_CIPHER_up_ref(rctx->op.ciph.cipher))
goto err;
}
if (!EVP_ASYM_CIPHER_up_ref(rctx->op.ciph.cipher))
goto err;
}
- if (pctx->op.ciph.
ciphprov
ctx != NULL) {
+ if (pctx->op.ciph.
alg
ctx != NULL) {
if (!ossl_assert(pctx->op.ciph.cipher != NULL))
goto err;
if (!ossl_assert(pctx->op.ciph.cipher != NULL))
goto err;
- rctx->op.ciph.
ciphprov
ctx
- = pctx->op.ciph.cipher->dupctx(pctx->op.ciph.
ciphprov
ctx);
- if (rctx->op.ciph.
ciphprov
ctx == NULL) {
+ rctx->op.ciph.
alg
ctx
+ = pctx->op.ciph.cipher->dupctx(pctx->op.ciph.
alg
ctx);
+ if (rctx->op.ciph.
alg
ctx == NULL) {
EVP_ASYM_CIPHER_free(rctx->op.ciph.cipher);
goto err;
}
EVP_ASYM_CIPHER_free(rctx->op.ciph.cipher);
goto err;
}
@@
-540,12
+540,12
@@
EVP_PKEY_CTX *EVP_PKEY_CTX_dup(const EVP_PKEY_CTX *pctx)
if (!EVP_KEM_up_ref(rctx->op.encap.kem))
goto err;
}
if (!EVP_KEM_up_ref(rctx->op.encap.kem))
goto err;
}
- if (pctx->op.encap.
kemprov
ctx != NULL) {
+ if (pctx->op.encap.
alg
ctx != NULL) {
if (!ossl_assert(pctx->op.encap.kem != NULL))
goto err;
if (!ossl_assert(pctx->op.encap.kem != NULL))
goto err;
- rctx->op.encap.
kemprov
ctx
- = pctx->op.encap.kem->dupctx(pctx->op.encap.
kemprov
ctx);
- if (rctx->op.encap.
kemprov
ctx == NULL) {
+ rctx->op.encap.
alg
ctx
+ = pctx->op.encap.kem->dupctx(pctx->op.encap.
alg
ctx);
+ if (rctx->op.encap.
alg
ctx == NULL) {
EVP_KEM_free(rctx->op.encap.kem);
goto err;
}
EVP_KEM_free(rctx->op.encap.kem);
goto err;
}
@@
-660,19
+660,19
@@
int EVP_PKEY_CTX_set_params(EVP_PKEY_CTX *ctx, const OSSL_PARAM *params)
&& ctx->op.kex.exchange != NULL
&& ctx->op.kex.exchange->set_ctx_params != NULL)
return
&& ctx->op.kex.exchange != NULL
&& ctx->op.kex.exchange->set_ctx_params != NULL)
return
- ctx->op.kex.exchange->set_ctx_params(ctx->op.kex.
exchprov
ctx,
+ ctx->op.kex.exchange->set_ctx_params(ctx->op.kex.
alg
ctx,
params);
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
&& ctx->op.sig.signature != NULL
&& ctx->op.sig.signature->set_ctx_params != NULL)
return
params);
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
&& ctx->op.sig.signature != NULL
&& ctx->op.sig.signature->set_ctx_params != NULL)
return
- ctx->op.sig.signature->set_ctx_params(ctx->op.sig.
sigprov
ctx,
+ ctx->op.sig.signature->set_ctx_params(ctx->op.sig.
alg
ctx,
params);
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
&& ctx->op.ciph.cipher != NULL
&& ctx->op.ciph.cipher->set_ctx_params != NULL)
return
params);
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
&& ctx->op.ciph.cipher != NULL
&& ctx->op.ciph.cipher->set_ctx_params != NULL)
return
- ctx->op.ciph.cipher->set_ctx_params(ctx->op.ciph.
ciphprov
ctx,
+ ctx->op.ciph.cipher->set_ctx_params(ctx->op.ciph.
alg
ctx,
params);
if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
&& ctx->keymgmt != NULL
params);
if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
&& ctx->keymgmt != NULL
@@
-684,7
+684,7
@@
int EVP_PKEY_CTX_set_params(EVP_PKEY_CTX *ctx, const OSSL_PARAM *params)
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->set_ctx_params != NULL)
return
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->set_ctx_params != NULL)
return
- ctx->op.encap.kem->set_ctx_params(ctx->op.encap.
kemprov
ctx,
+ ctx->op.encap.kem->set_ctx_params(ctx->op.encap.
alg
ctx,
params);
break;
#ifndef FIPS_MODULE
params);
break;
#ifndef FIPS_MODULE
@@
-704,25
+704,25
@@
int EVP_PKEY_CTX_get_params(EVP_PKEY_CTX *ctx, OSSL_PARAM *params)
&& ctx->op.kex.exchange != NULL
&& ctx->op.kex.exchange->get_ctx_params != NULL)
return
&& ctx->op.kex.exchange != NULL
&& ctx->op.kex.exchange->get_ctx_params != NULL)
return
- ctx->op.kex.exchange->get_ctx_params(ctx->op.kex.
exchprov
ctx,
+ ctx->op.kex.exchange->get_ctx_params(ctx->op.kex.
alg
ctx,
params);
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
&& ctx->op.sig.signature != NULL
&& ctx->op.sig.signature->get_ctx_params != NULL)
return
params);
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
&& ctx->op.sig.signature != NULL
&& ctx->op.sig.signature->get_ctx_params != NULL)
return
- ctx->op.sig.signature->get_ctx_params(ctx->op.sig.
sigprov
ctx,
+ ctx->op.sig.signature->get_ctx_params(ctx->op.sig.
alg
ctx,
params);
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
&& ctx->op.ciph.cipher != NULL
&& ctx->op.ciph.cipher->get_ctx_params != NULL)
return
params);
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
&& ctx->op.ciph.cipher != NULL
&& ctx->op.ciph.cipher->get_ctx_params != NULL)
return
- ctx->op.ciph.cipher->get_ctx_params(ctx->op.ciph.
ciphprov
ctx,
+ ctx->op.ciph.cipher->get_ctx_params(ctx->op.ciph.
alg
ctx,
params);
if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->get_ctx_params != NULL)
return
params);
if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->get_ctx_params != NULL)
return
- ctx->op.encap.kem->get_ctx_params(ctx->op.encap.
kemprov
ctx,
+ ctx->op.encap.kem->get_ctx_params(ctx->op.encap.
alg
ctx,
params);
break;
#ifndef FIPS_MODULE
params);
break;
#ifndef FIPS_MODULE
@@
-743,7
+743,7
@@
const OSSL_PARAM *EVP_PKEY_CTX_gettable_params(const EVP_PKEY_CTX *ctx)
&& ctx->op.kex.exchange != NULL
&& ctx->op.kex.exchange->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEYEXCH_provider(ctx->op.kex.exchange));
&& ctx->op.kex.exchange != NULL
&& ctx->op.kex.exchange->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEYEXCH_provider(ctx->op.kex.exchange));
- return ctx->op.kex.exchange->gettable_ctx_params(ctx->op.kex.
exchprov
ctx,
+ return ctx->op.kex.exchange->gettable_ctx_params(ctx->op.kex.
alg
ctx,
provctx);
}
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
provctx);
}
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
@@
-751,7
+751,7
@@
const OSSL_PARAM *EVP_PKEY_CTX_gettable_params(const EVP_PKEY_CTX *ctx)
&& ctx->op.sig.signature->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
EVP_SIGNATURE_provider(ctx->op.sig.signature));
&& ctx->op.sig.signature->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
EVP_SIGNATURE_provider(ctx->op.sig.signature));
- return ctx->op.sig.signature->gettable_ctx_params(ctx->op.sig.
sigprov
ctx,
+ return ctx->op.sig.signature->gettable_ctx_params(ctx->op.sig.
alg
ctx,
provctx);
}
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
provctx);
}
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
@@
-759,14
+759,14
@@
const OSSL_PARAM *EVP_PKEY_CTX_gettable_params(const EVP_PKEY_CTX *ctx)
&& ctx->op.ciph.cipher->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
EVP_ASYM_CIPHER_provider(ctx->op.ciph.cipher));
&& ctx->op.ciph.cipher->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
EVP_ASYM_CIPHER_provider(ctx->op.ciph.cipher));
- return ctx->op.ciph.cipher->gettable_ctx_params(ctx->op.ciph.
ciphprov
ctx,
+ return ctx->op.ciph.cipher->gettable_ctx_params(ctx->op.ciph.
alg
ctx,
provctx);
}
if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEM_provider(ctx->op.encap.kem));
provctx);
}
if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEM_provider(ctx->op.encap.kem));
- return ctx->op.encap.kem->gettable_ctx_params(ctx->op.encap.
kemprov
ctx,
+ return ctx->op.encap.kem->gettable_ctx_params(ctx->op.encap.
alg
ctx,
provctx);
}
return NULL;
provctx);
}
return NULL;
@@
-780,7
+780,7
@@
const OSSL_PARAM *EVP_PKEY_CTX_settable_params(const EVP_PKEY_CTX *ctx)
&& ctx->op.kex.exchange != NULL
&& ctx->op.kex.exchange->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEYEXCH_provider(ctx->op.kex.exchange));
&& ctx->op.kex.exchange != NULL
&& ctx->op.kex.exchange->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEYEXCH_provider(ctx->op.kex.exchange));
- return ctx->op.kex.exchange->settable_ctx_params(ctx->op.kex.
exchprov
ctx,
+ return ctx->op.kex.exchange->settable_ctx_params(ctx->op.kex.
alg
ctx,
provctx);
}
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
provctx);
}
if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
@@
-788,7
+788,7
@@
const OSSL_PARAM *EVP_PKEY_CTX_settable_params(const EVP_PKEY_CTX *ctx)
&& ctx->op.sig.signature->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
EVP_SIGNATURE_provider(ctx->op.sig.signature));
&& ctx->op.sig.signature->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
EVP_SIGNATURE_provider(ctx->op.sig.signature));
- return ctx->op.sig.signature->settable_ctx_params(ctx->op.sig.
sigprov
ctx,
+ return ctx->op.sig.signature->settable_ctx_params(ctx->op.sig.
alg
ctx,
provctx);
}
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
provctx);
}
if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
@@
-796,7
+796,7
@@
const OSSL_PARAM *EVP_PKEY_CTX_settable_params(const EVP_PKEY_CTX *ctx)
&& ctx->op.ciph.cipher->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
EVP_ASYM_CIPHER_provider(ctx->op.ciph.cipher));
&& ctx->op.ciph.cipher->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(
EVP_ASYM_CIPHER_provider(ctx->op.ciph.cipher));
- return ctx->op.ciph.cipher->settable_ctx_params(ctx->op.ciph.
ciphprov
ctx,
+ return ctx->op.ciph.cipher->settable_ctx_params(ctx->op.ciph.
alg
ctx,
provctx);
}
if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
provctx);
}
if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
@@
-810,7
+810,7
@@
const OSSL_PARAM *EVP_PKEY_CTX_settable_params(const EVP_PKEY_CTX *ctx)
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEM_provider(ctx->op.encap.kem));
&& ctx->op.encap.kem != NULL
&& ctx->op.encap.kem->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_KEM_provider(ctx->op.encap.kem));
- return ctx->op.encap.kem->settable_ctx_params(ctx->op.encap.
kemprov
ctx,
+ return ctx->op.encap.kem->settable_ctx_params(ctx->op.encap.
alg
ctx,
provctx);
}
return NULL;
provctx);
}
return NULL;
@@
-891,7
+891,7
@@
int EVP_PKEY_CTX_get_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD **md)
return -2;
}
return -2;
}
- if (ctx->op.sig.
sigprov
ctx == NULL)
+ if (ctx->op.sig.
alg
ctx == NULL)
return EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,
EVP_PKEY_CTRL_GET_MD, 0, (void *)(md));
return EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,
EVP_PKEY_CTRL_GET_MD, 0, (void *)(md));
@@
-947,14
+947,14
@@
static int evp_pkey_ctx_set_md(EVP_PKEY_CTX *ctx, const EVP_MD *md,
int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
- return evp_pkey_ctx_set_md(ctx, md, ctx->op.sig.
sigprov
ctx == NULL,
+ return evp_pkey_ctx_set_md(ctx, md, ctx->op.sig.
alg
ctx == NULL,
OSSL_SIGNATURE_PARAM_DIGEST,
EVP_PKEY_OP_TYPE_SIG, EVP_PKEY_CTRL_MD);
}
int EVP_PKEY_CTX_set_tls1_prf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
OSSL_SIGNATURE_PARAM_DIGEST,
EVP_PKEY_OP_TYPE_SIG, EVP_PKEY_CTRL_MD);
}
int EVP_PKEY_CTX_set_tls1_prf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
- return evp_pkey_ctx_set_md(ctx, md, ctx->op.kex.
exchprov
ctx == NULL,
+ return evp_pkey_ctx_set_md(ctx, md, ctx->op.kex.
alg
ctx == NULL,
OSSL_KDF_PARAM_DIGEST,
EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_TLS_MD);
}
OSSL_KDF_PARAM_DIGEST,
EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_TLS_MD);
}
@@
-997,7
+997,7
@@
static int evp_pkey_ctx_set1_octet_string(EVP_PKEY_CTX *ctx, int fallback,
int EVP_PKEY_CTX_set1_tls1_prf_secret(EVP_PKEY_CTX *ctx,
const unsigned char *sec, int seclen)
{
int EVP_PKEY_CTX_set1_tls1_prf_secret(EVP_PKEY_CTX *ctx,
const unsigned char *sec, int seclen)
{
- return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
exchprov
ctx == NULL,
+ return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
alg
ctx == NULL,
OSSL_KDF_PARAM_SECRET,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_TLS_SECRET,
OSSL_KDF_PARAM_SECRET,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_TLS_SECRET,
@@
-1007,7
+1007,7
@@
int EVP_PKEY_CTX_set1_tls1_prf_secret(EVP_PKEY_CTX *ctx,
int EVP_PKEY_CTX_add1_tls1_prf_seed(EVP_PKEY_CTX *ctx,
const unsigned char *seed, int seedlen)
{
int EVP_PKEY_CTX_add1_tls1_prf_seed(EVP_PKEY_CTX *ctx,
const unsigned char *seed, int seedlen)
{
- return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
exchprov
ctx == NULL,
+ return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
alg
ctx == NULL,
OSSL_KDF_PARAM_SEED,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_TLS_SEED,
OSSL_KDF_PARAM_SEED,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_TLS_SEED,
@@
-1016,7
+1016,7
@@
int EVP_PKEY_CTX_add1_tls1_prf_seed(EVP_PKEY_CTX *ctx,
int EVP_PKEY_CTX_set_hkdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
int EVP_PKEY_CTX_set_hkdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
{
- return evp_pkey_ctx_set_md(ctx, md, ctx->op.kex.
exchprov
ctx == NULL,
+ return evp_pkey_ctx_set_md(ctx, md, ctx->op.kex.
alg
ctx == NULL,
OSSL_KDF_PARAM_DIGEST,
EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_HKDF_MD);
}
OSSL_KDF_PARAM_DIGEST,
EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_HKDF_MD);
}
@@
-1024,7
+1024,7
@@
int EVP_PKEY_CTX_set_hkdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
int EVP_PKEY_CTX_set1_hkdf_salt(EVP_PKEY_CTX *ctx,
const unsigned char *salt, int saltlen)
{
int EVP_PKEY_CTX_set1_hkdf_salt(EVP_PKEY_CTX *ctx,
const unsigned char *salt, int saltlen)
{
- return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
exchprov
ctx == NULL,
+ return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
alg
ctx == NULL,
OSSL_KDF_PARAM_SALT,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_HKDF_SALT,
OSSL_KDF_PARAM_SALT,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_HKDF_SALT,
@@
-1034,7
+1034,7
@@
int EVP_PKEY_CTX_set1_hkdf_salt(EVP_PKEY_CTX *ctx,
int EVP_PKEY_CTX_set1_hkdf_key(EVP_PKEY_CTX *ctx,
const unsigned char *key, int keylen)
{
int EVP_PKEY_CTX_set1_hkdf_key(EVP_PKEY_CTX *ctx,
const unsigned char *key, int keylen)
{
- return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
exchprov
ctx == NULL,
+ return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
alg
ctx == NULL,
OSSL_KDF_PARAM_KEY,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_HKDF_KEY,
OSSL_KDF_PARAM_KEY,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_HKDF_KEY,
@@
-1044,7
+1044,7
@@
int EVP_PKEY_CTX_set1_hkdf_key(EVP_PKEY_CTX *ctx,
int EVP_PKEY_CTX_add1_hkdf_info(EVP_PKEY_CTX *ctx,
const unsigned char *info, int infolen)
{
int EVP_PKEY_CTX_add1_hkdf_info(EVP_PKEY_CTX *ctx,
const unsigned char *info, int infolen)
{
- return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
exchprov
ctx == NULL,
+ return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
alg
ctx == NULL,
OSSL_KDF_PARAM_INFO,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_HKDF_INFO,
OSSL_KDF_PARAM_INFO,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_HKDF_INFO,
@@
-1062,7
+1062,7
@@
int EVP_PKEY_CTX_hkdf_mode(EVP_PKEY_CTX *ctx, int mode)
}
/* Code below to be removed when legacy support is dropped. */
}
/* Code below to be removed when legacy support is dropped. */
- if (ctx->op.kex.
exchprov
ctx == NULL)
+ if (ctx->op.kex.
alg
ctx == NULL)
return EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_HKDF_MODE, mode, NULL);
/* end of legacy support */
return EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_HKDF_MODE, mode, NULL);
/* end of legacy support */
@@
-1081,7
+1081,7
@@
int EVP_PKEY_CTX_hkdf_mode(EVP_PKEY_CTX *ctx, int mode)
int EVP_PKEY_CTX_set1_pbe_pass(EVP_PKEY_CTX *ctx, const char *pass,
int passlen)
{
int EVP_PKEY_CTX_set1_pbe_pass(EVP_PKEY_CTX *ctx, const char *pass,
int passlen)
{
- return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
exchprov
ctx == NULL,
+ return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
alg
ctx == NULL,
OSSL_KDF_PARAM_PASSWORD,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_PASS,
OSSL_KDF_PARAM_PASSWORD,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_PASS,
@@
-1091,7
+1091,7
@@
int EVP_PKEY_CTX_set1_pbe_pass(EVP_PKEY_CTX *ctx, const char *pass,
int EVP_PKEY_CTX_set1_scrypt_salt(EVP_PKEY_CTX *ctx,
const unsigned char *salt, int saltlen)
{
int EVP_PKEY_CTX_set1_scrypt_salt(EVP_PKEY_CTX *ctx,
const unsigned char *salt, int saltlen)
{
- return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
exchprov
ctx == NULL,
+ return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.
alg
ctx == NULL,
OSSL_KDF_PARAM_SALT,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_SCRYPT_SALT,
OSSL_KDF_PARAM_SALT,
EVP_PKEY_OP_DERIVE,
EVP_PKEY_CTRL_SCRYPT_SALT,
@@
-1110,7
+1110,7
@@
static int evp_pkey_ctx_set_uint64(EVP_PKEY_CTX *ctx, const char *param,
}
/* Code below to be removed when legacy support is dropped. */
}
/* Code below to be removed when legacy support is dropped. */
- if (ctx->op.kex.
exchprov
ctx == NULL)
+ if (ctx->op.kex.
alg
ctx == NULL)
return EVP_PKEY_CTX_ctrl_uint64(ctx, -1, op, ctrl, val);
/* end of legacy support */
return EVP_PKEY_CTX_ctrl_uint64(ctx, -1, op, ctrl, val);
/* end of legacy support */