projects / oweals / openssl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: edd529a)
Sync ordinals with stable branch and update.
authorDr. Stephen Henson <steve@openssl.org>
Sun, 15 Jun 2008 15:36:02 +0000 (15:36 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 15 Jun 2008 15:36:02 +0000 (15:36 +0000)
util/libeay.num patch | blob | history
util/ssleay.num patch | blob | history

diff --git a/util/libeay.num b/util/libeay.num
index aa87fab9508c3af6257f9d101e889c88d74dd31c..22aa14113ffecd69575c5bc3cf4ca581f2b8cc93 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -802,7 +802,7 @@ DES_set_odd_parity                      809 EXIST::FUNCTION:DES
 DES_string_to_2keys                     810    EXIST::FUNCTION:DES
 DES_string_to_key                       811    EXIST::FUNCTION:DES
 DES_xcbc_encrypt                        812    EXIST::FUNCTION:DES
-DES_xwhite_in2out                       813    EXIST::FUNCTION:DES
+DES_xwhite_in2out                       813    NOEXIST::FUNCTION:
 fcrypt_body                             814    NOEXIST::FUNCTION:
 i2a_ASN1_INTEGER                        815    EXIST::FUNCTION:BIO
 i2a_ASN1_OBJECT                         816    EXIST::FUNCTION:BIO
@@ -2089,7 +2089,7 @@ OCSP_BASICRESP_get_ext_by_crit          2646      EXIST:VMS:FUNCTION:
 OCSP_cert_status_str                    2647   EXIST::FUNCTION:
 d2i_OCSP_REQUEST                        2648   EXIST::FUNCTION:
 UI_dup_info_string                      2649   EXIST::FUNCTION:
-_ossl_old_des_xwhite_in2out             2650   EXIST::FUNCTION:DES
+_ossl_old_des_xwhite_in2out             2650   NOEXIST::FUNCTION:
 PKCS12_it                               2651   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS12_it                               2651   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_SINGLERESP_get_ext_by_critical     2652   EXIST:!VMS:FUNCTION:
@@ -3529,46 +3529,174 @@ i2d_X509_EXTENSIONS                     3922   EXIST::FUNCTION:
 OCSP_sendreq_nbio                       3923   EXIST::FUNCTION:
 OCSP_sendreq_new                        3924   EXIST::FUNCTION:
 d2i_X509_EXTENSIONS                     3925   EXIST::FUNCTION:
-FIPS_dsa_sig_decode                     3926   EXIST:OPENSSL_FIPS:FUNCTION:DSA
-EVP_CIPHER_CTX_clear_flags              3927   EXIST::FUNCTION:
-FIPS_rand_status                        3928   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rand_set_key                       3929   EXIST:OPENSSL_FIPS:FUNCTION:
-CRYPTO_set_mem_info_functions           3930   EXIST::FUNCTION:
-RSA_X931_generate_key_ex                3931   EXIST::FUNCTION:RSA
-int_ERR_set_state_func                  3932   EXIST:OPENSSL_FIPS:FUNCTION:
-int_EVP_MD_set_engine_callbacks         3933   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-int_CRYPTO_set_do_dynlock_callback      3934   EXIST::FUNCTION:
-FIPS_rng_stick                          3935   EXIST:OPENSSL_FIPS:FUNCTION:
-EVP_CIPHER_CTX_set_flags                3936   EXIST::FUNCTION:
-BN_X931_generate_prime_ex               3937   EXIST::FUNCTION:
-FIPS_selftest_check                     3938   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rand_set_dt                        3939   EXIST:OPENSSL_FIPS:FUNCTION:
-CRYPTO_dbg_pop_info                     3940   EXIST::FUNCTION:
-FIPS_dsa_free                           3941   EXIST:OPENSSL_FIPS:FUNCTION:DSA
-RSA_X931_derive_ex                      3942   EXIST::FUNCTION:RSA
-FIPS_rsa_new                            3943   EXIST:OPENSSL_FIPS:FUNCTION:RSA
-FIPS_rand_bytes                         3944   EXIST:OPENSSL_FIPS:FUNCTION:
-fips_cipher_test                        3945   EXIST:OPENSSL_FIPS:FUNCTION:
-EVP_CIPHER_CTX_test_flags               3946   EXIST::FUNCTION:
-CRYPTO_malloc_debug_init                3947   EXIST::FUNCTION:
-CRYPTO_dbg_push_info                    3948   EXIST::FUNCTION:
-FIPS_corrupt_rsa_keygen                 3949   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_dh_new                             3950   EXIST:OPENSSL_FIPS:FUNCTION:DH
-FIPS_corrupt_dsa_keygen                 3951   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_dh_free                            3952   EXIST:OPENSSL_FIPS:FUNCTION:DH
-fips_pkey_signature_test                3953   EXIST:OPENSSL_FIPS:FUNCTION:
-EVP_add_alg_module                      3954   EXIST::FUNCTION:
-int_RAND_init_engine_callbacks          3955   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-int_EVP_CIPHER_set_engine_callbacks     3956   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-int_EVP_MD_init_engine_callbacks        3957   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-FIPS_rand_test_mode                     3958   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rand_reset                         3959   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_dsa_new                            3960   EXIST:OPENSSL_FIPS:FUNCTION:DSA
-int_RAND_set_callbacks                  3961   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-BN_X931_derive_prime_ex                 3962   EXIST::FUNCTION:
-int_ERR_lib_init                        3963   EXIST:OPENSSL_FIPS:FUNCTION:
-int_EVP_CIPHER_init_engine_callbacks    3964   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-FIPS_rsa_free                           3965   EXIST:OPENSSL_FIPS:FUNCTION:RSA
-FIPS_dsa_sig_encode                     3966   EXIST:OPENSSL_FIPS:FUNCTION:DSA
-CRYPTO_dbg_remove_all_info              3967   EXIST::FUNCTION:
-OPENSSL_init                            3968   EXIST::FUNCTION:
+X509_ALGORS_it                          3926   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+X509_ALGORS_it                          3926   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_ALGOR_get0                         3927   EXIST::FUNCTION:
+X509_ALGOR_set0                         3928   EXIST::FUNCTION:
+AES_unwrap_key                          3929   EXIST::FUNCTION:AES
+AES_wrap_key                            3930   EXIST::FUNCTION:AES
+X509at_get0_data_by_OBJ                 3931   EXIST::FUNCTION:
+ASN1_TYPE_set1                          3932   EXIST::FUNCTION:
+ASN1_STRING_set0                        3933   EXIST::FUNCTION:
+i2d_X509_ALGORS                         3934   EXIST::FUNCTION:
+BIO_f_zlib                              3935   EXIST:ZLIB:FUNCTION:
+COMP_zlib_cleanup                       3936   EXIST::FUNCTION:
+d2i_X509_ALGORS                         3937   EXIST::FUNCTION:
+CMS_ReceiptRequest_free                 3938   EXIST::FUNCTION:CMS
+PEM_write_CMS                           3939   EXIST:!WIN16:FUNCTION:CMS
+CMS_add0_CertificateChoices             3940   EXIST::FUNCTION:CMS
+CMS_unsigned_add1_attr_by_OBJ           3941   EXIST::FUNCTION:CMS
+ERR_load_CMS_strings                    3942   EXIST::FUNCTION:CMS
+CMS_sign_receipt                        3943   EXIST::FUNCTION:CMS
+i2d_CMS_ContentInfo                     3944   EXIST::FUNCTION:CMS
+CMS_signed_delete_attr                  3945   EXIST::FUNCTION:CMS
+d2i_CMS_bio                             3946   EXIST::FUNCTION:CMS
+CMS_unsigned_get_attr_by_NID            3947   EXIST::FUNCTION:CMS
+CMS_verify                              3948   EXIST::FUNCTION:CMS
+SMIME_read_CMS                          3949   EXIST::FUNCTION:CMS
+CMS_decrypt_set1_key                    3950   EXIST::FUNCTION:CMS
+CMS_SignerInfo_get0_algs                3951   EXIST::FUNCTION:CMS
+CMS_add1_cert                           3952   EXIST::FUNCTION:CMS
+CMS_set_detached                        3953   EXIST::FUNCTION:CMS
+CMS_encrypt                             3954   EXIST::FUNCTION:CMS
+CMS_EnvelopedData_create                3955   EXIST::FUNCTION:CMS
+CMS_uncompress                          3956   EXIST::FUNCTION:CMS
+CMS_add0_crl                            3957   EXIST::FUNCTION:CMS
+CMS_SignerInfo_verify_content           3958   EXIST::FUNCTION:CMS
+CMS_unsigned_get0_data_by_OBJ           3959   EXIST::FUNCTION:CMS
+PEM_write_bio_CMS                       3960   EXIST::FUNCTION:CMS
+CMS_unsigned_get_attr                   3961   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_ktri_cert_cmp         3962   EXIST::FUNCTION:CMS
+CMS_RecipInfo_ktri_get0_algs            3963   NOEXIST::FUNCTION:
+CMS_RecipientInfo_ktri_get0_algs        3963   EXIST::FUNCTION:CMS
+CMS_ContentInfo_free                    3964   EXIST::FUNCTION:CMS
+CMS_final                               3965   EXIST::FUNCTION:CMS
+CMS_add_simple_smimecap                 3966   EXIST::FUNCTION:CMS
+CMS_SignerInfo_verify                   3967   EXIST::FUNCTION:CMS
+CMS_data                                3968   EXIST::FUNCTION:CMS
+CMS_ContentInfo_it                      3969   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMS
+CMS_ContentInfo_it                      3969   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMS
+d2i_CMS_ReceiptRequest                  3970   EXIST::FUNCTION:CMS
+CMS_compress                            3971   EXIST::FUNCTION:CMS
+CMS_digest_create                       3972   EXIST::FUNCTION:CMS
+CMS_SignerInfo_cert_cmp                 3973   EXIST::FUNCTION:CMS
+CMS_SignerInfo_sign                     3974   EXIST::FUNCTION:CMS
+CMS_data_create                         3975   EXIST::FUNCTION:CMS
+i2d_CMS_bio                             3976   EXIST::FUNCTION:CMS
+CMS_EncryptedData_set1_key              3977   EXIST::FUNCTION:CMS
+CMS_decrypt                             3978   EXIST::FUNCTION:CMS
+int_smime_write_ASN1                    3979   EXIST::FUNCTION:
+CMS_unsigned_delete_attr                3980   EXIST::FUNCTION:CMS
+CMS_unsigned_get_attr_count             3981   EXIST::FUNCTION:CMS
+CMS_add_smimecap                        3982   EXIST::FUNCTION:CMS
+PEM_read_CMS                            3983   EXIST:!WIN16:FUNCTION:CMS
+CMS_signed_get_attr_by_OBJ              3984   EXIST::FUNCTION:CMS
+d2i_CMS_ContentInfo                     3985   EXIST::FUNCTION:CMS
+CMS_add_standard_smimecap               3986   EXIST::FUNCTION:CMS
+CMS_ContentInfo_new                     3987   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_type                  3988   EXIST::FUNCTION:CMS
+CMS_get0_type                           3989   EXIST::FUNCTION:CMS
+CMS_is_detached                         3990   EXIST::FUNCTION:CMS
+CMS_sign                                3991   EXIST::FUNCTION:CMS
+CMS_signed_add1_attr                    3992   EXIST::FUNCTION:CMS
+CMS_unsigned_get_attr_by_OBJ            3993   EXIST::FUNCTION:CMS
+SMIME_write_CMS                         3994   EXIST::FUNCTION:CMS
+CMS_EncryptedData_decrypt               3995   EXIST::FUNCTION:CMS
+CMS_get0_RecipientInfos                 3996   EXIST::FUNCTION:CMS
+CMS_add0_RevocationInfoChoice           3997   EXIST::FUNCTION:CMS
+CMS_decrypt_set1_pkey                   3998   EXIST::FUNCTION:CMS
+CMS_SignerInfo_set1_signer_cert         3999   EXIST::FUNCTION:CMS
+CMS_get0_signers                        4000   EXIST::FUNCTION:CMS
+CMS_ReceiptRequest_get0_values          4001   EXIST::FUNCTION:CMS
+CMS_signed_get0_data_by_OBJ             4002   EXIST::FUNCTION:CMS
+CMS_get0_SignerInfos                    4003   EXIST::FUNCTION:CMS
+CMS_add0_cert                           4004   EXIST::FUNCTION:CMS
+CMS_EncryptedData_encrypt               4005   EXIST::FUNCTION:CMS
+CMS_digest_verify                       4006   EXIST::FUNCTION:CMS
+CMS_set1_signers_certs                  4007   EXIST::FUNCTION:CMS
+CMS_signed_get_attr                     4008   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_set0_key              4009   EXIST::FUNCTION:CMS
+CMS_SignedData_init                     4010   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_kekri_get0_id         4011   EXIST::FUNCTION:CMS
+CMS_verify_receipt                      4012   EXIST::FUNCTION:CMS
+CMS_ReceiptRequest_it                   4013   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMS
+CMS_ReceiptRequest_it                   4013   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMS
+PEM_read_bio_CMS                        4014   EXIST::FUNCTION:CMS
+CMS_get1_crls                           4015   EXIST::FUNCTION:CMS
+CMS_add0_recipient_key                  4016   EXIST::FUNCTION:CMS
+SMIME_read_ASN1                         4017   EXIST::FUNCTION:
+CMS_ReceiptRequest_new                  4018   EXIST::FUNCTION:CMS
+CMS_get0_content                        4019   EXIST::FUNCTION:CMS
+CMS_get1_ReceiptRequest                 4020   EXIST::FUNCTION:CMS
+CMS_signed_add1_attr_by_OBJ             4021   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_kekri_id_cmp          4022   EXIST::FUNCTION:CMS
+CMS_add1_ReceiptRequest                 4023   EXIST::FUNCTION:CMS
+CMS_SignerInfo_get0_signer_id           4024   EXIST::FUNCTION:CMS
+CMS_unsigned_add1_attr_by_NID           4025   EXIST::FUNCTION:CMS
+CMS_unsigned_add1_attr                  4026   EXIST::FUNCTION:CMS
+CMS_signed_get_attr_by_NID              4027   EXIST::FUNCTION:CMS
+CMS_get1_certs                          4028   EXIST::FUNCTION:CMS
+CMS_signed_add1_attr_by_NID             4029   EXIST::FUNCTION:CMS
+CMS_unsigned_add1_attr_by_txt           4030   EXIST::FUNCTION:CMS
+CMS_dataFinal                           4031   EXIST::FUNCTION:CMS
+CMS_RecipInfo_ktri_get0_sigr_id         4032   NOEXIST::FUNCTION:
+CMS_RecipientInfo_ktri_get0_signer_id   4032   EXIST::FUNCTION:CMS
+i2d_CMS_ReceiptRequest                  4033   EXIST::FUNCTION:CMS
+CMS_add1_recipient_cert                 4034   EXIST::FUNCTION:CMS
+CMS_dataInit                            4035   EXIST::FUNCTION:CMS
+CMS_signed_add1_attr_by_txt             4036   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_decrypt               4037   EXIST::FUNCTION:CMS
+CMS_signed_get_attr_count               4038   EXIST::FUNCTION:CMS
+CMS_get0_eContentType                   4039   EXIST::FUNCTION:CMS
+CMS_set1_eContentType                   4040   EXIST::FUNCTION:CMS
+CMS_ReceiptRequest_create0              4041   EXIST::FUNCTION:CMS
+CMS_add1_signer                         4042   EXIST::FUNCTION:CMS
+CMS_RecipientInfo_set0_pkey             4043   EXIST::FUNCTION:CMS
+ENGINE_set_load_ssl_client_cert_function 4044  EXIST::FUNCTION:ENGINE
+ENGINE_get_ssl_client_cert_function     4045   EXIST::FUNCTION:ENGINE
+ENGINE_load_ssl_client_cert             4046   EXIST::FUNCTION:ENGINE
+ENGINE_load_capi                        4047   EXIST::FUNCTION:CAPIENG,ENGINE
+OPENSSL_isservice                       4048   NOEXIST::FUNCTION:
+FIPS_dsa_sig_decode                     4049   EXIST:OPENSSL_FIPS:FUNCTION:DSA
+EVP_CIPHER_CTX_clear_flags              4050   EXIST::FUNCTION:
+FIPS_rand_status                        4051   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rand_set_key                       4052   EXIST:OPENSSL_FIPS:FUNCTION:
+CRYPTO_set_mem_info_functions           4053   EXIST::FUNCTION:
+RSA_X931_generate_key_ex                4054   EXIST::FUNCTION:RSA
+int_ERR_set_state_func                  4055   EXIST:OPENSSL_FIPS:FUNCTION:
+int_EVP_MD_set_engine_callbacks         4056   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+int_CRYPTO_set_do_dynlock_callback      4057   EXIST::FUNCTION:
+FIPS_rng_stick                          4058   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_CIPHER_CTX_set_flags                4059   EXIST::FUNCTION:
+BN_X931_generate_prime_ex               4060   EXIST::FUNCTION:
+FIPS_selftest_check                     4061   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rand_set_dt                        4062   EXIST:OPENSSL_FIPS:FUNCTION:
+CRYPTO_dbg_pop_info                     4063   EXIST::FUNCTION:
+FIPS_dsa_free                           4064   EXIST:OPENSSL_FIPS:FUNCTION:DSA
+RSA_X931_derive_ex                      4065   EXIST::FUNCTION:RSA
+FIPS_rsa_new                            4066   EXIST:OPENSSL_FIPS:FUNCTION:RSA
+FIPS_rand_bytes                         4067   EXIST:OPENSSL_FIPS:FUNCTION:
+fips_cipher_test                        4068   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_CIPHER_CTX_test_flags               4069   EXIST::FUNCTION:
+CRYPTO_malloc_debug_init                4070   EXIST::FUNCTION:
+CRYPTO_dbg_push_info                    4071   EXIST::FUNCTION:
+FIPS_corrupt_rsa_keygen                 4072   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_dh_new                             4073   EXIST:OPENSSL_FIPS:FUNCTION:DH
+FIPS_corrupt_dsa_keygen                 4074   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_dh_free                            4075   EXIST:OPENSSL_FIPS:FUNCTION:DH
+fips_pkey_signature_test                4076   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_add_alg_module                      4077   EXIST::FUNCTION:
+int_RAND_init_engine_callbacks          4078   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+int_EVP_CIPHER_set_engine_callbacks     4079   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+int_EVP_MD_init_engine_callbacks        4080   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+FIPS_rand_test_mode                     4081   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rand_reset                         4082   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_dsa_new                            4083   EXIST:OPENSSL_FIPS:FUNCTION:DSA
+int_RAND_set_callbacks                  4084   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+BN_X931_derive_prime_ex                 4085   EXIST::FUNCTION:
+int_ERR_lib_init                        4086   EXIST:OPENSSL_FIPS:FUNCTION:
+int_EVP_CIPHER_init_engine_callbacks    4087   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+FIPS_rsa_free                           4088   EXIST:OPENSSL_FIPS:FUNCTION:RSA
+FIPS_dsa_sig_encode                     4089   EXIST:OPENSSL_FIPS:FUNCTION:DSA
+CRYPTO_dbg_remove_all_info              4090   EXIST::FUNCTION:
+OPENSSL_init                            4091   EXIST::FUNCTION:
diff --git a/util/ssleay.num b/util/ssleay.num
index b3ac136a5657cf0e4d56249d434c5f6ec78e8546..2055cc15975e6ec808154b4fdc38455cdfdc7dcc 100755 (executable)
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -241,3 +241,4 @@ SSL_CTX_sess_get_remove_cb              289 EXIST::FUNCTION:
 SSL_set_SSL_CTX                         290    EXIST::FUNCTION:
 SSL_get_servername                      291    EXIST::FUNCTION:TLSEXT
 SSL_get_servername_type                 292    EXIST::FUNCTION:TLSEXT
+SSL_CTX_set_client_cert_engine          293    EXIST::FUNCTION:ENGINE
Unnamed repository; edit this file 'description' to name the repository.