OpenSSL 0.9.4 merge

1 files changed, 61 insertions, 0 deletions

diff --git a/src/lib/libcrypto/util/ssleay.num b/src/lib/libcrypto/util/ssleay.num
index 359fa15df1..8121738bd6 100644
--- a/src/lib/libcrypto/util/ssleay.num
+++ b/src/lib/libcrypto/util/ssleay.num
@@ -154,3 +154,64 @@ TLSv1_server_method			171
 TLSv1_client_method                     172
 BIO_new_buffer_ssl_connect              173
 BIO_new_ssl_connect                     174
+SSL_get_ex_data_X509_STORE_CTX_idx      175
+SSL_CTX_set_tmp_dh_callback             176
+SSL_CTX_set_tmp_rsa_callback            177
+SSL_CTX_set_timeout                     178
+SSL_CTX_get_timeout                     179
+SSL_CTX_get_cert_store                  180
+SSL_CTX_set_cert_store                  181
+SSL_want                                182
+SSL_library_init                        183
+SSL_COMP_add_compression_method         184
+SSL_add_file_cert_subjects_to_stack     185
+SSL_set_tmp_rsa_callback                186
+SSL_set_tmp_dh_callback                 187
+SSL_add_dir_cert_subjects_to_stack      188
+SSL_set_session_id_context              189
+sk_SSL_CIPHER_new                       190
+sk_SSL_CIPHER_new_null                  191
+sk_SSL_CIPHER_free                      192
+sk_SSL_CIPHER_num                       193
+sk_SSL_CIPHER_value                     194
+sk_SSL_CIPHER_set                       195
+sk_SSL_CIPHER_zero                      196
+sk_SSL_CIPHER_push                      197
+sk_SSL_CIPHER_pop                       198
+sk_SSL_CIPHER_find                      199
+sk_SSL_CIPHER_delete                    200
+sk_SSL_CIPHER_delete_ptr                201
+sk_SSL_CIPHER_set_cmp_func              202
+sk_SSL_CIPHER_dup                       203
+sk_SSL_CIPHER_pop_free                  204
+sk_SSL_CIPHER_shift                     205
+sk_SSL_COMP_new                         206
+sk_SSL_COMP_new_null                    207
+sk_SSL_COMP_free                        208
+sk_SSL_COMP_num                         209
+sk_SSL_COMP_value                       210
+sk_SSL_COMP_set                         211
+sk_SSL_COMP_zero                        212
+sk_SSL_COMP_push                        213
+sk_SSL_COMP_pop                         214
+sk_SSL_COMP_find                        215
+sk_SSL_COMP_delete                      216
+sk_SSL_COMP_delete_ptr                  217
+sk_SSL_COMP_set_cmp_func                218
+sk_SSL_COMP_dup                         219
+sk_SSL_COMP_pop_free                    220
+sk_SSL_COMP_shift                       221
+SSL_CTX_use_certificate_chain_file      222
+sk_SSL_COMP_insert                      223
+sk_SSL_CIPHER_insert                    224
+SSL_CTX_set_verify_depth                225
+SSL_set_verify_depth                    226
+sk_SSL_CIPHER_unshift                   227
+SSL_CTX_get_verify_depth                228
+SSL_get_verify_depth                    229
+sk_SSL_COMP_unshift                     230
+SSL_CTX_set_session_id_context          231
+SSL_CTX_set_cert_verify_callback        232
+sk_SSL_COMP_sort                        233
+sk_SSL_CIPHER_sort                      234
+SSL_CTX_set_default_passwd_cb_userdata  235