diff options
author | des <des@FreeBSD.org> | 2010-03-09 19:16:43 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2010-03-09 19:16:43 +0000 |
commit | c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9 (patch) | |
tree | 286162d33ef4c84bb329fd42641bbe0dd68cc42c /crypto/openssh/ssh_namespace.h | |
parent | 68f48e51f9a4d71d7fb9c332592215895a206ff6 (diff) | |
parent | 57baac6b030508c9bcd74f3b995bd6a4a4f79211 (diff) | |
download | FreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.zip FreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.tar.gz |
Upgrade to OpenSSH 5.4p1.
MFC after: 1 month
Diffstat (limited to 'crypto/openssh/ssh_namespace.h')
-rw-r--r-- | crypto/openssh/ssh_namespace.h | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h index 89978fc..caa14c8 100644 --- a/crypto/openssh/ssh_namespace.h +++ b/crypto/openssh/ssh_namespace.h @@ -20,6 +20,7 @@ #define add_host_to_hostfile ssh_add_host_to_hostfile #define add_recv_bytes ssh_add_recv_bytes #define addargs ssh_addargs +#define addr_match_cidr_list ssh_addr_match_cidr_list #define addr_match_list ssh_addr_match_list #define ask_permission ssh_ask_permission #define atomicio ssh_atomicio @@ -55,6 +56,7 @@ #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_ptr_ret ssh_buffer_get_string_ptr_ret #define buffer_get_string_ret ssh_buffer_get_string_ret #define buffer_init ssh_buffer_init #define buffer_len ssh_buffer_len @@ -90,6 +92,7 @@ #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 +#define channel_connect_stdio_fwd ssh_channel_connect_stdio_fwd #define channel_connect_to ssh_channel_connect_to #define channel_find_open ssh_channel_find_open #define channel_free ssh_channel_free @@ -117,7 +120,6 @@ #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 @@ -167,11 +169,8 @@ #define current_keys ssh_current_keys #define datafellows ssh_datafellows #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 @@ -195,7 +194,6 @@ #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 @@ -203,7 +201,6 @@ #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 @@ -241,14 +238,22 @@ #define kexdh_client ssh_kexdh_client #define kexgex_client ssh_kexgex_client #define kexgex_hash ssh_kexgex_hash +#define key_add_private ssh_key_add_private +#define key_cert_check_authority ssh_key_cert_check_authority +#define key_cert_copy ssh_key_cert_copy +#define key_certify ssh_key_certify #define key_demote ssh_key_demote +#define key_drop_cert ssh_key_drop_cert #define key_equal ssh_key_equal +#define key_equal_public ssh_key_equal_public #define key_fingerprint ssh_key_fingerprint #define key_fingerprint_raw ssh_key_fingerprint_raw #define key_free ssh_key_free #define key_from_blob ssh_key_from_blob #define key_from_private ssh_key_from_private #define key_generate ssh_key_generate +#define key_in_file ssh_key_in_file +#define key_is_cert ssh_key_is_cert #define key_load_private ssh_key_load_private #define key_load_private_pem ssh_key_load_private_pem #define key_load_private_type ssh_key_load_private_type @@ -264,8 +269,10 @@ #define key_size ssh_key_size #define key_ssh_name ssh_key_ssh_name #define key_to_blob ssh_key_to_blob +#define key_to_certified ssh_key_to_certified #define key_type ssh_key_type #define key_type_from_name ssh_key_type_from_name +#define key_type_plain ssh_key_type_plain #define key_verify ssh_key_verify #define key_write ssh_key_write #define log_facility_name ssh_log_facility_name @@ -274,7 +281,6 @@ #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 @@ -366,6 +372,12 @@ #define percent_expand ssh_percent_expand #define permanently_drop_suid ssh_permanently_drop_suid #define permanently_set_uid ssh_permanently_set_uid +#define pkcs11_add_provider ssh_pkcs11_add_provider +#define pkcs11_del_provider ssh_pkcs11_del_provider +#define pkcs11_init ssh_pkcs11_init +#define pkcs11_interactive ssh_pkcs11_interactive +#define pkcs11_providers ssh_pkcs11_providers +#define pkcs11_terminate ssh_pkcs11_terminate #define prime_test ssh_prime_test #define proto_spec ssh_proto_spec #define put_host_port ssh_put_host_port @@ -398,6 +410,7 @@ #define set_nonblock ssh_set_nonblock #define shadow_pw ssh_shadow_pw #define sigdie ssh_sigdie +#define sock_set_v6only ssh_sock_set_v6only #define ssh1_3des_iv ssh_ssh1_3des_iv #define start_progress_meter ssh_start_progress_meter #define stop_progress_meter ssh_stop_progress_meter @@ -421,7 +434,6 @@ #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 |