Cleanup.

2 files changed, 26 insertions, 27 deletions

diff --git a/crypto/openssh/log.h b/crypto/openssh/log.h
index 963f929..16da99c 100644
--- a/crypto/openssh/log.h
+++ b/crypto/openssh/log.h
@@ -52,14 +52,6 @@ void     log_init(char *, LogLevel, SyslogFacility, int);
 SyslogFacility	log_facility_number(char *);
 LogLevel log_level_number(char *);
 
-#define fatal	ssh_fatal
-#define error	ssh_error
-#define logit	ssh_logit
-#define verbose	ssh_verbose
-#define debug	ssh_debug
-#define debug2	ssh_debug2
-#define debug3	ssh_debug3
-
 void     fatal(const char *, ...) __dead __attribute__((format(printf, 1, 2)));
 void     error(const char *, ...) __attribute__((format(printf, 1, 2)));
 void     sigdie(const char *, ...) __attribute__((format(printf, 1, 2)));
diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h
index f189228..94041b1 100644
--- a/crypto/openssh/ssh_namespace.h
+++ b/crypto/openssh/ssh_namespace.h
@@ -22,7 +22,7 @@
 #define ask_permission				ssh_ask_permission
 #define atomicio				ssh_atomicio
 #define atomiciov				ssh_atomiciov
-#define auth_request_forwarding	       		ssh_auth_request_forwarding
+#define auth_request_forwarding			ssh_auth_request_forwarding
 #define buffer_append				ssh_buffer_append
 #define buffer_append_space			ssh_buffer_append_space
 #define buffer_check_alloc			ssh_buffer_check_alloc
@@ -72,17 +72,17 @@
 #define chan_mark_dead				ssh_chan_mark_dead
 #define chan_obuf_empty				ssh_chan_obuf_empty
 #define chan_rcvd_ieof				ssh_chan_rcvd_ieof
-#define chan_rcvd_oclose	       		ssh_chan_rcvd_oclose
-#define chan_read_failed	       		ssh_chan_read_failed
-#define chan_write_failed	       		ssh_chan_write_failed
+#define chan_rcvd_oclose			ssh_chan_rcvd_oclose
+#define chan_read_failed			ssh_chan_read_failed
+#define chan_write_failed			ssh_chan_write_failed
 #define channel_add_adm_permitted_opens		ssh_channel_add_adm_permitted_opens
-#define channel_add_permitted_opens    		ssh_channel_add_permitted_opens
-#define channel_after_select	       		ssh_channel_after_select
+#define channel_add_permitted_opens		ssh_channel_add_permitted_opens
+#define channel_after_select			ssh_channel_after_select
 #define channel_by_id				ssh_channel_by_id
-#define channel_cancel_cleanup	       		ssh_channel_cancel_cleanup
-#define channel_cancel_rport_listener  		ssh_channel_cancel_rport_listener
+#define channel_cancel_cleanup			ssh_channel_cancel_cleanup
+#define channel_cancel_rport_listener		ssh_channel_cancel_rport_listener
 #define channel_clear_adm_permitted_opens	ssh_channel_clear_adm_permitted_opens
-#define channel_clear_permitted_opens  		ssh_channel_clear_permitted_opens
+#define channel_clear_permitted_opens		ssh_channel_clear_permitted_opens
 #define channel_close_all			ssh_channel_close_all
 #define channel_close_fd			ssh_channel_close_fd
 #define channel_connect_by_listen_address	ssh_channel_connect_by_listen_address
@@ -131,17 +131,17 @@
 #define cipher_cleanup				ssh_cipher_cleanup
 #define cipher_crypt				ssh_cipher_crypt
 #define cipher_get_keycontext			ssh_cipher_get_keycontext
-#define cipher_get_keyiv	       		ssh_cipher_get_keyiv
-#define cipher_get_keyiv_len	       		ssh_cipher_get_keyiv_len
-#define cipher_get_number	       		ssh_cipher_get_number
+#define cipher_get_keyiv			ssh_cipher_get_keyiv
+#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_keylen				ssh_cipher_keylen
-#define cipher_mask_ssh1	       		ssh_cipher_mask_ssh1
+#define cipher_mask_ssh1			ssh_cipher_mask_ssh1
 #define cipher_name				ssh_cipher_name
 #define cipher_number				ssh_cipher_number
-#define cipher_set_key_string	       		ssh_cipher_set_key_string
-#define cipher_set_keycontext	       		ssh_cipher_set_keycontext
-#define cipher_set_keyiv	       		ssh_cipher_set_keyiv
+#define cipher_set_key_string			ssh_cipher_set_key_string
+#define cipher_set_keycontext			ssh_cipher_set_keycontext
+#define cipher_set_keyiv			ssh_cipher_set_keyiv
 #define ciphers_valid				ssh_ciphers_valid
 #define cleanhostname				ssh_cleanhostname
 #define cleanup_exit				ssh_cleanup_exit
@@ -150,6 +150,9 @@
 #define compat_cipher_proposal			ssh_compat_cipher_proposal
 #define compat_datafellows			ssh_compat_datafellows
 #define convtime				ssh_convtime
+#define debug					ssh_debug
+#define debug2					ssh_debug2
+#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
@@ -171,12 +174,14 @@
 #define dump_base64				ssh_dump_base64
 #define enable_compat13				ssh_enable_compat13
 #define enable_compat20				ssh_enable_compat20
+#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
 #define evp_ssh1_3des				ssh_evp_ssh1_3des
 #define evp_ssh1_bf				ssh_evp_ssh1_bf
 #define export_dns_rr				ssh_export_dns_rr
+#define fatal					ssh_fatal
 #define freeargs				ssh_freeargs
 #define freerrset				ssh_freerrset
 #define gen_candidates				ssh_gen_candidates
@@ -238,6 +243,7 @@
 #define log_facility_number			ssh_log_facility_number
 #define log_init				ssh_log_init
 #define log_level_number			ssh_log_level_number
+#define logit					ssh_logit
 #define lookup_key_in_hostfile_by_type		ssh_lookup_key_in_hostfile_by_type
 #define mac_compute				ssh_mac_compute
 #define mac_init				ssh_mac_init
@@ -323,9 +329,9 @@
 #define refresh_progress_meter			ssh_refresh_progress_meter
 #define replacearg				ssh_replacearg
 #define restore_uid				ssh_restore_uid
-#define rijndael_decrypt	       		ssh_rijndael_decrypt
-#define rijndael_encrypt	       		ssh_rijndael_encrypt
-#define rijndael_set_key	       		ssh_rijndael_set_key
+#define rijndael_decrypt			ssh_rijndael_decrypt
+#define rijndael_encrypt			ssh_rijndael_encrypt
+#define rijndael_set_key			ssh_rijndael_set_key
 #define rsa_generate_additional_parameters	ssh_rsa_generate_additional_parameters
 #define rsa_private_decrypt			ssh_rsa_private_decrypt
 #define rsa_public_encrypt			ssh_rsa_public_encrypt
@@ -353,6 +359,7 @@
 #define unset_nonblock				ssh_unset_nonblock
 #define uudecode				ssh_uudecode
 #define uuencode				ssh_uuencode
+#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