diff options
author | Pauli <paul.dale@oracle.com> | 2020-08-05 13:23:32 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2020-08-07 08:02:14 +1000 |
commit | af5e1e852d4858860d4b7210cafe7bdf39e73f80 (patch) | |
tree | e2b5ea35d43150dcf9f1ff5e771e41daef4d891b /providers/implementations/keymgmt | |
parent | 18ec26babc1da90befc0bf5671bc8072428c5bab (diff) |
gettables: provider changes to pass the provider context.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12581)
Diffstat (limited to 'providers/implementations/keymgmt')
-rw-r--r-- | providers/implementations/keymgmt/dh_kmgmt.c | 4 | ||||
-rw-r--r-- | providers/implementations/keymgmt/dsa_kmgmt.c | 2 | ||||
-rw-r--r-- | providers/implementations/keymgmt/ec_kmgmt.c | 4 | ||||
-rw-r--r-- | providers/implementations/keymgmt/ecx_kmgmt.c | 16 | ||||
-rw-r--r-- | providers/implementations/keymgmt/rsa_kmgmt.c | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/providers/implementations/keymgmt/dh_kmgmt.c b/providers/implementations/keymgmt/dh_kmgmt.c index 2a8b7f8521..73fcb3fc41 100644 --- a/providers/implementations/keymgmt/dh_kmgmt.c +++ b/providers/implementations/keymgmt/dh_kmgmt.c @@ -326,7 +326,7 @@ static const OSSL_PARAM dh_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *dh_gettable_params(void) +static const OSSL_PARAM *dh_gettable_params(void *provctx) { return dh_params; } @@ -336,7 +336,7 @@ static const OSSL_PARAM dh_known_settable_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *dh_settable_params(void) +static const OSSL_PARAM *dh_settable_params(void *provctx) { return dh_known_settable_params; } diff --git a/providers/implementations/keymgmt/dsa_kmgmt.c b/providers/implementations/keymgmt/dsa_kmgmt.c index 58e9fc564f..d9c6007650 100644 --- a/providers/implementations/keymgmt/dsa_kmgmt.c +++ b/providers/implementations/keymgmt/dsa_kmgmt.c @@ -295,7 +295,7 @@ static const OSSL_PARAM dsa_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *dsa_gettable_params(void) +static const OSSL_PARAM *dsa_gettable_params(void *provctx) { return dsa_params; } diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c index 4d040a1902..34b2737fdf 100644 --- a/providers/implementations/keymgmt/ec_kmgmt.c +++ b/providers/implementations/keymgmt/ec_kmgmt.c @@ -570,7 +570,7 @@ static const OSSL_PARAM ec_known_gettable_params[] = { }; static -const OSSL_PARAM *ec_gettable_params(void) +const OSSL_PARAM *ec_gettable_params(void *provctx) { return ec_known_gettable_params; } @@ -582,7 +582,7 @@ static const OSSL_PARAM ec_known_settable_params[] = { }; static -const OSSL_PARAM *ec_settable_params(void) +const OSSL_PARAM *ec_settable_params(void *provctx) { return ec_known_settable_params; } diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c index a1e1edbf5a..fff50ef0bf 100644 --- a/providers/implementations/keymgmt/ecx_kmgmt.c +++ b/providers/implementations/keymgmt/ecx_kmgmt.c @@ -314,22 +314,22 @@ static const OSSL_PARAM ed_gettable_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *x25519_gettable_params(void) +static const OSSL_PARAM *x25519_gettable_params(void *provctx) { return ecx_gettable_params; } -static const OSSL_PARAM *x448_gettable_params(void) +static const OSSL_PARAM *x448_gettable_params(void *provctx) { return ecx_gettable_params; } -static const OSSL_PARAM *ed25519_gettable_params(void) +static const OSSL_PARAM *ed25519_gettable_params(void *provctx) { return ed_gettable_params; } -static const OSSL_PARAM *ed448_gettable_params(void) +static const OSSL_PARAM *ed448_gettable_params(void *provctx) { return ed_gettable_params; } @@ -384,22 +384,22 @@ static const OSSL_PARAM ed_settable_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *x25519_settable_params(void) +static const OSSL_PARAM *x25519_settable_params(void *provctx) { return ecx_settable_params; } -static const OSSL_PARAM *x448_settable_params(void) +static const OSSL_PARAM *x448_settable_params(void *provctx) { return ecx_settable_params; } -static const OSSL_PARAM *ed25519_settable_params(void) +static const OSSL_PARAM *ed25519_settable_params(void *provctx) { return ed_settable_params; } -static const OSSL_PARAM *ed448_settable_params(void) +static const OSSL_PARAM *ed448_settable_params(void *provctx) { return ed_settable_params; } diff --git a/providers/implementations/keymgmt/rsa_kmgmt.c b/providers/implementations/keymgmt/rsa_kmgmt.c index 7ed280e861..ab2325d4bd 100644 --- a/providers/implementations/keymgmt/rsa_kmgmt.c +++ b/providers/implementations/keymgmt/rsa_kmgmt.c @@ -341,7 +341,7 @@ static const OSSL_PARAM rsa_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *rsa_gettable_params(void) +static const OSSL_PARAM *rsa_gettable_params(void *provctx) { return rsa_params; } |