diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-09-14 09:20:41 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-09-20 17:31:22 +0200 |
| commit | b8975c68b1a7796993759db22905d0ef05f7e077 (patch) | |
| tree | 5cd409609aa40deddd2a3ecc16992f80b9611fa9 /util | |
| parent | 5a6d6fe66614ee5ff5976ca6e90bd156c8143553 (diff) | |
ENCODER: Refactor the OSSL_ENCODER API to be more like OSSL_DECODER
OSSL_ENCODER was developed before OSSL_DECODER, so the idea of
chaining and the resulting API came later. This series of changes
brings the same sort of API and functionality back to OSSL_ENCODER,
making the two APIs more consistent with each other.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12873)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 19 | ||||
| -rw-r--r-- | util/other.syms | 3 |
2 files changed, 20 insertions, 2 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 96fd637ba0..f9045e021a 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4865,7 +4865,6 @@ OSSL_ENCODER_do_all_provided ? 3_0_0 EXIST::FUNCTION: OSSL_ENCODER_names_do_all ? 3_0_0 EXIST::FUNCTION: OSSL_ENCODER_settable_ctx_params ? 3_0_0 EXIST::FUNCTION: OSSL_ENCODER_CTX_new ? 3_0_0 EXIST::FUNCTION: -OSSL_ENCODER_CTX_get_encoder ? 3_0_0 EXIST::FUNCTION: OSSL_ENCODER_CTX_set_params ? 3_0_0 EXIST::FUNCTION: OSSL_ENCODER_CTX_free ? 3_0_0 EXIST::FUNCTION: OSSL_ENCODER_properties ? 3_0_0 EXIST::FUNCTION: @@ -4874,7 +4873,7 @@ OSSL_ENCODER_to_fp ? 3_0_0 EXIST::FUNCTION:STDIO OSSL_ENCODER_CTX_new_by_EVP_PKEY ? 3_0_0 EXIST::FUNCTION: OSSL_ENCODER_CTX_set_cipher ? 3_0_0 EXIST::FUNCTION: OSSL_ENCODER_CTX_set_passphrase ? 3_0_0 EXIST::FUNCTION: -OSSL_ENCODER_CTX_set_passphrase_cb ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_CTX_set_pem_password_cb ? 3_0_0 EXIST::FUNCTION: OSSL_ENCODER_CTX_set_passphrase_ui ? 3_0_0 EXIST::FUNCTION: ERR_load_OSSL_ENCODER_strings ? 3_0_0 EXIST::FUNCTION: PEM_read_X509_PUBKEY ? 3_0_0 EXIST::FUNCTION:STDIO @@ -5296,3 +5295,19 @@ EVP_PKEY_encapsulate ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_decapsulate_init ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_decapsulate ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_CTX_set_kem_op ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_gettable_params ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_get_params ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_CTX_set_output_type ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_CTX_add_encoder ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_CTX_add_extra ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_CTX_get_num_encoders ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_CTX_set_selection ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_INSTANCE_get_encoder ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_INSTANCE_get_encoder_ctx ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_INSTANCE_get_input_type ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_INSTANCE_get_output_type ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_CTX_set_construct ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_CTX_set_construct_data ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_CTX_set_cleanup ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_INSTANCE_get_input_type ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_CTX_set_passphrase_cb ? 3_0_0 EXIST::FUNCTION: diff --git a/util/other.syms b/util/other.syms index 0925d726d8..b4acae2952 100644 --- a/util/other.syms +++ b/util/other.syms @@ -52,6 +52,9 @@ OSSL_PARAM datatype OSSL_PROVIDER datatype OSSL_ENCODER datatype OSSL_ENCODER_CTX datatype +OSSL_ENCODER_CONSTRUCT datatype +OSSL_ENCODER_CLEANUP datatype +OSSL_ENCODER_INSTANCE datatype OSSL_STORE_CTX datatype OSSL_STORE_INFO datatype OSSL_STORE_LOADER datatype |