summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libssl/Makefile.bsd-wrapper114
1 files changed, 80 insertions, 34 deletions
diff --git a/lib/libssl/Makefile.bsd-wrapper b/lib/libssl/Makefile.bsd-wrapper
index 506be3e2caf..5f196146cba 100644
--- a/lib/libssl/Makefile.bsd-wrapper
+++ b/lib/libssl/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
# Build wrapper for OpenSSL
-# $OpenBSD: Makefile.bsd-wrapper,v 1.47 2002/05/15 03:26:49 deraadt Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.48 2002/05/16 12:50:32 deraadt Exp $
# Our lndir is hacked; specify a full path to avoid potential conflicts
# with the one installed with X11.
@@ -88,7 +88,23 @@ MANALL= BN_CTX_new.cat3 OPENSSL_VERSION_NUMBER.cat3 BN_CTX_start.cat3 \
SSL_new.cat3 SSL_pending.cat3 SSL_read.cat3 SSL_set_bio.cat3 \
SSL_set_connect_state.cat3 SSL_set_fd.cat3 SSL_set_session.cat3 \
SSL_set_shutdown.cat3 SSL_set_verify_result.cat3 SSL_shutdown.cat3 \
- SSL_write.cat3 d2i_SSL_SESSION.cat3 ssl.cat3
+ SSL_write.cat3 d2i_SSL_SESSION.cat3 SSL_want.cat3 \
+ SSL_state_string.cat3 SSL_session_reused.cat3 \
+ SSL_rstate_string.cat3 SSL_get_default_timeout.cat3 \
+ SSL_get_SSL_CTX.cat3 SSL_alert_type_string.cat3 \
+ SSL_COMP_add_compression_method.cat3 \
+ SSL_CTX_ctrl.cat3 \
+ SSL_CTX_set_cert_store.cat3 \
+ SSL_CTX_set_cert_verify_callback.cat3 \
+ SSL_CTX_set_client_cert_cb.cat3 \
+ SSL_CTX_set_generate_session_id.cat3 \
+ SSL_CTX_set_info_callback.cat3 \
+ SSL_CTX_set_max_cert_list.cat3 \
+ SSL_CTX_set_msg_callback.cat3 \
+ SSL_CTX_set_quiet_shutdown.cat3 \
+ SSL_CTX_set_tmp_dh_callback.cat3 \
+ SSL_CTX_set_tmp_rsa_callback.cat3 \
+ ssl.cat3
.if MANPS
PSALL= ${MANALL:S/.cat1/.ps1/g:S/.cat2/.ps2/g:S/.cat3/.ps3/g:S/.cat4/.ps4/g:S/.cat5/.ps5/g:S/.cat6/.ps6/g:S/.cat7/.ps7/g:S/.cat8/.ps8/g:S/.cat9/.ps9/g}
@@ -538,94 +554,118 @@ MLINKS+=BN_CTX_new.3 BN_CTX_init.3 BN_CTX_new.3 BN_CTX_free.3 \
CRYPTO_set_locking_callback.3 CRYPTO_add_lock.3 \
RIPEMD160.3 RIPEMD160_Init.3 RIPEMD160.3 RIPEMD160_Update.3 \
RIPEMD160.3 RIPEMD160_Final.3 \
+ SSL_CIPHER_get_name.3 SSL_CIPHER_description.3 \
SSL_CIPHER_get_name.3 SSL_CIPHER_get_bits.3 \
SSL_CIPHER_get_name.3 SSL_CIPHER_get_version.3 \
- SSL_CIPHER_get_name.3 SSL_CIPHER_description.3 \
- SSL_CTX_add_session.3 SSL_add_session.3 \
SSL_CTX_add_session.3 SSL_CTX_remove_session.3 \
+ SSL_CTX_add_session.3 SSL_add_session.3 \
SSL_CTX_add_session.3 SSL_remove_session.3 \
+ SSL_CTX_ctrl.3 SSL_CTX_callback_ctrl.3 \
+ SSL_CTX_ctrl.3 SSL_callback_ctrl.3 \
+ SSL_CTX_ctrl.3 SSL_ctrl.3 \
SSL_CTX_flush_sessions.3 SSL_flush_sessions.3 \
- SSL_CTX_get_ex_new_index.3 SSL_CTX_set_ex_data.3 \
SSL_CTX_get_ex_new_index.3 SSL_CTX_get_ex_data.3 \
- SSL_CTX_get_verify_mode.3 SSL_get_verify_mode.3 \
- SSL_CTX_get_verify_mode.3 SSL_CTX_get_verify_depth.3 \
- SSL_CTX_get_verify_mode.3 SSL_get_verify_depth.3 \
+ SSL_CTX_get_ex_new_index.3 SSL_CTX_set_ex_data.3 \
SSL_CTX_get_verify_mode.3 SSL_CTX_get_verify_callback.3 \
+ SSL_CTX_get_verify_mode.3 SSL_CTX_get_verify_depth.3 \
SSL_CTX_get_verify_mode.3 SSL_get_verify_callback.3 \
- SSL_CTX_sess_number.3 SSL_CTX_sess_connect.3 \
- SSL_CTX_sess_number.3 SSL_CTX_sess_connect_good.3 \
- SSL_CTX_sess_number.3 SSL_CTX_sess_connect_renegotiate.3 \
+ SSL_CTX_get_verify_mode.3 SSL_get_verify_depth.3 \
+ SSL_CTX_get_verify_mode.3 SSL_get_verify_mode.3 \
SSL_CTX_sess_number.3 SSL_CTX_sess_accept.3 \
SSL_CTX_sess_number.3 SSL_CTX_sess_accept_good.3 \
SSL_CTX_sess_number.3 SSL_CTX_sess_accept_renegotiate.3 \
- SSL_CTX_sess_number.3 SSL_CTX_sess_hits.3 \
+ SSL_CTX_sess_number.3 SSL_CTX_sess_cache_full.3 \
SSL_CTX_sess_number.3 SSL_CTX_sess_cb_hits.3 \
+ SSL_CTX_sess_number.3 SSL_CTX_sess_connect.3 \
+ SSL_CTX_sess_number.3 SSL_CTX_sess_connect_good.3 \
+ SSL_CTX_sess_number.3 SSL_CTX_sess_connect_renegotiate.3 \
+ SSL_CTX_sess_number.3 SSL_CTX_sess_hits.3 \
SSL_CTX_sess_number.3 SSL_CTX_sess_misses.3 \
SSL_CTX_sess_number.3 SSL_CTX_sess_timeouts.3 \
- SSL_CTX_sess_number.3 SSL_CTX_sess_cache_full.3 \
SSL_CTX_sess_set_cache_size.3 SSL_CTX_sess_get_cache_size.3 \
- SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_set_new_cb.3 \
- SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_set_remove.3 \
+ SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_get_get_cb.3 \
SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_get_new_cb.3 \
SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_get_remove_cb.3 \
- SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_get_get_cb.3 \
+ SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_set_new_cb.3 \
+ SSL_CTX_sess_set_get_cb.3 SSL_CTX_sess_set_remove.3 \
+ SSL_CTX_set_cert_store.3 SSL_CTX_get_cert_store.3 \
SSL_CTX_set_cipher_list.3 SSL_set_cipher_list.3 \
- SSL_CTX_set_client_CA_list.3 SSL_set_client_CA_list.3 \
SSL_CTX_set_client_CA_list.3 SSL_CTX_add_client_CA.3 \
SSL_CTX_set_client_CA_list.3 SSL_add_client_CA.3 \
+ SSL_CTX_set_client_CA_list.3 SSL_set_client_CA_list.3 \
SSL_CTX_set_default_passwd_cb.3 \
SSL_CTX_set_default_passwd_cb_userdata.3 \
- SSL_CTX_set_mode.3 SSL_set_mode.3 \
+ SSL_CTX_set_max_cert_list.3 SSL_CTX_get_max_cert_list.3 \
+ SSL_CTX_set_max_cert_list.3 SSL_get_max_cert_list.3 \
+ SSL_CTX_set_max_cert_list.3 SSL_set_max_cert_list.3 \
SSL_CTX_set_mode.3 SSL_CTX_get_mode.3 \
SSL_CTX_set_mode.3 SSL_get_mode.3 \
- SSL_CTX_set_options.3 SSL_set_options.3 \
+ SSL_CTX_set_mode.3 SSL_set_mode.3 \
+ SSL_CTX_set_msg_callback.3 SSL_CTX_set_msg_callback_arg.3 \
+ SSL_CTX_set_msg_callback.3 SSL_set_msg_callback.3 \
+ SSL_CTX_set_msg_callback.3 SSL_set_msg_callback_arg.3 \
SSL_CTX_set_options.3 SSL_CTX_get_options.3 \
SSL_CTX_set_options.3 SSL_get_options.3 \
+ SSL_CTX_set_options.3 SSL_set_options.3 \
+ SSL_CTX_set_quiet_shutdown.3 SSL_CTX_get_quiet_shutdown.3 \
+ SSL_CTX_set_quiet_shutdown.3 SSL_get_quiet_shutdown.3 \
+ SSL_CTX_set_quiet_shutdown.3 SSL_set_quiet_shutdown.3 \
SSL_CTX_set_session_cache_mode.3 SSL_CTX_get_session_cache_mode.3 \
SSL_CTX_set_session_id_context.3 SSL_set_session_id_context.3 \
- SSL_CTX_set_ssl_version.3 SSL_set_ssl_method.3 \
SSL_CTX_set_ssl_version.3 SSL_get_ssl_method.3 \
+ SSL_CTX_set_ssl_version.3 SSL_set_ssl_method.3 \
SSL_CTX_set_timeout.3 SSL_CTX_get_timeout.3 \
- SSL_CTX_set_verify.3 SSL_set_verify.3 \
+ SSL_CTX_set_tmp_dh_callback.3 SSL_CTX_set_tmp_dh.3 \
+ SSL_CTX_set_tmp_dh_callback.3 SSL_set_tmp_dh.3 \
+ SSL_CTX_set_tmp_dh_callback.3 SSL_set_tmp_dh_callback.3 \
+ SSL_CTX_set_tmp_rsa_callback.3 SSL_CTX_need_tmp_rsa.3 \
+ SSL_CTX_set_tmp_rsa_callback.3 SSL_CTX_set_tmp_rsa.3 \
+ SSL_CTX_set_tmp_rsa_callback.3 SSL_need_tmp_rsa.3 \
+ SSL_CTX_set_tmp_rsa_callback.3 SSL_set_tmp_rsa.3 \
+ SSL_CTX_set_tmp_rsa_callback.3 SSL_set_tmp_rsa_callback.3 \
SSL_CTX_set_verify.3 SSL_CTX_set_verify_depth.3 \
+ SSL_CTX_set_verify.3 SSL_set_verify.3 \
SSL_CTX_set_verify.3 SSL_set_verify_depth.3 \
- SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_ASN1.3 \
- SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_file.3 \
- SSL_CTX_use_certificate.3 SSL_use_certificate.3 \
- SSL_CTX_use_certificate.3 SSL_use_certificate_ASN1.3 \
- SSL_CTX_use_certificate.3 SSL_use_certificate_file.3 \
- SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_chain_file.3 \
+ SSL_CTX_use_certificate.3 SSL_CTX_check_private_key.3 \
SSL_CTX_use_certificate.3 SSL_CTX_use_PrivateKey.3 \
SSL_CTX_use_certificate.3 SSL_CTX_use_PrivateKey_ASN1.3 \
SSL_CTX_use_certificate.3 SSL_CTX_use_PrivateKey_file.3 \
SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey.3 \
SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey_ASN1.3 \
SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey_file.3 \
+ SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_ASN1.3 \
+ SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_chain_file.3 \
+ SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_file.3 \
+ SSL_CTX_use_certificate.3 SSL_check_private_key.3 \
SSL_CTX_use_certificate.3 SSL_use_PrivateKey.3 \
SSL_CTX_use_certificate.3 SSL_use_PrivateKey_ASN1.3 \
SSL_CTX_use_certificate.3 SSL_use_PrivateKey_file.3 \
SSL_CTX_use_certificate.3 SSL_use_RSAPrivateKey.3 \
SSL_CTX_use_certificate.3 SSL_use_RSAPrivateKey_ASN1.3 \
SSL_CTX_use_certificate.3 SSL_use_RSAPrivateKey_file.3 \
- SSL_CTX_use_certificate.3 SSL_CTX_check_private_key.3 \
- SSL_CTX_use_certificate.3 SSL_check_private_key.3 \
- SSL_SESSION_get_ex_new_index.3 SSL_SESSION_set_ex_data.3 \
+ SSL_CTX_use_certificate.3 SSL_use_certificate.3 \
+ SSL_CTX_use_certificate.3 SSL_use_certificate_ASN1.3 \
+ SSL_CTX_use_certificate.3 SSL_use_certificate_file.3 \
SSL_SESSION_get_ex_new_index.3 SSL_SESSION_get_ex_data.3 \
- SSL_SESSION_get_time.3 SSL_SESSION_set_time.3 \
+ SSL_SESSION_get_ex_new_index.3 SSL_SESSION_set_ex_data.3 \
SSL_SESSION_get_time.3 SSL_SESSION_get_timeout.3 \
+ SSL_SESSION_get_time.3 SSL_SESSION_set_time.3 \
SSL_SESSION_get_time.3 SSL_SESSION_set_timeout.3 \
SSL_SESSION_get_time.3 SSL_get_time.3 \
- SSL_SESSION_get_time.3 SSL_set_time.3 \
SSL_SESSION_get_time.3 SSL_get_timeout.3 \
+ SSL_SESSION_get_time.3 SSL_set_time.3 \
SSL_SESSION_get_time.3 SSL_set_timeout.3 \
+ SSL_alert_type_string.3 SSL_alert_desc_string.3 \
+ SSL_alert_type_string.3 SSL_alert_desc_string_long.3 \
+ SSL_alert_type_string.3 SSL_alert_type_string_long.3 \
SSL_get_ciphers.3 SSL_get_cipher_list.3 \
SSL_get_client_CA_list.3 SSL_CTX_get_client_CA_list.3 \
SSL_get_current_cipher.3 SSL_get_cipher.3 \
- SSL_get_current_cipher.3 SSL_get_cipher_name.3 \
SSL_get_current_cipher.3 SSL_get_cipher_bits.3 \
+ SSL_get_current_cipher.3 SSL_get_cipher_name.3 \
SSL_get_current_cipher.3 SSL_get_cipher_version.3 \
- SSL_get_ex_new_index.3 SSL_set_ex_data.3 \
SSL_get_ex_new_index.3 SSL_get_ex_data.3 \
+ SSL_get_ex_new_index.3 SSL_set_ex_data.3 \
SSL_get_fd.3 SSL_get_rfd.3 \
SSL_get_fd.3 SSL_get_wfd.3 \
SSL_get_rbio.3 SSL_get_wbio.3 \
@@ -633,10 +673,16 @@ MLINKS+=BN_CTX_new.3 BN_CTX_init.3 BN_CTX_new.3 BN_CTX_free.3 \
SSL_get_session.3 SSL_get1_session.3 \
SSL_library_init.3 OpenSSL_add_ssl_algorithms.3 \
SSL_library_init.3 SSLeay_add_ssl_algorithms.3 \
+ SSL_rstate_string.3 SSL_rstate_string_long.3 \
SSL_set_connect_state.3 SSL_set_accept_state.3 \
SSL_set_fd.3 SSL_set_rfd.3 \
SSL_set_fd.3 SSL_set_wfd.3 \
SSL_set_shutdown.3 SSL_get_shutdown.3 \
+ SSL_state_string.3 SSL_state_string_long.3 \
+ SSL_want.3 SSL_want_nothing.3 \
+ SSL_want.3 SSL_want_read.3 \
+ SSL_want.3 SSL_want_write.3 \
+ SSL_want.3 SSL_want_x509_lookup.3 \
d2i_SSL_SESSION.3 i2d_SSL_SESSION.3
.include <bsd.man.mk>