Fix some things the rename script didn't quite get right

The previous commit ran an automated rename throughout the codebase.
There are a small number of things it didn't quite get right so we fix
those in this commit.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12970)

4 files changed, 56 insertions, 56 deletions

diff --git a/util/libcrypto.num b/util/libcrypto.num
index 7a0965ba72..8e21348e3a 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4910,8 +4910,8 @@ PKCS8_pkey_add1_attr_by_OBJ             ?	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_private_check                  ?	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_pairwise_check                 ?	3_0_0	EXIST::FUNCTION:
 ASN1_item_verify_ctx                    ?	3_0_0	EXIST::FUNCTION:
-ASN1_item_sign_with_libctx              ?	3_0_0	EXIST::FUNCTION:
-ASN1_item_verify_with_libctx            ?	3_0_0	EXIST::FUNCTION:
+ASN1_item_sign_ex                       ?	3_0_0	EXIST::FUNCTION:
+ASN1_item_verify_ex                     ?	3_0_0	EXIST::FUNCTION:
 BIO_socket_wait                         ?	3_0_0	EXIST::FUNCTION:SOCK
 BIO_wait                                ?	3_0_0	EXIST::FUNCTION:
 BIO_do_connect_retry                    ?	3_0_0	EXIST::FUNCTION:
@@ -4987,8 +4987,8 @@ EVP_PKEY_CTX_set_rsa_keygen_bits        ?	3_0_0	EXIST::FUNCTION:RSA
 EVP_PKEY_CTX_set_rsa_keygen_pubexp      ?	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
 EVP_PKEY_CTX_set1_rsa_keygen_pubexp     ?	3_0_0	EXIST::FUNCTION:RSA
 EVP_PKEY_CTX_set_rsa_keygen_primes      ?	3_0_0	EXIST::FUNCTION:RSA
-NCONF_new_with_libctx                   ?	3_0_0	EXIST::FUNCTION:
-CONF_modules_load_file_with_libctx      ?	3_0_0	EXIST::FUNCTION:
+NCONF_new_ex                            ?	3_0_0	EXIST::FUNCTION:
+CONF_modules_load_file_ex               ?	3_0_0	EXIST::FUNCTION:
 OPENSSL_CTX_load_config                 ?	3_0_0	EXIST::FUNCTION:
 OSSL_PARAM_BLD_to_param                 ?	3_0_0	EXIST::FUNCTION:
 OSSL_PARAM_BLD_free_params              ?	3_0_0	EXIST::FUNCTION:
@@ -5029,11 +5029,11 @@ EVP_PKEY_get_octet_string_param         ?	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_is_a                           ?	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_can_sign                       ?	3_0_0	EXIST::FUNCTION:
 evp_pkey_get_EC_KEY_curve_nid           ?	3_0_0	EXIST::FUNCTION:EC
-X509_STORE_CTX_new_with_libctx          ?	3_0_0	EXIST::FUNCTION:
-CT_POLICY_EVAL_CTX_new_with_libctx      ?	3_0_0	EXIST::FUNCTION:CT
-CTLOG_new_with_libctx                   ?	3_0_0	EXIST::FUNCTION:CT
-CTLOG_new_from_base64_with_libctx       ?	3_0_0	EXIST::FUNCTION:CT
-CTLOG_STORE_new_with_libctx             ?	3_0_0	EXIST::FUNCTION:CT
+X509_STORE_CTX_new_ex                   ?	3_0_0	EXIST::FUNCTION:
+CT_POLICY_EVAL_CTX_new_ex               ?	3_0_0	EXIST::FUNCTION:CT
+CTLOG_new_ex                            ?	3_0_0	EXIST::FUNCTION:CT
+CTLOG_new_from_base64_ex                ?	3_0_0	EXIST::FUNCTION:CT
+CTLOG_STORE_new_ex                      ?	3_0_0	EXIST::FUNCTION:CT
 EVP_PKEY_set_ex_data                    ?	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_get_ex_data                    ?	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_CTX_set_group_name             ?	3_0_0	EXIST::FUNCTION:
@@ -5101,8 +5101,8 @@ EVP_RAND_strength                       ?	3_0_0	EXIST::FUNCTION:
 EVP_RAND_state                          ?	3_0_0	EXIST::FUNCTION:
 EVP_default_properties_is_fips_enabled  ?	3_0_0	EXIST::FUNCTION:
 EVP_default_properties_enable_fips      ?	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_new_raw_private_key_with_libctx ?	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_new_raw_public_key_with_libctx ?	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_new_raw_private_key_ex         ?	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_new_raw_public_key_ex          ?	3_0_0	EXIST::FUNCTION:
 OSSL_PARAM_BLD_push_time_t              ?	3_0_0	EXIST::FUNCTION:
 OSSL_PARAM_construct_time_t             ?	3_0_0	EXIST::FUNCTION:
 OSSL_PARAM_get_time_t                   ?	3_0_0	EXIST::FUNCTION:
@@ -5120,23 +5120,23 @@ EVP_PKEY_parameters_eq                  ?	3_0_0	EXIST::FUNCTION:
 OSSL_PROVIDER_query_operation           ?	3_0_0	EXIST::FUNCTION:
 OSSL_PROVIDER_get0_provider_ctx         ?	3_0_0	EXIST::FUNCTION:
 OSSL_PROVIDER_get_capabilities          ?	3_0_0	EXIST::FUNCTION:
-EC_GROUP_new_by_curve_name_with_libctx  ?	3_0_0	EXIST::FUNCTION:EC
-EC_KEY_new_with_libctx                  ?	3_0_0	EXIST::FUNCTION:EC
-EC_KEY_new_by_curve_name_with_libctx    ?	3_0_0	EXIST::FUNCTION:EC
+EC_GROUP_new_by_curve_name_ex           ?	3_0_0	EXIST::FUNCTION:EC
+EC_KEY_new_ex                           ?	3_0_0	EXIST::FUNCTION:EC
+EC_KEY_new_by_curve_name_ex             ?	3_0_0	EXIST::FUNCTION:EC
 OPENSSL_CTX_set0_default                ?	3_0_0	EXIST::FUNCTION:
-PEM_X509_INFO_read_bio_with_libctx      ?	3_0_0	EXIST::FUNCTION:
-PEM_X509_INFO_read_with_libctx          ?	3_0_0	EXIST::FUNCTION:STDIO
-X509_REQ_verify_with_libctx             ?	3_0_0	EXIST::FUNCTION:
-X509_new_with_libctx                    ?	3_0_0	EXIST::FUNCTION:
-X509_LOOKUP_ctrl_with_libctx            ?	3_0_0	EXIST::FUNCTION:
-X509_load_cert_file_with_libctx         ?	3_0_0	EXIST::FUNCTION:
-X509_load_cert_crl_file_with_libctx     ?	3_0_0	EXIST::FUNCTION:
-X509_LOOKUP_by_subject_with_libctx      ?	3_0_0	EXIST::FUNCTION:
-X509_STORE_load_file_with_libctx        ?	3_0_0	EXIST::FUNCTION:
-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:
+PEM_X509_INFO_read_bio_ex               ?	3_0_0	EXIST::FUNCTION:
+PEM_X509_INFO_read_ex                   ?	3_0_0	EXIST::FUNCTION:STDIO
+X509_REQ_verify_ex                      ?	3_0_0	EXIST::FUNCTION:
+X509_new_ex                             ?	3_0_0	EXIST::FUNCTION:
+X509_LOOKUP_ctrl_ex                     ?	3_0_0	EXIST::FUNCTION:
+X509_load_cert_file_ex                  ?	3_0_0	EXIST::FUNCTION:
+X509_load_cert_crl_file_ex              ?	3_0_0	EXIST::FUNCTION:
+X509_LOOKUP_by_subject_ex               ?	3_0_0	EXIST::FUNCTION:
+X509_STORE_load_file_ex                 ?	3_0_0	EXIST::FUNCTION:
+X509_STORE_load_store_ex                ?	3_0_0	EXIST::FUNCTION:
+X509_STORE_load_locations_ex            ?	3_0_0	EXIST::FUNCTION:
+X509_STORE_set_default_paths_ex         ?	3_0_0	EXIST::FUNCTION:
+OSSL_STORE_open_ex                      ?	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:
@@ -5181,24 +5181,24 @@ PKCS12_SAFEBAG_create_secret            ?	3_0_0	EXIST::FUNCTION:
 PKCS12_add1_attr_by_NID                 ?	3_0_0	EXIST::FUNCTION:
 PKCS12_add1_attr_by_txt                 ?	3_0_0	EXIST::FUNCTION:
 PKCS12_add_secret                       ?	3_0_0	EXIST::FUNCTION:
-SMIME_write_ASN1_with_libctx            ?	3_0_0	EXIST::FUNCTION:
+SMIME_write_ASN1_ex                     ?	3_0_0	EXIST::FUNCTION:
 SMIME_read_ASN1_ex                      ?	3_0_0	EXIST::FUNCTION:
-CMS_ContentInfo_new_with_libctx         ?	3_0_0	EXIST::FUNCTION:CMS
+CMS_ContentInfo_new_ex                  ?	3_0_0	EXIST::FUNCTION:CMS
 SMIME_read_CMS_ex                       ?	3_0_0	EXIST::FUNCTION:CMS
-CMS_sign_with_libctx                    ?	3_0_0	EXIST::FUNCTION:CMS
-CMS_data_create_with_libctx             ?	3_0_0	EXIST::FUNCTION:CMS
-CMS_digest_create_with_libctx           ?	3_0_0	EXIST::FUNCTION:CMS
-CMS_EncryptedData_encrypt_with_libctx   ?	3_0_0	EXIST::FUNCTION:CMS
-CMS_encrypt_with_libctx                 ?	3_0_0	EXIST::FUNCTION:CMS
-CMS_EnvelopedData_create_with_libctx    ?	3_0_0	EXIST::FUNCTION:CMS
-CMS_ReceiptRequest_create0_with_libctx  ?	3_0_0	EXIST::FUNCTION:CMS
-EVP_SignFinal_with_libctx               ?	3_0_0	EXIST::FUNCTION:
-EVP_VerifyFinal_with_libctx             ?	3_0_0	EXIST::FUNCTION:
-EVP_DigestSignInit_with_libctx          ?	3_0_0	EXIST::FUNCTION:
-EVP_DigestVerifyInit_with_libctx        ?	3_0_0	EXIST::FUNCTION:
-PKCS7_new_with_libctx                   ?	3_0_0	EXIST::FUNCTION:
-PKCS7_sign_with_libctx                  ?	3_0_0	EXIST::FUNCTION:
-PKCS7_encrypt_with_libctx               ?	3_0_0	EXIST::FUNCTION:
+CMS_sign_ex                             ?	3_0_0	EXIST::FUNCTION:CMS
+CMS_data_create_ex                      ?	3_0_0	EXIST::FUNCTION:CMS
+CMS_digest_create_ex                    ?	3_0_0	EXIST::FUNCTION:CMS
+CMS_EncryptedData_encrypt_ex            ?	3_0_0	EXIST::FUNCTION:CMS
+CMS_encrypt_ex                          ?	3_0_0	EXIST::FUNCTION:CMS
+CMS_EnvelopedData_create_ex             ?	3_0_0	EXIST::FUNCTION:CMS
+CMS_ReceiptRequest_create0_ex           ?	3_0_0	EXIST::FUNCTION:CMS
+EVP_SignFinal_ex                        ?	3_0_0	EXIST::FUNCTION:
+EVP_VerifyFinal_ex                      ?	3_0_0	EXIST::FUNCTION:
+EVP_DigestSignInit_ex                   ?	3_0_0	EXIST::FUNCTION:
+EVP_DigestVerifyInit_ex                 ?	3_0_0	EXIST::FUNCTION:
+PKCS7_new_ex                            ?	3_0_0	EXIST::FUNCTION:
+PKCS7_sign_ex                           ?	3_0_0	EXIST::FUNCTION:
+PKCS7_encrypt_ex                        ?	3_0_0	EXIST::FUNCTION:
 SMIME_read_PKCS7_ex                     ?	3_0_0	EXIST::FUNCTION:
 OSSL_PROVIDER_self_test                 ?	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_CTX_set_tls1_prf_md            ?	3_0_0	EXIST::FUNCTION:
@@ -5242,7 +5242,7 @@ PEM_read_bio_PUBKEY_ex                  ?	3_0_0	EXIST::FUNCTION:
 PEM_read_PUBKEY_ex                      ?	3_0_0	EXIST::FUNCTION:STDIO
 PEM_read_bio_Parameters_ex              ?	3_0_0	EXIST::FUNCTION:
 EC_GROUP_new_from_params                ?	3_0_0	EXIST::FUNCTION:EC
-OSSL_STORE_LOADER_set_open_with_libctx  ?	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+OSSL_STORE_LOADER_set_open_ex           ?	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 OSSL_STORE_LOADER_fetch                 ?	3_0_0	EXIST::FUNCTION:
 OSSL_STORE_LOADER_up_ref                ?	3_0_0	EXIST::FUNCTION:
 OSSL_STORE_LOADER_provider              ?	3_0_0	EXIST::FUNCTION:
@@ -5255,20 +5255,20 @@ OSSL_PARAM_get_utf8_string_ptr          ?	3_0_0	EXIST::FUNCTION:
 OSSL_PARAM_get_octet_string_ptr         ?	3_0_0	EXIST::FUNCTION:
 OSSL_DECODER_CTX_set_passphrase_cb      ?	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_CTX_set_mac_key                ?	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_new_CMAC_key_with_libctx       ?	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_new_CMAC_key_ex                ?	3_0_0	EXIST::FUNCTION:
 OSSL_STORE_INFO_new                     ?	3_0_0	EXIST::FUNCTION:
 OSSL_STORE_INFO_get0_data               ?	3_0_0	EXIST::FUNCTION:
 ossl_do_blob_header                     ?	3_0_0	EXIST::FUNCTION:DSA
 ossl_do_PVK_header                      ?	3_0_0	EXIST::FUNCTION:DSA,RC4
 asn1_d2i_read_bio                       ?	3_0_0	EXIST::FUNCTION:
-EVP_PKCS82PKEY_with_libctx              ?	3_0_0	EXIST::FUNCTION:
+EVP_PKCS82PKEY_ex                       ?	3_0_0	EXIST::FUNCTION:
 ossl_b2i                                ?	3_0_0	EXIST::FUNCTION:DSA
 ossl_b2i_bio                            ?	3_0_0	EXIST::FUNCTION:DSA
 EVP_PKEY_CTX_set1_id                    ?	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_CTX_get1_id                    ?	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_CTX_get1_id_len                ?	3_0_0	EXIST::FUNCTION:
 CMS_AuthEnvelopedData_create            ?	3_0_0	EXIST::FUNCTION:CMS
-CMS_AuthEnvelopedData_create_with_libctx ?	3_0_0	EXIST::FUNCTION:CMS
+CMS_AuthEnvelopedData_create_ex         ?	3_0_0	EXIST::FUNCTION:CMS
 EVP_PKEY_CTX_set_ec_param_enc           ?	3_0_0	EXIST::FUNCTION:EC
 EVP_PKEY_get0_first_alg_name            ?	3_0_0	EXIST::FUNCTION:
 EVP_KEYMGMT_get0_first_name             ?	3_0_0	EXIST::FUNCTION:
diff --git a/util/libssl.num b/util/libssl.num
index 45ff6ed00a..193be1b7a1 100644
--- a/util/libssl.num
+++ b/util/libssl.num
@@ -512,8 +512,8 @@ SSL_CTX_load_verify_file                ?	3_0_0	EXIST::FUNCTION:
 SSL_CTX_load_verify_dir                 ?	3_0_0	EXIST::FUNCTION:
 SSL_CTX_load_verify_store               ?	3_0_0	EXIST::FUNCTION:
 SSL_CTX_set_tlsext_ticket_key_evp_cb    ?	3_0_0	EXIST::FUNCTION:
-SSL_CTX_new_with_libctx                 ?	3_0_0	EXIST::FUNCTION:
+SSL_CTX_new_ex                          ?	3_0_0	EXIST::FUNCTION:
 SSL_new_session_ticket                  ?	3_0_0	EXIST::FUNCTION:
 SSL_get0_peer_certificate               ?	3_0_0	EXIST::FUNCTION:
 SSL_get1_peer_certificate               ?	3_0_0	EXIST::FUNCTION:
-SSL_load_client_CA_file_with_libctx     ?	3_0_0	EXIST::FUNCTION:
+SSL_load_client_CA_file_ex              ?	3_0_0	EXIST::FUNCTION:
diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt
index 783df1203f..481331e261 100644
--- a/util/missingcrypto.txt
+++ b/util/missingcrypto.txt
@@ -156,11 +156,11 @@ ASN1_item_pack(3)
 ASN1_item_print(3)
 ASN1_item_sign(3)
 ASN1_item_sign_ctx(3)
-ASN1_item_sign_with_libctx(3)
+ASN1_item_sign_ex(3)
 ASN1_item_unpack(3)
 ASN1_item_verify(3)
 ASN1_item_verify_ctx(3)
-ASN1_item_verify_with_libctx(3)
+ASN1_item_verify_ex(3)
 ASN1_mbstring_copy(3)
 ASN1_mbstring_ncopy(3)
 ASN1_object_size(3)
@@ -673,7 +673,7 @@ EVP_PBE_find(3)
 EVP_PBE_get(3)
 EVP_PBE_scrypt(3)
 EVP_PKCS82PKEY(3)
-EVP_PKCS82PKEY_with_libctx(3)
+EVP_PKCS82PKEY_ex(3)
 EVP_PKEY2PKCS8(3)
 EVP_PKEY_CTX_get0_peerkey(3)
 EVP_PKEY_CTX_get0_pkey(3)
diff --git a/util/other.syms b/util/other.syms
index 395b475159..d4c552e298 100644
--- a/util/other.syms
+++ b/util/other.syms
@@ -68,7 +68,7 @@ OSSL_STORE_eof_fn                       datatype
 OSSL_STORE_error_fn                     datatype
 OSSL_STORE_load_fn                      datatype
 OSSL_STORE_open_fn                      datatype
-OSSL_STORE_open_with_libctx_fn          datatype
+OSSL_STORE_open_ex_fn                   datatype
 OSSL_STORE_post_process_info_fn         datatype
 OSSL_trace_cb                           datatype
 PROFESSION_INFO                         datatype
@@ -580,11 +580,11 @@ X509_CRL_http_nbio                      define
 X509_http_nbio                          define
 X509_LOOKUP_add_dir                     define
 X509_LOOKUP_add_store                   define
-X509_LOOKUP_add_store_with_libctx       define
+X509_LOOKUP_add_store_ex                define
 X509_LOOKUP_load_file                   define
-X509_LOOKUP_load_file_with_libctx       define
+X509_LOOKUP_load_file_ex                define
 X509_LOOKUP_load_store                  define
-X509_LOOKUP_load_store_with_libctx      define
+X509_LOOKUP_load_store_ex               define
 X509_STORE_set_lookup_crls_cb           define
 X509_STORE_set_verify_func              define
 EVP_PKEY_CTX_set1_id                    define