diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-06-02 06:49:09 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-06-05 20:30:47 +1000 |
| commit | 6a5f97a671de6d4d9f0cd6f6fc23ad89ca4ad69f (patch) | |
| tree | 70757e3c57a5d0680dc877703b89ad2dbf0b01e9 /providers/implementations/encode_decode/encode_key2blob.c | |
| parent | e982e04f5dd12ee2546344b3a26fd0e55f59f5cb (diff) | |
PROV: drop get_params() and gettable_params() from all encoder implementatio
They aren't needed at all any more, since the properties contain the
same information.
This also drops the parameter names OSSL_ENCODER_PARAM_OUTPUT_TYPE
and OSSL_ENCODER_PARAM_OUTPUT_STRUCTURE
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15570)
Diffstat (limited to 'providers/implementations/encode_decode/encode_key2blob.c')
| -rw-r--r-- | providers/implementations/encode_decode/encode_key2blob.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/providers/implementations/encode_decode/encode_key2blob.c b/providers/implementations/encode_decode/encode_key2blob.c index c58940b0a6..19a7d171db 100644 --- a/providers/implementations/encode_decode/encode_key2blob.c +++ b/providers/implementations/encode_decode/encode_key2blob.c @@ -38,8 +38,6 @@ static int write_blob(void *provctx, OSSL_CORE_BIO *cout, static OSSL_FUNC_encoder_newctx_fn key2blob_newctx; static OSSL_FUNC_encoder_freectx_fn key2blob_freectx; -static OSSL_FUNC_encoder_gettable_params_fn key2blob_gettable_params; -static OSSL_FUNC_encoder_get_params_fn key2blob_get_params; static void *key2blob_newctx(void *provctx) { @@ -50,27 +48,6 @@ static void key2blob_freectx(void *vctx) { } -static const OSSL_PARAM *key2blob_gettable_params(ossl_unused void *provctx) -{ - static const OSSL_PARAM gettables[] = { - { OSSL_ENCODER_PARAM_OUTPUT_TYPE, OSSL_PARAM_UTF8_PTR, NULL, 0, 0 }, - OSSL_PARAM_END, - }; - - return gettables; -} - -static int key2blob_get_params(OSSL_PARAM params[]) -{ - OSSL_PARAM *p; - - p = OSSL_PARAM_locate(params, OSSL_ENCODER_PARAM_OUTPUT_TYPE); - if (p != NULL && !OSSL_PARAM_set_utf8_ptr(p, "blob")) - return 0; - - return 1; -} - static int key2blob_check_selection(int selection, int selection_mask) { /* @@ -179,10 +156,6 @@ static int key2blob_encode(void *vctx, const void *key, int selection, (void (*)(void))key2blob_newctx }, \ { OSSL_FUNC_ENCODER_FREECTX, \ (void (*)(void))key2blob_freectx }, \ - { OSSL_FUNC_ENCODER_GETTABLE_PARAMS, \ - (void (*)(void))key2blob_gettable_params }, \ - { OSSL_FUNC_ENCODER_GET_PARAMS, \ - (void (*)(void))key2blob_get_params }, \ { OSSL_FUNC_ENCODER_DOES_SELECTION, \ (void (*)(void))impl##2blob_does_selection }, \ { OSSL_FUNC_ENCODER_IMPORT_OBJECT, \ |