diff options
author | Richard Levitte <levitte@openssl.org> | 2020-08-16 21:25:08 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-08-21 09:23:58 +0200 |
commit | ece9304c96f71277ca95696d9bc49fdec51e9f17 (patch) | |
tree | 7038f8760e1538754bc67371cb5a466a83935dad /util | |
parent | f650993f1de3dbb5eda9009ad0c4895a7b1b7fe2 (diff) |
Rename OSSL_SERIALIZER / OSSL_DESERIALIZER to OSSL_ENCODE / OSSL_DECODE
Fixes #12455
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12660)
Diffstat (limited to 'util')
-rw-r--r-- | util/libcrypto.num | 114 | ||||
-rw-r--r-- | util/missingcrypto.txt | 16 | ||||
-rw-r--r-- | util/other.syms | 36 |
3 files changed, 83 insertions, 83 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 19a9b4c9d3..2d85c13eef 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4872,28 +4872,28 @@ EVP_PKEY_meth_set_digestsign ? 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 EVP_PKEY_meth_set_digestverify ? 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 EVP_PKEY_meth_get_digestsign ? 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 EVP_PKEY_meth_get_digestverify ? 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 -OSSL_SERIALIZER_up_ref ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_free ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_fetch ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_number ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_is_a ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_provider ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_do_all_provided ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_names_do_all ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_settable_ctx_params ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_CTX_new ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_CTX_get_serializer ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_CTX_set_params ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_CTX_free ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_properties ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_to_bio ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_to_fp ? 3_0_0 EXIST::FUNCTION:STDIO -OSSL_SERIALIZER_CTX_new_by_EVP_PKEY ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_CTX_set_cipher ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_CTX_set_passphrase ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_CTX_set_passphrase_cb ? 3_0_0 EXIST::FUNCTION: -OSSL_SERIALIZER_CTX_set_passphrase_ui ? 3_0_0 EXIST::FUNCTION: -ERR_load_OSSL_SERIALIZER_strings ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_up_ref ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_free ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_fetch ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_number ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_is_a ? 3_0_0 EXIST::FUNCTION: +OSSL_ENCODER_provider ? 3_0_0 EXIST::FUNCTION: +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: +OSSL_ENCODER_to_bio ? 3_0_0 EXIST::FUNCTION: +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_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 PEM_write_X509_PUBKEY ? 3_0_0 EXIST::FUNCTION:STDIO PEM_read_bio_X509_PUBKEY ? 3_0_0 EXIST::FUNCTION: @@ -5155,35 +5155,35 @@ X509_STORE_load_store_with_libctx ? 3_0_0 EXIST::FUNCTION: X509_STORE_load_locations_with_libctx ? 3_0_0 EXIST::FUNCTION: X509_STORE_set_default_paths_with_libctx ? 3_0_0 EXIST::FUNCTION: OSSL_STORE_open_with_libctx ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_fetch ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_up_ref ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_free ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_provider ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_properties ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_number ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_is_a ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_do_all_provided ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_names_do_all ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_settable_ctx_params ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_new ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_set_params ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_free ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_set_passphrase ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_set_pem_password_cb ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_set_passphrase_ui ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_from_bio ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_from_fp ? 3_0_0 EXIST::FUNCTION:STDIO -OSSL_DESERIALIZER_CTX_add_deserializer ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_add_extra ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_num_deserializers ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_set_input_type ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_export ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_INSTANCE_deserializer ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_INSTANCE_deserializer_ctx ? 3_0_0 EXIST::FUNCTION: -ERR_load_OSSL_DESERIALIZER_strings ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_gettable_params ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_get_params ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_new_by_EVP_PKEY ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_fetch ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_up_ref ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_free ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_provider ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_properties ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_number ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_is_a ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_do_all_provided ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_names_do_all ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_settable_ctx_params ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_new ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_set_params ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_free ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_set_passphrase ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_set_pem_password_cb ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_set_passphrase_ui ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_from_bio ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_from_fp ? 3_0_0 EXIST::FUNCTION:STDIO +OSSL_DECODER_CTX_add_decoder ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_add_extra ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_num_decoders ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_set_input_type ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_export ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_INSTANCE_decoder ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_INSTANCE_decoder_ctx ? 3_0_0 EXIST::FUNCTION: +ERR_load_OSSL_DECODER_strings ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_gettable_params ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_get_params ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_new_by_EVP_PKEY ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_set1_X25519 ? 3_0_0 EXIST::FUNCTION:EC EVP_PKEY_get0_X25519 ? 3_0_0 EXIST::FUNCTION:EC EVP_PKEY_get1_X25519 ? 3_0_0 EXIST::FUNCTION:EC @@ -5196,12 +5196,12 @@ EVP_PKEY_get1_ED25519 ? 3_0_0 EXIST::FUNCTION:EC EVP_PKEY_set1_ED448 ? 3_0_0 EXIST::FUNCTION:EC EVP_PKEY_get0_ED448 ? 3_0_0 EXIST::FUNCTION:EC EVP_PKEY_get1_ED448 ? 3_0_0 EXIST::FUNCTION:EC -OSSL_DESERIALIZER_CTX_set_construct ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_set_construct_data ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_set_cleanup ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_get_construct ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_get_construct_data ? 3_0_0 EXIST::FUNCTION: -OSSL_DESERIALIZER_CTX_get_cleanup ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_set_construct ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_set_construct_data ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_set_cleanup ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_get_construct ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_get_construct_data ? 3_0_0 EXIST::FUNCTION: +OSSL_DECODER_CTX_get_cleanup ? 3_0_0 EXIST::FUNCTION: RAND_get0_primary ? 3_0_0 EXIST::FUNCTION: RAND_get0_public ? 3_0_0 EXIST::FUNCTION: RAND_get0_private ? 3_0_0 EXIST::FUNCTION: diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt index 97208d364e..54ff9cc1b7 100644 --- a/util/missingcrypto.txt +++ b/util/missingcrypto.txt @@ -633,8 +633,8 @@ ERR_load_HTTP_strings(3) ERR_load_KDF_strings(3) ERR_load_OBJ_strings(3) ERR_load_OCSP_strings(3) -ERR_load_OSSL_SERIALIZER_strings(3) -ERR_load_OSSL_DESERIALIZER_strings(3) +ERR_load_OSSL_ENCODER_strings(3) +ERR_load_OSSL_DECODER_strings(3) ERR_load_OSSL_STORE_strings(3) ERR_load_PEM_strings(3) ERR_load_PKCS12_strings(3) @@ -910,12 +910,12 @@ OPENSSL_utf82uni(3) OSSL_CRMF_CERTID_dup(3) OSSL_PARAM_modified(3) OSSL_PARAM_set_all_unmodified(3) -OSSL_SERIALIZER-DH(7) -OSSL_SERIALIZER-DSA(7) -OSSL_SERIALIZER-EC(7) -OSSL_SERIALIZER-RSA(7) -OSSL_SERIALIZER-X25519(7) -OSSL_SERIALIZER-X448(7) +OSSL_ENCODER-DH(7) +OSSL_ENCODER-DSA(7) +OSSL_ENCODER-EC(7) +OSSL_ENCODER-RSA(7) +OSSL_ENCODER-X25519(7) +OSSL_ENCODER-X448(7) OSSL_STORE_do_all_loaders(3) OSSL_STORE_vctrl(3) OTHERNAME_cmp(3) diff --git a/util/other.syms b/util/other.syms index bfe320396b..97f71906da 100644 --- a/util/other.syms +++ b/util/other.syms @@ -41,17 +41,17 @@ GEN_SESSION_CB datatype OPENSSL_Applink external OPENSSL_CTX datatype NAMING_AUTHORITY datatype -OSSL_DESERIALIZER datatype -OSSL_DESERIALIZER_CTX datatype -OSSL_DESERIALIZER_CONSTRUCT datatype -OSSL_DESERIALIZER_CLEANUP datatype -OSSL_DESERIALIZER_INSTANCE datatype -OSSL_DESERIALIZER_CTX datatype +OSSL_DECODER datatype +OSSL_DECODER_CTX datatype +OSSL_DECODER_CONSTRUCT datatype +OSSL_DECODER_CLEANUP datatype +OSSL_DECODER_INSTANCE datatype +OSSL_DECODER_CTX datatype OSSL_HTTP_bio_cb_t datatype OSSL_PARAM datatype OSSL_PROVIDER datatype -OSSL_SERIALIZER datatype -OSSL_SERIALIZER_CTX datatype +OSSL_ENCODER datatype +OSSL_ENCODER_CTX datatype OSSL_STORE_CTX datatype OSSL_STORE_INFO datatype OSSL_STORE_LOADER datatype @@ -266,7 +266,7 @@ EVP_PKEY_CTX_set1_scrypt_salt define EVP_PKEY_CTX_set1_tls1_prf_secret define EVP_PKEY_CTX_set_dh_paramgen_generator define EVP_PKEY_CTX_set_dh_paramgen_prime_len define -EVP_PKEY_CTX_set_dh_paramgen_subprime_len define +EVP_PKEY_CTX_set_dh_paramgen_subprime_len define EVP_PKEY_CTX_set_dh_paramgen_type define EVP_PKEY_CTX_set_dh_kdf_md define EVP_PKEY_CTX_set_dh_kdf_outlen define @@ -412,15 +412,15 @@ OSSL_PARAM_utf8_string define OSSL_PARAM_get_TYPE generic OSSL_PARAM_END define OSSL_PARAM_set_TYPE generic -OSSL_SERIALIZER_PUBKEY_TO_DER_PQ define -OSSL_SERIALIZER_PrivateKey_TO_DER_PQ define -OSSL_SERIALIZER_Parameters_TO_DER_PQ define -OSSL_SERIALIZER_PUBKEY_TO_PEM_PQ define -OSSL_SERIALIZER_PrivateKey_TO_PEM_PQ define -OSSL_SERIALIZER_Parameters_TO_PEM_PQ define -OSSL_SERIALIZER_PUBKEY_TO_TEXT_PQ define -OSSL_SERIALIZER_PrivateKey_TO_TEXT_PQ define -OSSL_SERIALIZER_Parameters_TO_TEXT_PQ define +OSSL_ENCODER_PUBKEY_TO_DER_PQ define +OSSL_ENCODER_PrivateKey_TO_DER_PQ define +OSSL_ENCODER_Parameters_TO_DER_PQ define +OSSL_ENCODER_PUBKEY_TO_PEM_PQ define +OSSL_ENCODER_PrivateKey_TO_PEM_PQ define +OSSL_ENCODER_Parameters_TO_PEM_PQ define +OSSL_ENCODER_PUBKEY_TO_TEXT_PQ define +OSSL_ENCODER_PrivateKey_TO_TEXT_PQ define +OSSL_ENCODER_Parameters_TO_TEXT_PQ define PEM_FLAG_EAY_COMPATIBLE define PEM_FLAG_ONLY_B64 define PEM_FLAG_SECURE define |