Upgrade to OpenSSH 5.2p1.

MFC after:	3 months

1 files changed, 32 insertions, 28 deletions

diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h
index 71e3c28..a51e132 100644
--- a/crypto/openssh/ssh_namespace.h
+++ b/crypto/openssh/ssh_namespace.h
@@ -19,6 +19,7 @@
 #define acss_setsubkey				ssh_acss_setsubkey
 #define add_host_to_hostfile			ssh_add_host_to_hostfile
 #define addargs					ssh_addargs
+#define addr_match_list				ssh_addr_match_list
 #define ask_permission				ssh_ask_permission
 #define atomicio				ssh_atomicio
 #define atomiciov				ssh_atomiciov
@@ -52,6 +53,7 @@
 #define buffer_get_short			ssh_buffer_get_short
 #define buffer_get_short_ret			ssh_buffer_get_short_ret
 #define buffer_get_string			ssh_buffer_get_string
+#define buffer_get_string_ptr			ssh_buffer_get_string_ptr
 #define buffer_get_string_ret			ssh_buffer_get_string_ret
 #define buffer_init				ssh_buffer_init
 #define buffer_len				ssh_buffer_len
@@ -71,6 +73,7 @@
 #define chan_is_dead				ssh_chan_is_dead
 #define chan_mark_dead				ssh_chan_mark_dead
 #define chan_obuf_empty				ssh_chan_obuf_empty
+#define chan_rcvd_eow				ssh_chan_rcvd_eow
 #define chan_rcvd_ieof				ssh_chan_rcvd_ieof
 #define chan_rcvd_oclose			ssh_chan_rcvd_oclose
 #define chan_read_failed			ssh_chan_read_failed
@@ -100,6 +103,7 @@
 #define channel_input_open_failure		ssh_channel_input_open_failure
 #define channel_input_port_forward_request	ssh_channel_input_port_forward_request
 #define channel_input_port_open			ssh_channel_input_port_open
+#define channel_input_status_confirm		ssh_channel_input_status_confirm
 #define channel_input_window_adjust		ssh_channel_input_window_adjust
 #define channel_lookup				ssh_channel_lookup
 #define channel_new				ssh_channel_new
@@ -108,9 +112,12 @@
 #define channel_output_poll			ssh_channel_output_poll
 #define channel_permit_all_opens		ssh_channel_permit_all_opens
 #define channel_prepare_select			ssh_channel_prepare_select
+#define channel_print_adm_permitted_opens	ssh_channel_print_adm_permitted_opens
 #define channel_register_cleanup		ssh_channel_register_cleanup
 #define channel_register_confirm		ssh_channel_register_confirm
 #define channel_register_filter			ssh_channel_register_filter
+#define channel_register_open_confirm		ssh_channel_register_open_confirm
+#define channel_register_status_confirm		ssh_channel_register_status_confirm
 #define channel_request_remote_forwarding	ssh_channel_request_remote_forwarding
 #define channel_request_rforward_cancel		ssh_channel_request_rforward_cancel
 #define channel_request_start			ssh_channel_request_start
@@ -135,6 +142,7 @@
 #define cipher_get_keyiv_len			ssh_cipher_get_keyiv_len
 #define cipher_get_number			ssh_cipher_get_number
 #define cipher_init				ssh_cipher_init
+#define cipher_is_cbc				ssh_cipher_is_cbc
 #define cipher_keylen				ssh_cipher_keylen
 #define cipher_mask_ssh1			ssh_cipher_mask_ssh1
 #define cipher_name				ssh_cipher_name
@@ -151,8 +159,11 @@
 #define compat_datafellows			ssh_compat_datafellows
 #define convtime				ssh_convtime
 #define debug					ssh_debug
+#define debug					ssh_debug
+#define debug2					ssh_debug2
 #define debug2					ssh_debug2
 #define debug3					ssh_debug3
+#define debug3					ssh_debug3
 #define decode_reply				ssh_decode_reply
 #define deny_input_open				ssh_deny_input_open
 #define derive_ssh1_session_id			ssh_derive_ssh1_session_id
@@ -175,6 +186,7 @@
 #define enable_compat13				ssh_enable_compat13
 #define enable_compat20				ssh_enable_compat20
 #define error					ssh_error
+#define error					ssh_error
 #define evp_acss				ssh_evp_acss
 #define evp_aes_128_ctr				ssh_evp_aes_128_ctr
 #define evp_rijndael				ssh_evp_rijndael
@@ -182,6 +194,8 @@
 #define evp_ssh1_bf				ssh_evp_ssh1_bf
 #define export_dns_rr				ssh_export_dns_rr
 #define fatal					ssh_fatal
+#define fatal					ssh_fatal
+#define fmt_scaled				ssh_fmt_scaled
 #define freeargs				ssh_freeargs
 #define freerrset				ssh_freerrset
 #define gen_candidates				ssh_gen_candidates
@@ -194,6 +208,7 @@
 #define get_remote_ipaddr			ssh_get_remote_ipaddr
 #define get_remote_name_or_ip			ssh_get_remote_name_or_ip
 #define get_remote_port				ssh_get_remote_port
+#define get_sock_port				ssh_get_sock_port
 #define get_u16					ssh_get_u16
 #define get_u32					ssh_get_u32
 #define get_u64					ssh_get_u64
@@ -240,13 +255,18 @@
 #define key_type_from_name			ssh_key_type_from_name
 #define key_verify				ssh_key_verify
 #define key_write				ssh_key_write
+#define log_facility_name			ssh_log_facility_name
 #define log_facility_number			ssh_log_facility_number
 #define log_init				ssh_log_init
+#define log_level_name				ssh_log_level_name
 #define log_level_number			ssh_log_level_number
 #define logit					ssh_logit
+#define logit					ssh_logit
 #define lookup_key_in_hostfile_by_type		ssh_lookup_key_in_hostfile_by_type
+#define mac_clear				ssh_mac_clear
 #define mac_compute				ssh_mac_compute
 #define mac_init				ssh_mac_init
+#define mac_setup				ssh_mac_setup
 #define mac_valid				ssh_mac_valid
 #define match_host_and_ip			ssh_match_host_and_ip
 #define match_hostname				ssh_match_hostname
@@ -256,6 +276,8 @@
 #define match_user				ssh_match_user
 #define mm_receive_fd				ssh_mm_receive_fd
 #define mm_send_fd				ssh_mm_send_fd
+#define ms_subtract_diff			ssh_ms_subtract_diff
+#define ms_to_timeval				ssh_ms_to_timeval
 #define mysignal				ssh_mysignal
 #define packet_add_padding			ssh_packet_add_padding
 #define packet_close				ssh_packet_close
@@ -277,6 +299,7 @@
 #define packet_get_ssh1_cipher			ssh_packet_get_ssh1_cipher
 #define packet_get_state			ssh_packet_get_state
 #define packet_get_string			ssh_packet_get_string
+#define packet_get_string_ptr			ssh_packet_get_string_ptr
 #define packet_have_data_to_write		ssh_packet_have_data_to_write
 #define packet_is_interactive			ssh_packet_is_interactive
 #define packet_need_rekeying			ssh_packet_need_rekeying
@@ -310,6 +333,7 @@
 #define packet_set_rekey_limit			ssh_packet_set_rekey_limit
 #define packet_set_server			ssh_packet_set_server
 #define packet_set_state			ssh_packet_set_state
+#define packet_set_timeout			ssh_packet_set_timeout
 #define packet_start				ssh_packet_start
 #define packet_start_compression		ssh_packet_start_compression
 #define packet_write_poll			ssh_packet_write_poll
@@ -336,6 +360,9 @@
 #define rsa_private_decrypt			ssh_rsa_private_decrypt
 #define rsa_public_encrypt			ssh_rsa_public_encrypt
 #define sanitise_stdfd				ssh_sanitise_stdfd
+#define scan_scaled				ssh_scan_scaled
+#define schnorr_sign				ssh_schnorr_sign
+#define schnorr_verify				ssh_schnorr_verify
 #define seed_rng				ssh_seed_rng
 #define set_newkeys				ssh_set_newkeys
 #define set_nodelay				ssh_set_nodelay
@@ -356,10 +383,15 @@
 #define tty_make_modes				ssh_tty_make_modes
 #define tty_parse_modes				ssh_tty_parse_modes
 #define tun_open				ssh_tun_open
+#define umac_delete				ssh_umac_delete
+#define umac_final				ssh_umac_final
+#define umac_new				ssh_umac_new
+#define umac_update				ssh_umac_update
 #define unset_nonblock				ssh_unset_nonblock
 #define uudecode				ssh_uudecode
 #define uuencode				ssh_uuencode
 #define verbose					ssh_verbose
+#define verbose					ssh_verbose
 #define verify_host_key_dns			ssh_verify_host_key_dns
 #define vis					ssh_vis
 #define x11_connect_display			ssh_x11_connect_display
@@ -374,31 +406,3 @@
 #define xmmap					ssh_xmmap
 #define xrealloc				ssh_xrealloc
 #define xstrdup					ssh_xstrdup
-#define fmt_scaled				ssh_fmt_scaled
-#define scan_scaled				ssh_scan_scaled
-#define addr_match_list				ssh_addr_match_list
-#define packet_get_string_ptr			ssh_packet_get_string_ptr
-#define packet_set_timeout			ssh_packet_set_timeout
-#define mac_clear				ssh_mac_clear
-#define mac_setup				ssh_mac_setup
-#define umac_delete				ssh_umac_delete
-#define umac_final				ssh_umac_final
-#define umac_new				ssh_umac_new
-#define umac_update				ssh_umac_update
-#define chan_rcvd_eow				ssh_chan_rcvd_eow
-#define channel_input_status_confirm		ssh_channel_input_status_confirm
-#define channel_print_adm_permitted_opens	ssh_channel_print_adm_permitted_opens
-#define channel_register_open_confirm		ssh_channel_register_open_confirm
-#define channel_register_status_confirm		ssh_channel_register_status_confirm
-#define buffer_get_string_ptr			ssh_buffer_get_string_ptr
-#define ms_subtract_diff			ssh_ms_subtract_diff
-#define ms_to_timeval				ssh_ms_to_timeval
-#define fatal					ssh_fatal
-#define debug					ssh_debug
-#define debug2					ssh_debug2
-#define debug3					ssh_debug3
-#define error					ssh_error
-#define log_facility_name			ssh_log_facility_name
-#define log_level_name				ssh_log_level_name
-#define logit					ssh_logit
-#define verbose					ssh_verbose