From af5e1e852d4858860d4b7210cafe7bdf39e73f80 Mon Sep 17 00:00:00 2001 From: Pauli Date: Wed, 5 Aug 2020 13:23:32 +1000 Subject: gettables: provider changes to pass the provider context. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/12581) --- providers/implementations/digests/digestcommon.c | 2 +- providers/implementations/digests/md5_sha1_prov.c | 2 +- providers/implementations/digests/mdc2_prov.c | 2 +- providers/implementations/digests/sha2_prov.c | 2 +- providers/implementations/digests/sha3_prov.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'providers/implementations/digests') diff --git a/providers/implementations/digests/digestcommon.c b/providers/implementations/digests/digestcommon.c index 9d30b2be2c..d4910e121d 100644 --- a/providers/implementations/digests/digestcommon.c +++ b/providers/implementations/digests/digestcommon.c @@ -40,7 +40,7 @@ static const OSSL_PARAM digest_default_known_gettable_params[] = { OSSL_PARAM_ulong(OSSL_DIGEST_PARAM_FLAGS, NULL), OSSL_PARAM_END }; -const OSSL_PARAM *digest_default_gettable_params(void) +const OSSL_PARAM *digest_default_gettable_params(void *provctx) { return digest_default_known_gettable_params; } diff --git a/providers/implementations/digests/md5_sha1_prov.c b/providers/implementations/digests/md5_sha1_prov.c index c5dc4a36ce..632fb4a8d0 100644 --- a/providers/implementations/digests/md5_sha1_prov.c +++ b/providers/implementations/digests/md5_sha1_prov.c @@ -30,7 +30,7 @@ static const OSSL_PARAM known_md5_sha1_settable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *md5_sha1_settable_ctx_params(void) +static const OSSL_PARAM *md5_sha1_settable_ctx_params(void *provctx) { return known_md5_sha1_settable_ctx_params; } diff --git a/providers/implementations/digests/mdc2_prov.c b/providers/implementations/digests/mdc2_prov.c index 51958f7cf7..b1d3b5c0ff 100644 --- a/providers/implementations/digests/mdc2_prov.c +++ b/providers/implementations/digests/mdc2_prov.c @@ -30,7 +30,7 @@ static const OSSL_PARAM known_mdc2_settable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *mdc2_settable_ctx_params(void) +static const OSSL_PARAM *mdc2_settable_ctx_params(void *provctx) { return known_mdc2_settable_ctx_params; } diff --git a/providers/implementations/digests/sha2_prov.c b/providers/implementations/digests/sha2_prov.c index 5a73940b87..94ec269728 100644 --- a/providers/implementations/digests/sha2_prov.c +++ b/providers/implementations/digests/sha2_prov.c @@ -31,7 +31,7 @@ static const OSSL_PARAM known_sha1_settable_ctx_params[] = { {OSSL_DIGEST_PARAM_SSL3_MS, OSSL_PARAM_OCTET_STRING, NULL, 0, 0}, OSSL_PARAM_END }; -static const OSSL_PARAM *sha1_settable_ctx_params(void) +static const OSSL_PARAM *sha1_settable_ctx_params(void *provctx) { return known_sha1_settable_ctx_params; } diff --git a/providers/implementations/digests/sha3_prov.c b/providers/implementations/digests/sha3_prov.c index d7c7e8e44b..0703dbe9e0 100644 --- a/providers/implementations/digests/sha3_prov.c +++ b/providers/implementations/digests/sha3_prov.c @@ -250,7 +250,7 @@ static const OSSL_PARAM known_shake_settable_ctx_params[] = { {OSSL_DIGEST_PARAM_XOFLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0}, OSSL_PARAM_END }; -static const OSSL_PARAM *shake_settable_ctx_params(void) +static const OSSL_PARAM *shake_settable_ctx_params(void *provctx) { return known_shake_settable_ctx_params; } -- cgit v1.2.3