From 992492f5e82e0cf9b24acc14ea90ce8afd4c447a Mon Sep 17 00:00:00 2001 From: Pauli Date: Wed, 5 Aug 2020 13:24:04 +1000 Subject: [PATCH] gettables: documentation changes to pass the provider context. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/12581) --- doc/man7/provider-asym_cipher.pod | 4 ++-- doc/man7/provider-cipher.pod | 6 +++--- doc/man7/provider-digest.pod | 6 +++--- doc/man7/provider-keyexch.pod | 4 ++-- doc/man7/provider-keymgmt.pod | 4 ++-- doc/man7/provider-mac.pod | 6 +++--- doc/man7/provider-rand.pod | 6 +++--- doc/man7/provider-serializer.pod | 2 +- doc/man7/provider-signature.pod | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/doc/man7/provider-asym_cipher.pod b/doc/man7/provider-asym_cipher.pod index fa56391a04..5531a08f37 100644 --- a/doc/man7/provider-asym_cipher.pod +++ b/doc/man7/provider-asym_cipher.pod @@ -36,9 +36,9 @@ provider-asym_cipher - The asym_cipher library E-E provider functions /* Asymmetric Cipher parameters */ int OSSL_FUNC_asym_cipher_get_ctx_params(void *ctx, OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_asym_cipher_gettable_ctx_params(void); + const OSSL_PARAM *OSSL_FUNC_asym_cipher_gettable_ctx_params(void *provctx); int OSSL_FUNC_asym_cipher_set_ctx_params(void *ctx, const OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_asym_cipher_settable_ctx_params(void); + const OSSL_PARAM *OSSL_FUNC_asym_cipher_settable_ctx_params(void *provctx); =head1 DESCRIPTION diff --git a/doc/man7/provider-cipher.pod b/doc/man7/provider-cipher.pod index 83f1768302..ee159ff7eb 100644 --- a/doc/man7/provider-cipher.pod +++ b/doc/man7/provider-cipher.pod @@ -37,11 +37,11 @@ provider-cipher - The cipher library E-E provider functions size_t outsize, const unsigned char *in, size_t inl); /* Cipher parameter descriptors */ - const OSSL_PARAM *OSSL_FUNC_cipher_gettable_params(void); + const OSSL_PARAM *OSSL_FUNC_cipher_gettable_params(void *provctx); /* Cipher operation parameter descriptors */ - const OSSL_PARAM *OSSL_FUNC_cipher_gettable_ctx_params(void); - const OSSL_PARAM *OSSL_FUNC_cipher_settable_ctx_params(void); + const OSSL_PARAM *OSSL_FUNC_cipher_gettable_ctx_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_cipher_settable_ctx_params(void *provctx); /* Cipher parameters */ int OSSL_FUNC_cipher_get_params(OSSL_PARAM params[]); diff --git a/doc/man7/provider-digest.pod b/doc/man7/provider-digest.pod index c350148471..1c09ee3c40 100644 --- a/doc/man7/provider-digest.pod +++ b/doc/man7/provider-digest.pod @@ -30,11 +30,11 @@ provider-digest - The digest library E-E provider functions unsigned char *out, size_t *outl, size_t outsz); /* Digest parameter descriptors */ - const OSSL_PARAM *OSSL_FUNC_digest_gettable_params(void); + const OSSL_PARAM *OSSL_FUNC_digest_gettable_params(void *provctx); /* Digest operation parameter descriptors */ - const OSSL_PARAM *OSSL_FUNC_digest_gettable_ctx_params(void); - const OSSL_PARAM *OSSL_FUNC_digest_settable_ctx_params(void); + const OSSL_PARAM *OSSL_FUNC_digest_gettable_ctx_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_digest_settable_ctx_params(void *provctx); /* Digest parameters */ int OSSL_FUNC_digest_get_params(OSSL_PARAM params[]); diff --git a/doc/man7/provider-keyexch.pod b/doc/man7/provider-keyexch.pod index f69979aa13..01a8ec5e4d 100644 --- a/doc/man7/provider-keyexch.pod +++ b/doc/man7/provider-keyexch.pod @@ -30,9 +30,9 @@ 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); + const OSSL_PARAM *OSSL_FUNC_keyexch_settable_ctx_params(void *provctx); int OSSL_FUNC_keyexch_get_ctx_params(void *ctx, OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_keyexch_gettable_ctx_params(void); + const OSSL_PARAM *OSSL_FUNC_keyexch_gettable_ctx_params(void *provctx); =head1 DESCRIPTION diff --git a/doc/man7/provider-keymgmt.pod b/doc/man7/provider-keymgmt.pod index 43743798ac..fdb1bf7794 100644 --- a/doc/man7/provider-keymgmt.pod +++ b/doc/man7/provider-keymgmt.pod @@ -31,9 +31,9 @@ provider-keymgmt - The KEYMGMT library E-E provider functions /* Key object information */ int OSSL_FUNC_keymgmt_get_params(void *keydata, OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_keymgmt_gettable_params(void); + const OSSL_PARAM *OSSL_FUNC_keymgmt_gettable_params(void *provctx); int OSSL_FUNC_keymgmt_set_params(void *keydata, const OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_keymgmt_settable_params(void); + const OSSL_PARAM *OSSL_FUNC_keymgmt_settable_params(void *provctx); /* Key object content checks */ int OSSL_FUNC_keymgmt_has(void *keydata, int selection); diff --git a/doc/man7/provider-mac.pod b/doc/man7/provider-mac.pod index 2d34716be4..f89b1fe0e2 100644 --- a/doc/man7/provider-mac.pod +++ b/doc/man7/provider-mac.pod @@ -28,9 +28,9 @@ provider-mac - The mac library E-E provider functions int OSSL_FUNC_mac_final(void *mctx, unsigned char *out, size_t *outl, size_t outsize); /* MAC parameter descriptors */ - const OSSL_PARAM *OSSL_FUNC_mac_get_params(void); - const OSSL_PARAM *OSSL_FUNC_mac_get_ctx_params(void); - const OSSL_PARAM *OSSL_FUNC_mac_set_ctx_params(void); + const OSSL_PARAM *OSSL_FUNC_mac_get_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_mac_get_ctx_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_mac_set_ctx_params(void *provctx); /* MAC parameters */ int OSSL_FUNC_mac_get_params(OSSL_PARAM params[]); diff --git a/doc/man7/provider-rand.pod b/doc/man7/provider-rand.pod index fb6f436b7c..d6e538ec87 100644 --- a/doc/man7/provider-rand.pod +++ b/doc/man7/provider-rand.pod @@ -50,9 +50,9 @@ functions void OSSL_FUNC_rand_unlock(void *ctx); /* RAND parameter descriptors */ - const OSSL_PARAM *OSSL_FUNC_rand_gettable_params(void); - const OSSL_PARAM *OSSL_FUNC_rand_gettable_ctx_params(void); - const OSSL_PARAM *OSSL_FUNC_rand_settable_ctx_params(void); + const OSSL_PARAM *OSSL_FUNC_rand_gettable_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_rand_gettable_ctx_params(void *provctx); + const OSSL_PARAM *OSSL_FUNC_rand_settable_ctx_params(void *provctx); /* RAND parameters */ int OSSL_FUNC_rand_get_params(OSSL_PARAM params[]); diff --git a/doc/man7/provider-serializer.pod b/doc/man7/provider-serializer.pod index e97c9766d9..0c1662837f 100644 --- a/doc/man7/provider-serializer.pod +++ b/doc/man7/provider-serializer.pod @@ -24,7 +24,7 @@ Future development will also include deserializing functions. void *OSSL_FUNC_serializer_newctx(void *provctx); void OSSL_FUNC_serializer_freectx(void *ctx); int OSSL_FUNC_serializer_set_ctx_params(void *ctx, const OSSL_PARAM params[]); - const OSSL_PARAM *OSSL_FUNC_serializer_settable_ctx_params(void) + const OSSL_PARAM *OSSL_FUNC_serializer_settable_ctx_params(void *provctx) /* Functions to serialize object data */ int OSSL_FUNC_serializer_serialize_data(void *ctx, const OSSL_PARAM *data, diff --git a/doc/man7/provider-signature.pod b/doc/man7/provider-signature.pod index 38d06bdce8..bf10b6572c 100644 --- a/doc/man7/provider-signature.pod +++ b/doc/man7/provider-signature.pod @@ -64,9 +64,9 @@ 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); + const OSSL_PARAM *OSSL_FUNC_signature_gettable_ctx_params(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); + const OSSL_PARAM *OSSL_FUNC_signature_settable_ctx_params(void *provctx); /* MD parameters */ int OSSL_FUNC_signature_get_ctx_md_params(void *ctx, OSSL_PARAM params[]); -- 2.34.1