diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-07-11 12:19:33 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-07-23 07:30:33 +0200 |
| commit | 261750134865150fe72298fd34dc7214c849b926 (patch) | |
| tree | 82945159a6401fd6b6a09c0f5161cf2cd3b45a2a /crypto | |
| parent | 3efe19145ceaf27d27c45384269fa37aa4f4b57f (diff) | |
Replace OSSL_ITEM with OSSL_PARAM as parameter descriptor, everywhere
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9346)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/provider.c | 2 | ||||
| -rw-r--r-- | crypto/provider_core.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/crypto/provider.c b/crypto/provider.c index 8c9c6dae14..f81260cdab 100644 --- a/crypto/provider.c +++ b/crypto/provider.c @@ -35,7 +35,7 @@ int OSSL_PROVIDER_unload(OSSL_PROVIDER *prov) return 1; } -const OSSL_ITEM *OSSL_PROVIDER_get_param_types(const OSSL_PROVIDER *prov) +const OSSL_PARAM *OSSL_PROVIDER_get_param_types(const OSSL_PROVIDER *prov) { return ossl_provider_get_param_types(prov); } diff --git a/crypto/provider_core.c b/crypto/provider_core.c index c16e91d1d4..d96e2144f4 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -680,7 +680,7 @@ void ossl_provider_teardown(const OSSL_PROVIDER *prov) prov->teardown(prov->provctx); } -const OSSL_ITEM *ossl_provider_get_param_types(const OSSL_PROVIDER *prov) +const OSSL_PARAM *ossl_provider_get_param_types(const OSSL_PROVIDER *prov) { return prov->get_param_types == NULL ? NULL : prov->get_param_types(prov->provctx); @@ -712,13 +712,13 @@ const OSSL_ALGORITHM *ossl_provider_query_operation(const OSSL_PROVIDER *prov, * discovery. We do not expect that many providers will use this, but one * never knows. */ -static const OSSL_ITEM param_types[] = { - { OSSL_PARAM_UTF8_PTR, "openssl-version" }, - { OSSL_PARAM_UTF8_PTR, "provider-name" }, - { 0, NULL } +static const OSSL_PARAM param_types[] = { + OSSL_PARAM_DEFN("openssl-verstion", OSSL_PARAM_UTF8_PTR, NULL, 0), + OSSL_PARAM_DEFN("provider-name", OSSL_PARAM_UTF8_PTR, NULL, 0), + OSSL_PARAM_END }; -static const OSSL_ITEM *core_get_param_types(const OSSL_PROVIDER *prov) +static const OSSL_PARAM *core_get_param_types(const OSSL_PROVIDER *prov) { return param_types; } |