Fixup merge conflicts in util/libeay.num
[openssl.git] / util / libeay.num
index a82db68e0035a34268720a128bb241bebb6f9015..4e511dfa9b759532a7b262fbac09ce84b9b0f2e3 100755 (executable)
@@ -1371,10 +1371,10 @@ X509V3_string_free                      1506    EXIST::FUNCTION:
 X509V3_section_free                     1507   EXIST::FUNCTION:
 X509V3_set_ctx                          1508   EXIST::FUNCTION:
 s2i_ASN1_INTEGER                        1509   EXIST::FUNCTION:
-CRYPTO_set_locked_mem_functions         1510   EXIST::FUNCTION:
-CRYPTO_get_locked_mem_functions         1511   EXIST::FUNCTION:
-CRYPTO_malloc_locked                    1512   EXIST::FUNCTION:
-CRYPTO_free_locked                      1513   EXIST::FUNCTION:
+CRYPTO_set_locked_mem_functions         1510   NOEXIST::FUNCTION:
+CRYPTO_get_locked_mem_functions         1511   NOEXIST::FUNCTION:
+CRYPTO_malloc_locked                    1512   NOEXIST::FUNCTION:
+CRYPTO_free_locked                      1513   NOEXIST::FUNCTION:
 BN_mod_exp2_mont                        1514   EXIST::FUNCTION:
 ERR_get_error_line_data                 1515   EXIST::FUNCTION:
 ERR_peek_error_line_data                1516   EXIST::FUNCTION:
@@ -2237,8 +2237,8 @@ DIRECTORYSTRING_it                      2767      EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 DIRECTORYSTRING_it                      2767   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 d2i_OCSP_CRLID                          2768   EXIST::FUNCTION:
 EC_POINT_is_on_curve                    2769   EXIST::FUNCTION:EC
-CRYPTO_set_locked_mem_ex_functions      2770   EXIST:!VMS:FUNCTION:
-CRYPTO_set_locked_mem_ex_funcs          2770   EXIST:VMS:FUNCTION:
+CRYPTO_set_locked_mem_ex_funcs          2770   NOEXIST::FUNCTION:
+CRYPTO_set_locked_mem_ex_functions      2770   NOEXIST::FUNCTION:
 d2i_KRB5_CHECKSUM                       2771   NOEXIST::FUNCTION:
 ASN1_item_dup                           2772   EXIST::FUNCTION:
 X509_it                                 2773   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2252,8 +2252,8 @@ EC_POINT_get_Jprojective_coordinates_GFp 2779     EXIST:!VMS:FUNCTION:EC
 EC_POINT_get_Jproj_coords_GFp           2779   EXIST:VMS:FUNCTION:EC
 ZLONG_it                                2780   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ZLONG_it                                2780   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-CRYPTO_get_locked_mem_ex_functions      2781   EXIST:!VMS:FUNCTION:
-CRYPTO_get_locked_mem_ex_funcs          2781   EXIST:VMS:FUNCTION:
+CRYPTO_get_locked_mem_ex_funcs          2781   NOEXIST::FUNCTION:
+CRYPTO_get_locked_mem_ex_functions      2781   NOEXIST::FUNCTION:
 ASN1_TIME_check                         2782   EXIST::FUNCTION:
 UI_get0_user_data                       2783   EXIST::FUNCTION:
 HMAC_CTX_cleanup                        2784   EXIST::FUNCTION:
@@ -3412,106 +3412,106 @@ EVP_camellia_256_cfb8                   3810  EXIST::FUNCTION:CAMELLIA
 EVP_camellia_256_ecb                    3811   EXIST::FUNCTION:CAMELLIA
 EVP_camellia_256_ofb                    3812   EXIST::FUNCTION:CAMELLIA
 a2i_ipadd                               3813   EXIST::FUNCTION:
-ASIdentifiers_free                      3814   EXIST::FUNCTION:
-i2d_ASIdOrRange                         3815   EXIST::FUNCTION:
+ASIdentifiers_free                      3814   EXIST::FUNCTION:RFC3779
+i2d_ASIdOrRange                         3815   EXIST::FUNCTION:RFC3779
 EVP_CIPHER_block_size                   3816   EXIST::FUNCTION:
-v3_asid_is_canonical                    3817   EXIST::FUNCTION:
-IPAddressChoice_free                    3818   EXIST::FUNCTION:
+v3_asid_is_canonical                    3817   EXIST::FUNCTION:RFC3779
+IPAddressChoice_free                    3818   EXIST::FUNCTION:RFC3779
 EVP_CIPHER_CTX_set_app_data             3819   EXIST::FUNCTION:
 BIO_set_callback_arg                    3820   EXIST::FUNCTION:
-v3_addr_add_prefix                      3821   EXIST::FUNCTION:
-IPAddressOrRange_it                     3822   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-IPAddressOrRange_it                     3822   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+v3_addr_add_prefix                      3821   EXIST::FUNCTION:RFC3779
+IPAddressOrRange_it                     3822   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
+IPAddressOrRange_it                     3822   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
 BIO_set_flags                           3823   EXIST::FUNCTION:
-ASIdentifiers_it                        3824   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASIdentifiers_it                        3824   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-v3_addr_get_range                       3825   EXIST::FUNCTION:
+ASIdentifiers_it                        3824   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
+ASIdentifiers_it                        3824   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
+v3_addr_get_range                       3825   EXIST::FUNCTION:RFC3779
 BIO_method_type                         3826   EXIST::FUNCTION:
-v3_addr_inherits                        3827   EXIST::FUNCTION:
-IPAddressChoice_it                      3828   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-IPAddressChoice_it                      3828   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+v3_addr_inherits                        3827   EXIST::FUNCTION:RFC3779
+IPAddressChoice_it                      3828   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
+IPAddressChoice_it                      3828   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
 AES_ige_encrypt                         3829   EXIST::FUNCTION:AES
-v3_addr_add_range                       3830   EXIST::FUNCTION:
+v3_addr_add_range                       3830   EXIST::FUNCTION:RFC3779
 EVP_CIPHER_CTX_nid                      3831   EXIST::FUNCTION:
-d2i_ASRange                             3832   EXIST::FUNCTION:
-v3_addr_add_inherit                     3833   EXIST::FUNCTION:
-v3_asid_add_id_or_range                 3834   EXIST::FUNCTION:
-v3_addr_validate_resource_set           3835   EXIST::FUNCTION:
+d2i_ASRange                             3832   EXIST::FUNCTION:RFC3779
+v3_addr_add_inherit                     3833   EXIST::FUNCTION:RFC3779
+v3_asid_add_id_or_range                 3834   EXIST::FUNCTION:RFC3779
+v3_addr_validate_resource_set           3835   EXIST::FUNCTION:RFC3779
 EVP_CIPHER_iv_length                    3836   EXIST::FUNCTION:
 EVP_MD_type                             3837   EXIST::FUNCTION:
-v3_asid_canonize                        3838   EXIST::FUNCTION:
-IPAddressRange_free                     3839   EXIST::FUNCTION:
-v3_asid_add_inherit                     3840   EXIST::FUNCTION:
+v3_asid_canonize                        3838   EXIST::FUNCTION:RFC3779
+IPAddressRange_free                     3839   EXIST::FUNCTION:RFC3779
+v3_asid_add_inherit                     3840   EXIST::FUNCTION:RFC3779
 EVP_CIPHER_CTX_key_length               3841   EXIST::FUNCTION:
-IPAddressRange_new                      3842   EXIST::FUNCTION:
-ASIdOrRange_new                         3843   EXIST::FUNCTION:
+IPAddressRange_new                      3842   EXIST::FUNCTION:RFC3779
+ASIdOrRange_new                         3843   EXIST::FUNCTION:RFC3779
 EVP_MD_size                             3844   EXIST::FUNCTION:
 EVP_MD_CTX_test_flags                   3845   EXIST::FUNCTION:
 BIO_clear_flags                         3846   EXIST::FUNCTION:
-i2d_ASRange                             3847   EXIST::FUNCTION:
-IPAddressRange_it                       3848   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-IPAddressRange_it                       3848   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-IPAddressChoice_new                     3849   EXIST::FUNCTION:
-ASIdentifierChoice_new                  3850   EXIST::FUNCTION:
-ASRange_free                            3851   EXIST::FUNCTION:
+i2d_ASRange                             3847   EXIST::FUNCTION:RFC3779
+IPAddressRange_it                       3848   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
+IPAddressRange_it                       3848   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
+IPAddressChoice_new                     3849   EXIST::FUNCTION:RFC3779
+ASIdentifierChoice_new                  3850   EXIST::FUNCTION:RFC3779
+ASRange_free                            3851   EXIST::FUNCTION:RFC3779
 EVP_MD_pkey_type                        3852   EXIST::FUNCTION:
 EVP_MD_CTX_clear_flags                  3853   EXIST::FUNCTION:
-IPAddressFamily_free                    3854   EXIST::FUNCTION:
-i2d_IPAddressFamily                     3855   EXIST::FUNCTION:
-IPAddressOrRange_new                    3856   EXIST::FUNCTION:
+IPAddressFamily_free                    3854   EXIST::FUNCTION:RFC3779
+i2d_IPAddressFamily                     3855   EXIST::FUNCTION:RFC3779
+IPAddressOrRange_new                    3856   EXIST::FUNCTION:RFC3779
 EVP_CIPHER_flags                        3857   EXIST::FUNCTION:
-v3_asid_validate_resource_set           3858   EXIST::FUNCTION:
-d2i_IPAddressRange                      3859   EXIST::FUNCTION:
+v3_asid_validate_resource_set           3858   EXIST::FUNCTION:RFC3779
+d2i_IPAddressRange                      3859   EXIST::FUNCTION:RFC3779
 AES_bi_ige_encrypt                      3860   EXIST::FUNCTION:AES
 BIO_get_callback                        3861   EXIST::FUNCTION:
-IPAddressOrRange_free                   3862   EXIST::FUNCTION:
-v3_addr_subset                          3863   EXIST::FUNCTION:
-d2i_IPAddressFamily                     3864   EXIST::FUNCTION:
-v3_asid_subset                          3865   EXIST::FUNCTION:
+IPAddressOrRange_free                   3862   EXIST::FUNCTION:RFC3779
+v3_addr_subset                          3863   EXIST::FUNCTION:RFC3779
+d2i_IPAddressFamily                     3864   EXIST::FUNCTION:RFC3779
+v3_asid_subset                          3865   EXIST::FUNCTION:RFC3779
 BIO_test_flags                          3866   EXIST::FUNCTION:
-i2d_ASIdentifierChoice                  3867   EXIST::FUNCTION:
-ASRange_it                              3868   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASRange_it                              3868   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-d2i_ASIdentifiers                       3869   EXIST::FUNCTION:
-ASRange_new                             3870   EXIST::FUNCTION:
-d2i_IPAddressChoice                     3871   EXIST::FUNCTION:
-v3_addr_get_afi                         3872   EXIST::FUNCTION:
+i2d_ASIdentifierChoice                  3867   EXIST::FUNCTION:RFC3779
+ASRange_it                              3868   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
+ASRange_it                              3868   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
+d2i_ASIdentifiers                       3869   EXIST::FUNCTION:RFC3779
+ASRange_new                             3870   EXIST::FUNCTION:RFC3779
+d2i_IPAddressChoice                     3871   EXIST::FUNCTION:RFC3779
+v3_addr_get_afi                         3872   EXIST::FUNCTION:RFC3779
 EVP_CIPHER_key_length                   3873   EXIST::FUNCTION:
 EVP_Cipher                              3874   EXIST::FUNCTION:
-i2d_IPAddressOrRange                    3875   EXIST::FUNCTION:
-ASIdOrRange_it                          3876   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASIdOrRange_it                          3876   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+i2d_IPAddressOrRange                    3875   EXIST::FUNCTION:RFC3779
+ASIdOrRange_it                          3876   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
+ASIdOrRange_it                          3876   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
 EVP_CIPHER_nid                          3877   EXIST::FUNCTION:
-i2d_IPAddressChoice                     3878   EXIST::FUNCTION:
+i2d_IPAddressChoice                     3878   EXIST::FUNCTION:RFC3779
 EVP_CIPHER_CTX_block_size               3879   EXIST::FUNCTION:
-ASIdentifiers_new                       3880   EXIST::FUNCTION:
-v3_addr_validate_path                   3881   EXIST::FUNCTION:
-IPAddressFamily_new                     3882   EXIST::FUNCTION:
+ASIdentifiers_new                       3880   EXIST::FUNCTION:RFC3779
+v3_addr_validate_path                   3881   EXIST::FUNCTION:RFC3779
+IPAddressFamily_new                     3882   EXIST::FUNCTION:RFC3779
 EVP_MD_CTX_set_flags                    3883   EXIST::FUNCTION:
-v3_addr_is_canonical                    3884   EXIST::FUNCTION:
-i2d_IPAddressRange                      3885   EXIST::FUNCTION:
-IPAddressFamily_it                      3886   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-IPAddressFamily_it                      3886   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-v3_asid_inherits                        3887   EXIST::FUNCTION:
+v3_addr_is_canonical                    3884   EXIST::FUNCTION:RFC3779
+i2d_IPAddressRange                      3885   EXIST::FUNCTION:RFC3779
+IPAddressFamily_it                      3886   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
+IPAddressFamily_it                      3886   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
+v3_asid_inherits                        3887   EXIST::FUNCTION:RFC3779
 EVP_CIPHER_CTX_cipher                   3888   EXIST::FUNCTION:
 EVP_CIPHER_CTX_get_app_data             3889   EXIST::FUNCTION:
 EVP_MD_block_size                       3890   EXIST::FUNCTION:
 EVP_CIPHER_CTX_flags                    3891   EXIST::FUNCTION:
-v3_asid_validate_path                   3892   EXIST::FUNCTION:
-d2i_IPAddressOrRange                    3893   EXIST::FUNCTION:
-v3_addr_canonize                        3894   EXIST::FUNCTION:
-ASIdentifierChoice_it                   3895   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASIdentifierChoice_it                   3895   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+v3_asid_validate_path                   3892   EXIST::FUNCTION:RFC3779
+d2i_IPAddressOrRange                    3893   EXIST::FUNCTION:RFC3779
+v3_addr_canonize                        3894   EXIST::FUNCTION:RFC3779
+ASIdentifierChoice_it                   3895   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
+ASIdentifierChoice_it                   3895   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
 EVP_MD_CTX_md                           3896   EXIST::FUNCTION:
-d2i_ASIdentifierChoice                  3897   EXIST::FUNCTION:
+d2i_ASIdentifierChoice                  3897   EXIST::FUNCTION:RFC3779
 BIO_method_name                         3898   EXIST::FUNCTION:
 EVP_CIPHER_CTX_iv_length                3899   EXIST::FUNCTION:
-ASIdOrRange_free                        3900   EXIST::FUNCTION:
-ASIdentifierChoice_free                 3901   EXIST::FUNCTION:
+ASIdOrRange_free                        3900   EXIST::FUNCTION:RFC3779
+ASIdentifierChoice_free                 3901   EXIST::FUNCTION:RFC3779
 BIO_get_callback_arg                    3902   EXIST::FUNCTION:
 BIO_set_callback                        3903   EXIST::FUNCTION:
-d2i_ASIdOrRange                         3904   EXIST::FUNCTION:
-i2d_ASIdentifiers                       3905   EXIST::FUNCTION:
+d2i_ASIdOrRange                         3904   EXIST::FUNCTION:RFC3779
+i2d_ASIdentifiers                       3905   EXIST::FUNCTION:RFC3779
 CRYPTO_memcmp                           3906   EXIST::FUNCTION:
 BN_consttime_swap                       3907   EXIST::FUNCTION:
 SEED_decrypt                            3908   EXIST::FUNCTION:SEED
@@ -4368,7 +4368,7 @@ DH_compute_key_padded                   4732      EXIST::FUNCTION:DH
 ECDSA_METHOD_set_sign                   4733   EXIST::FUNCTION:EC
 CMS_RecipientEncryptedKey_cert_cmp      4734   EXIST:!VMS:FUNCTION:CMS
 CMS_RecipEncryptedKey_cert_cmp          4734   EXIST:VMS:FUNCTION:CMS
-DH_KDF_X9_42                            4735   EXIST::FUNCTION:DH
+DH_KDF_X9_42                            4735   EXIST::FUNCTION:CMS,DH
 RSA_OAEP_PARAMS_free                    4736   EXIST::FUNCTION:RSA
 EVP_des_ede3_wrap                       4737   EXIST::FUNCTION:DES
 RSA_OAEP_PARAMS_it                      4738   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA
@@ -4563,13 +4563,13 @@ COMP_get_name                           4921    EXIST::FUNCTION:
 COMP_get_type                           4922   EXIST::FUNCTION:
 ASN1_INTEGER_get_int64                  4923   EXIST::FUNCTION:
 ASN1_ENUMERATED_set_int64               4924   EXIST::FUNCTION:
-EVP_PBE_scrypt                          4925   EXIST::FUNCTION:
+EVP_PBE_scrypt                          4925   EXIST::FUNCTION:SCRYPT
 ASN1_INTEGER_set_int64                  4926   EXIST::FUNCTION:
 ASN1_ENUMERATED_get_int64               4927   EXIST::FUNCTION:
-PKCS5_v2_scrypt_keyivgen                4928   EXIST::FUNCTION:
+PKCS5_v2_scrypt_keyivgen                4928   EXIST::FUNCTION:SCRYPT
 ASN1_INTEGER_get_uint64                 4929   EXIST::FUNCTION:
 ASN1_INTEGER_set_uint64                 4930   EXIST::FUNCTION:
-PKCS5_pbe2_set_scrypt                   4931   EXIST::FUNCTION:
+PKCS5_pbe2_set_scrypt                   4931   EXIST::FUNCTION:SCRYPT
 PKCS8_set0_pbe                          4932   EXIST::FUNCTION:
 DH_bits                                 4933   EXIST::FUNCTION:DH
 RSA_bits                                4934   EXIST::FUNCTION:RSA
@@ -4588,3 +4588,30 @@ BIO_s_secmem                            4946     EXIST::FUNCTION:
 CRYPTO_get_secure_mem_ex_functions      4947   EXIST::FUNCTION:
 CRYPTO_set_secure_mem_functions         4948   EXIST::FUNCTION:
 X509_STORE_CTX_get_num_untrusted        4949   EXIST::FUNCTION:
+X509_up_ref                             4950   EXIST::FUNCTION:
+X509_REQ_get_version                    4951   EXIST::FUNCTION:
+X509_REQ_get_subject_name               4952   EXIST::FUNCTION:
+X509_CRL_up_ref                         4953   EXIST::FUNCTION:
+CRYPTO_zalloc                           4954   EXIST::FUNCTION:
+X509_get_extension_flags                4955   EXIST::FUNCTION:
+X509_get_extended_key_usage             4956   EXIST::FUNCTION:
+X509_get_key_usage                      4957   EXIST::FUNCTION:
+X509_CRL_get_issuer                     4958   EXIST::FUNCTION:
+X509_CRL_get_nextUpdate                 4959   EXIST::FUNCTION:
+X509_CRL_get0_signature                 4960   EXIST::FUNCTION:
+X509_CRL_get_REVOKED                    4961   EXIST::FUNCTION:
+X509_CRL_get_version                    4962   EXIST::FUNCTION:
+X509_CRL_get_lastUpdate                 4963   EXIST::FUNCTION:
+EVP_PBE_get                             4964   EXIST::FUNCTION:
+X509_get_version                        4965   EXIST::FUNCTION:
+X509_get_X509_PUBKEY                    4966   EXIST::FUNCTION:
+X509_get_notBefore                      4967   EXIST::FUNCTION:
+X509_get_notAfter                       4968   EXIST::FUNCTION:
+X509_get_signature_type                 4969   EXIST::FUNCTION:
+TS_VERIFY_CTX_set_data                  4970   EXIST::FUNCTION:
+TS_VERIFY_CTX_set_imprint               4971   EXIST::FUNCTION:
+TS_VERIFY_CTX_set_flags                 4972   EXIST::FUNCTION:
+TS_VERIFY_CTS_set_certs                 4973   EXIST::FUNCTION:
+TS_VERIFY_CTX_add_flags                 4974   EXIST::FUNCTION:
+TS_STATUS_INFO_set_status               4975   EXIST::FUNCTION:
+TS_VERIFY_CTX_set_store                 4976   EXIST::FUNCTION: