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 /providers/default | |
| parent | Describe OSSL_PARAM as a parameter descriptor (diff) | |
| download | openssl-261750134865150fe72298fd34dc7214c849b926.tar.xz openssl-261750134865150fe72298fd34dc7214c849b926.zip | |
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 'providers/default')
| -rw-r--r-- | providers/default/defltprov.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/providers/default/defltprov.c b/providers/default/defltprov.c index 18e3a5c36f..2c25bf77d1 100644 --- a/providers/default/defltprov.c +++ b/providers/default/defltprov.c @@ -20,14 +20,14 @@ static OSSL_core_get_param_types_fn *c_get_param_types = NULL; static OSSL_core_get_params_fn *c_get_params = NULL; /* Parameters we provide to the core */ -static const OSSL_ITEM deflt_param_types[] = { - { OSSL_PARAM_UTF8_PTR, OSSL_PROV_PARAM_NAME }, - { OSSL_PARAM_UTF8_PTR, OSSL_PROV_PARAM_VERSION }, - { OSSL_PARAM_UTF8_PTR, OSSL_PROV_PARAM_BUILDINFO }, - { 0, NULL } +static const OSSL_PARAM deflt_param_types[] = { + OSSL_PARAM_DEFN(OSSL_PROV_PARAM_NAME, OSSL_PARAM_UTF8_PTR, NULL, 0), + OSSL_PARAM_DEFN(OSSL_PROV_PARAM_VERSION, OSSL_PARAM_UTF8_PTR, NULL, 0), + OSSL_PARAM_DEFN(OSSL_PROV_PARAM_BUILDINFO, OSSL_PARAM_UTF8_PTR, NULL, 0), + OSSL_PARAM_END }; -static const OSSL_ITEM *deflt_get_param_types(const OSSL_PROVIDER *prov) +static const OSSL_PARAM *deflt_get_param_types(const OSSL_PROVIDER *prov) { return deflt_param_types; } |