From fb67126ea8a1a9fadb9b60641d84808fc123cd9d Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 26 Feb 2021 18:02:36 +0100 Subject: EVP_PKEY_CTX_get/settable_params: pass provider operation context This allows making the signature operations return different settable params when the context is initialized with EVP_DigestSign/VerifyInit. Reviewed-by: Paul Dale Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/14338) --- doc/man7/provider-kem.pod | 4 ++-- doc/man7/provider-keyexch.pod | 6 ++++-- doc/man7/provider-keymgmt.pod | 3 ++- doc/man7/provider-signature.pod | 7 ++++--- 4 files changed, 12 insertions(+), 8 deletions(-) (limited to 'doc/man7') diff --git a/doc/man7/provider-kem.pod b/doc/man7/provider-kem.pod index 4d16a3e625..d4467dbd79 100644 --- a/doc/man7/provider-kem.pod +++ b/doc/man7/provider-kem.pod @@ -34,9 +34,9 @@ provider-kem - The kem library E-E provider functions /* KEM parameters */ int OSSL_FUNC_kem_get_ctx_params(void *ctx, OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_kem_gettable_ctx_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_kem_gettable_ctx_params(void *ctx, void *provctx); int OSSL_FUNC_kem_set_ctx_params(void *ctx, const OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_kem_settable_ctx_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_kem_settable_ctx_params(void *ctx, void *provctx); =head1 DESCRIPTION diff --git a/doc/man7/provider-keyexch.pod b/doc/man7/provider-keyexch.pod index 01a8ec5e4d..bf97096cb2 100644 --- a/doc/man7/provider-keyexch.pod +++ b/doc/man7/provider-keyexch.pod @@ -30,9 +30,11 @@ provider-keyexch - The keyexch library E-E provider functions /* Key Exchange parameters */ int OSSL_FUNC_keyexch_set_ctx_params(void *ctx, const OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_keyexch_settable_ctx_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_keyexch_settable_ctx_params(void *ctx, + void *provctx); int OSSL_FUNC_keyexch_get_ctx_params(void *ctx, OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_keyexch_gettable_ctx_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_keyexch_gettable_ctx_params(void *ctx, + void *provctx); =head1 DESCRIPTION diff --git a/doc/man7/provider-keymgmt.pod b/doc/man7/provider-keymgmt.pod index 08d7df6d5b..2156ed9b7f 100644 --- a/doc/man7/provider-keymgmt.pod +++ b/doc/man7/provider-keymgmt.pod @@ -22,7 +22,8 @@ provider-keymgmt - The KEYMGMT library E-E provider functions void *OSSL_FUNC_keymgmt_gen_init(void *provctx, int selection); int OSSL_FUNC_keymgmt_gen_set_template(void *genctx, void *template); int OSSL_FUNC_keymgmt_gen_set_params(void *genctx, const OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_keymgmt_gen_settable_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_keymgmt_gen_settable_params(void *genctx, + void *provctx); void *OSSL_FUNC_keymgmt_gen(void *genctx, OSSL_CALLBACK *cb, void *cbarg); void OSSL_FUNC_keymgmt_gen_cleanup(void *genctx); diff --git a/doc/man7/provider-signature.pod b/doc/man7/provider-signature.pod index 9c2a7d0c2b..0d17d58367 100644 --- a/doc/man7/provider-signature.pod +++ b/doc/man7/provider-signature.pod @@ -64,10 +64,11 @@ provider-signature - The signature library E-E provider functions /* Signature parameters */ int OSSL_FUNC_signature_get_ctx_params(void *ctx, OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_signature_gettable_ctx_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_signature_gettable_ctx_params(void *ctx, + void *provctx); int OSSL_FUNC_signature_set_ctx_params(void *ctx, const OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_signature_settable_ctx_params(void *provctx); - + const OSSL_PARAM *OSSL_FUNC_signature_settable_ctx_params(void *ctx, + void *provctx); /* MD parameters */ int OSSL_FUNC_signature_get_ctx_md_params(void *ctx, OSSL_PARAM params[]); const OSSL_PARAM * OSSL_FUNC_signature_gettable_ctx_md_params(void *ctx); -- cgit v1.2.3