diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-06-02 06:32:00 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-06-05 20:30:47 +1000 |
| commit | 73c02a6201d08afb4ad5055fc3906e1d4504b578 (patch) | |
| tree | d9fce0ced39e25691a79fa14ac2440f07e935d48 /providers/implementations/encode_decode | |
| parent | 6462a4f0508e451f0411e88b2f465f27f1db6cc7 (diff) | |
ENCODER: Drop OSSL_ENCODER_PARAM_INPUT_TYPE
This was a poor substitute for using the name of the decoder implementation,
and since there is functionality to get the latter now, this parameter
can be dropped.
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')
| -rw-r--r-- | providers/implementations/encode_decode/encode_key2any.c | 12 | ||||
| -rw-r--r-- | providers/implementations/encode_decode/encode_key2text.c | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/providers/implementations/encode_decode/encode_key2any.c b/providers/implementations/encode_decode/encode_key2any.c index 8d32c64fbf..7efd88caee 100644 --- a/providers/implementations/encode_decode/encode_key2any.c +++ b/providers/implementations/encode_decode/encode_key2any.c @@ -884,13 +884,11 @@ static void key2any_freectx(void *vctx) static const OSSL_PARAM *key2any_gettable_params(void *provctx, int structure) { static const OSSL_PARAM gettables[] = { - { OSSL_ENCODER_PARAM_INPUT_TYPE, OSSL_PARAM_UTF8_PTR, NULL, 0, 0 }, { OSSL_ENCODER_PARAM_OUTPUT_TYPE, OSSL_PARAM_UTF8_PTR, NULL, 0, 0 }, OSSL_PARAM_END, }; static const OSSL_PARAM gettables_w_structure[] = { - { OSSL_ENCODER_PARAM_INPUT_TYPE, OSSL_PARAM_UTF8_PTR, NULL, 0, 0 }, { OSSL_ENCODER_PARAM_OUTPUT_TYPE, OSSL_PARAM_UTF8_PTR, NULL, 0, 0 }, { OSSL_ENCODER_PARAM_OUTPUT_STRUCTURE, OSSL_PARAM_UTF8_PTR, NULL, 0, 0 }, OSSL_PARAM_END, @@ -899,16 +897,11 @@ static const OSSL_PARAM *key2any_gettable_params(void *provctx, int structure) return structure ? gettables_w_structure : gettables; } -static int key2any_get_params(OSSL_PARAM params[], const char *input_type, - const char *output_type, +static int key2any_get_params(OSSL_PARAM params[], const char *output_type, const char *output_struct) { OSSL_PARAM *p; - p = OSSL_PARAM_locate(params, OSSL_ENCODER_PARAM_INPUT_TYPE); - if (p != NULL && !OSSL_PARAM_set_utf8_ptr(p, input_type)) - return 0; - p = OSSL_PARAM_locate(params, OSSL_ENCODER_PARAM_OUTPUT_TYPE); if (p != NULL && !OSSL_PARAM_set_utf8_ptr(p, output_type)) return 0; @@ -1234,8 +1227,7 @@ static int key2any_encode(struct key2any_ctx_st *ctx, OSSL_CORE_BIO *cout, static int \ impl##_to_##kind##_##output##_get_params(OSSL_PARAM params[]) \ { \ - return key2any_get_params(params, impl##_input_type, \ - output##_output_type, \ + return key2any_get_params(params, output##_output_type, \ kind##_output_structure); \ } \ static void * \ diff --git a/providers/implementations/encode_decode/encode_key2text.c b/providers/implementations/encode_decode/encode_key2text.c index 9bdbe52656..6adbacaca6 100644 --- a/providers/implementations/encode_decode/encode_key2text.c +++ b/providers/implementations/encode_decode/encode_key2text.c @@ -805,14 +805,10 @@ static const OSSL_PARAM *key2text_gettable_params(void *provctx) return gettables; } -static int key2text_get_params(OSSL_PARAM params[], const char *input_type) +static int key2text_get_params(OSSL_PARAM params[]) { OSSL_PARAM *p; - p = OSSL_PARAM_locate(params, OSSL_ENCODER_PARAM_INPUT_TYPE); - if (p != NULL && !OSSL_PARAM_set_utf8_ptr(p, input_type)) - return 0; - p = OSSL_PARAM_locate(params, OSSL_ENCODER_PARAM_OUTPUT_TYPE); if (p != NULL && !OSSL_PARAM_set_utf8_ptr(p, "TEXT")) return 0; @@ -847,10 +843,6 @@ static int key2text_encode(void *vctx, const void *key, int selection, impl##2text_free_object; \ static OSSL_FUNC_encoder_encode_fn impl##2text_encode; \ \ - static int impl##2text_get_params(OSSL_PARAM params[]) \ - { \ - return key2text_get_params(params, impl##_input_type); \ - } \ static void *impl##2text_import_object(void *ctx, int selection, \ const OSSL_PARAM params[]) \ { \ @@ -884,7 +876,7 @@ static int key2text_encode(void *vctx, const void *key, int selection, { OSSL_FUNC_ENCODER_GETTABLE_PARAMS, \ (void (*)(void))key2text_gettable_params }, \ { OSSL_FUNC_ENCODER_GET_PARAMS, \ - (void (*)(void))impl##2text_get_params }, \ + (void (*)(void))key2text_get_params }, \ { OSSL_FUNC_ENCODER_IMPORT_OBJECT, \ (void (*)(void))impl##2text_import_object }, \ { OSSL_FUNC_ENCODER_FREE_OBJECT, \ |