Upgrade to OpenSSH 5.1p1.

I have worked hard to reduce diffs against the vendor branch.  One
notable change in that respect is that we no longer prefer DSA over
RSA - the reasons for doing so went away years ago.  This may cause
some surprises, as ssh will warn about unknown host keys even for
hosts whose keys haven't changed.

MFC after:	6 weeks

1 files changed, 28 insertions, 0 deletions

diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h
index 94041b1..71e3c28 100644
--- a/crypto/openssh/ssh_namespace.h
+++ b/crypto/openssh/ssh_namespace.h
@@ -374,3 +374,31 @@
 #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