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_key2ms.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_key2ms.c')
-rw-r--r-- | providers/implementations/encode_decode/encode_key2ms.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/providers/implementations/encode_decode/encode_key2ms.c b/providers/implementations/encode_decode/encode_key2ms.c index 79012e673e..3933a0d420 100644 --- a/providers/implementations/encode_decode/encode_key2ms.c +++ b/providers/implementations/encode_decode/encode_key2ms.c @@ -63,7 +63,6 @@ static int write_pvk(struct key2ms_ctx_st *ctx, OSSL_CORE_BIO *cout, } static OSSL_FUNC_encoder_freectx_fn key2ms_freectx; -static OSSL_FUNC_encoder_gettable_params_fn key2ms_gettable_params; static OSSL_FUNC_encoder_does_selection_fn key2ms_does_selection; static struct key2ms_ctx_st *key2ms_newctx(void *provctx) @@ -85,38 +84,6 @@ static void key2ms_freectx(void *vctx) OPENSSL_free(ctx); } -static const OSSL_PARAM *key2ms_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 key2msblob_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, "MSBLOB")) - return 0; - - return 1; -} - -static int key2pvk_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, "PVK")) - return 0; - - return 1; -} - static const OSSL_PARAM *key2pvk_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM settables[] = { @@ -240,10 +207,6 @@ static int key2pvk_encode(void *vctx, const void *key, int selection, (void (*)(void))key2ms_newctx }, \ { OSSL_FUNC_ENCODER_FREECTX, \ (void (*)(void))key2ms_freectx }, \ - { OSSL_FUNC_ENCODER_GETTABLE_PARAMS, \ - (void (*)(void))key2ms_gettable_params }, \ - { OSSL_FUNC_ENCODER_GET_PARAMS, \ - (void (*)(void))key2##output##_get_params }, \ output##_set_params \ { OSSL_FUNC_ENCODER_DOES_SELECTION, \ (void (*)(void))key2ms_does_selection }, \ |