[Midnightbsd-cvs] src [9237] trunk/crypto/openssh/ssh_namespace.h: update namespace

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Nov 11 06:40:38 EST 2016


Revision: 9237
          http://svnweb.midnightbsd.org/src/?rev=9237
Author:   laffer1
Date:     2016-11-11 06:40:38 -0500 (Fri, 11 Nov 2016)
Log Message:
-----------
update namespace

Modified Paths:
--------------
    trunk/crypto/openssh/ssh_namespace.h

Modified: trunk/crypto/openssh/ssh_namespace.h
===================================================================
--- trunk/crypto/openssh/ssh_namespace.h	2016-11-11 11:40:26 UTC (rev 9236)
+++ trunk/crypto/openssh/ssh_namespace.h	2016-11-11 11:40:38 UTC (rev 9237)
@@ -23,15 +23,6 @@
 #define Blowfish_stream2word			Fssh_Blowfish_stream2word
 #define _ssh__compat_glob			Fssh__ssh__compat_glob
 #define _ssh__compat_globfree			Fssh__ssh__compat_globfree
-#define _ssh_compat_realpath			Fssh__ssh_compat_realpath
-#define _ssh_exchange_banner			Fssh__ssh_exchange_banner
-#define _ssh_host_key_sign			Fssh__ssh_host_key_sign
-#define _ssh_host_private_key			Fssh__ssh_host_private_key
-#define _ssh_host_public_key			Fssh__ssh_host_public_key
-#define _ssh_order_hostkeyalgs			Fssh__ssh_order_hostkeyalgs
-#define _ssh_read_banner			Fssh__ssh_read_banner
-#define _ssh_send_banner			Fssh__ssh_send_banner
-#define _ssh_verify_host_key			Fssh__ssh_verify_host_key
 #define a2port					Fssh_a2port
 #define a2tun					Fssh_a2tun
 #define add_host_to_hostfile			Fssh_add_host_to_hostfile
@@ -54,16 +45,6 @@
 #define bcrypt_hash				Fssh_bcrypt_hash
 #define bcrypt_pbkdf				Fssh_bcrypt_pbkdf
 #define bf_ssh1_cipher				Fssh_bf_ssh1_cipher
-#define bitmap_clear_bit			Fssh_bitmap_clear_bit
-#define bitmap_free				Fssh_bitmap_free
-#define bitmap_from_string			Fssh_bitmap_from_string
-#define bitmap_nbits				Fssh_bitmap_nbits
-#define bitmap_nbytes				Fssh_bitmap_nbytes
-#define bitmap_new				Fssh_bitmap_new
-#define bitmap_set_bit				Fssh_bitmap_set_bit
-#define bitmap_test_bit				Fssh_bitmap_test_bit
-#define bitmap_to_string			Fssh_bitmap_to_string
-#define bitmap_zero				Fssh_bitmap_zero
 #define blf_cbc_decrypt				Fssh_blf_cbc_decrypt
 #define blf_cbc_encrypt				Fssh_blf_cbc_encrypt
 #define blf_dec					Fssh_blf_dec
@@ -113,8 +94,6 @@
 #define buffer_put_int64			Fssh_buffer_put_int64
 #define buffer_put_short			Fssh_buffer_put_short
 #define buffer_put_string			Fssh_buffer_put_string
-#define cert_free				Fssh_cert_free
-#define cert_new				Fssh_cert_new
 #define chacha_encrypt_bytes			Fssh_chacha_encrypt_bytes
 #define chacha_ivsetup				Fssh_chacha_ivsetup
 #define chacha_keysetup				Fssh_chacha_keysetup
@@ -249,7 +228,6 @@
 #define ciphers_valid				Fssh_ciphers_valid
 #define cleanhostname				Fssh_cleanhostname
 #define cleanup_exit				Fssh_cleanup_exit
-#define clear_cached_addr			Fssh_clear_cached_addr
 #define colon					Fssh_colon
 #define compare					Fssh_compare
 #define compare_gps				Fssh_compare_gps
@@ -335,22 +313,17 @@
 #define export_dns_rr				Fssh_export_dns_rr
 #define fatal					Fssh_fatal
 #define filter_proposal				Fssh_filter_proposal
-#define fingerprint_b64				Fssh_fingerprint_b64
-#define fingerprint_hex				Fssh_fingerprint_hex
+#define fmprintf				Fssh_fmprintf
 #define fmt_scaled				Fssh_fmt_scaled
 #define free_hostkeys				Fssh_free_hostkeys
 #define freeargs				Fssh_freeargs
 #define freerrset				Fssh_freerrset
 #define gen_candidates				Fssh_gen_candidates
-#define get_canonical_hostname			Fssh_get_canonical_hostname
 #define get_local_ipaddr			Fssh_get_local_ipaddr
 #define get_local_name				Fssh_get_local_name
 #define get_local_port				Fssh_get_local_port
 #define get_peer_ipaddr				Fssh_get_peer_ipaddr
 #define get_peer_port				Fssh_get_peer_port
-#define get_remote_ipaddr			Fssh_get_remote_ipaddr
-#define get_remote_name_or_ip			Fssh_get_remote_name_or_ip
-#define get_remote_port				Fssh_get_remote_port
 #define get_sock_port				Fssh_get_sock_port
 #define get_socket_address			Fssh_get_socket_address
 #define get_u16					Fssh_get_u16
@@ -417,7 +390,6 @@
 #define kexgex_hash				Fssh_kexgex_hash
 #define kexgex_server				Fssh_kexgex_server
 #define key_add_private				Fssh_key_add_private
-#define key_alg_list				Fssh_key_alg_list
 #define key_cert_check_authority		Fssh_key_cert_check_authority
 #define key_cert_copy				Fssh_key_cert_copy
 #define key_certify				Fssh_key_certify
@@ -472,11 +444,10 @@
 #define match_pattern_list			Fssh_match_pattern_list
 #define match_user				Fssh_match_user
 #define mktemp_proto				Fssh_mktemp_proto
-#define mm_choose_dh				Fssh_mm_choose_dh
 #define mm_receive_fd				Fssh_mm_receive_fd
 #define mm_send_fd				Fssh_mm_send_fd
-#define mm_sshkey_sign				Fssh_mm_sshkey_sign
 #define monotime				Fssh_monotime
+#define mprintf					Fssh_mprintf
 #define ms_subtract_diff			Fssh_ms_subtract_diff
 #define ms_to_timeval				Fssh_ms_to_timeval
 #define mult					Fssh_mult
@@ -516,12 +487,12 @@
 #define pkcs11_rsa_private_encrypt		Fssh_pkcs11_rsa_private_encrypt
 #define pkcs11_terminate			Fssh_pkcs11_terminate
 #define plain_key_blob				Fssh_plain_key_blob
+#define platform_disable_tracing		Fssh_platform_disable_tracing
 #define platform_pledge_agent			Fssh_platform_pledge_agent
 #define platform_pledge_mux			Fssh_platform_pledge_mux
 #define platform_pledge_sftp_server		Fssh_platform_pledge_sftp_server
 #define pledge					Fssh_pledge
 #define poly1305_auth				Fssh_poly1305_auth
-#define poly64					Fssh_poly64
 #define poly_hash				Fssh_poly_hash
 #define port_open_helper			Fssh_port_open_helper
 #define prime_test				Fssh_prime_test
@@ -537,7 +508,6 @@
 #define read_keyfile_line			Fssh_read_keyfile_line
 #define read_mux				Fssh_read_mux
 #define read_passphrase				Fssh_read_passphrase
-#define reallocarray				Fssh_reallocarray
 #define record_hostkey				Fssh_record_hostkey
 #define reduce_add_sub				Fssh_reduce_add_sub
 #define refresh_progress_meter			Fssh_refresh_progress_meter
@@ -562,6 +532,7 @@
 #define sieve_large				Fssh_sieve_large
 #define sig_winch				Fssh_sig_winch
 #define sigdie					Fssh_sigdie
+#define snmprintf				Fssh_snmprintf
 #define sock_set_v6only				Fssh_sock_set_v6only
 #define square					Fssh_square
 #define ssh1_3des_cbc				Fssh_ssh1_3des_cbc
@@ -569,7 +540,6 @@
 #define ssh1_3des_init				Fssh_ssh1_3des_init
 #define ssh1_3des_iv				Fssh_ssh1_3des_iv
 #define ssh_OpenSSL_add_all_algorithms		Fssh_ssh_OpenSSL_add_all_algorithms
-#define ssh_add_hostkey				Fssh_ssh_add_hostkey
 #define ssh_add_identity_constrained		Fssh_ssh_add_identity_constrained
 #define ssh_agent_sign				Fssh_ssh_agent_sign
 #define ssh_alloc_session_state			Fssh_ssh_alloc_session_state
@@ -600,12 +570,9 @@
 #define ssh_ecdsa_verify			Fssh_ssh_ecdsa_verify
 #define ssh_ed25519_sign			Fssh_ssh_ed25519_sign
 #define ssh_ed25519_verify			Fssh_ssh_ed25519_verify
-#define ssh_err					Fssh_ssh_err
 #define ssh_fetch_identitylist			Fssh_ssh_fetch_identitylist
-#define ssh_free				Fssh_ssh_free
 #define ssh_free_identitylist			Fssh_ssh_free_identitylist
 #define ssh_gai_strerror			Fssh_ssh_gai_strerror
-#define ssh_get_app_data			Fssh_ssh_get_app_data
 #define ssh_get_authentication_socket		Fssh_ssh_get_authentication_socket
 #define ssh_get_progname			Fssh_ssh_get_progname
 #define ssh_hmac_bytes				Fssh_ssh_hmac_bytes
@@ -615,9 +582,6 @@
 #define ssh_hmac_start				Fssh_ssh_hmac_start
 #define ssh_hmac_update				Fssh_ssh_hmac_update
 #define ssh_hmac_update_buffer			Fssh_ssh_hmac_update_buffer
-#define ssh_init				Fssh_ssh_init
-#define ssh_input_append			Fssh_ssh_input_append
-#define ssh_input_space				Fssh_ssh_input_space
 #define ssh_krl_check_key			Fssh_ssh_krl_check_key
 #define ssh_krl_file_contains_key		Fssh_ssh_krl_file_contains_key
 #define ssh_krl_free				Fssh_ssh_krl_free
@@ -636,9 +600,6 @@
 #define ssh_malloc_init				Fssh_ssh_malloc_init
 #define ssh_msg_recv				Fssh_ssh_msg_recv
 #define ssh_msg_send				Fssh_ssh_msg_send
-#define ssh_output_consume			Fssh_ssh_output_consume
-#define ssh_output_ptr				Fssh_ssh_output_ptr
-#define ssh_output_space			Fssh_ssh_output_space
 #define ssh_packet_close			Fssh_ssh_packet_close
 #define ssh_packet_connection_af		Fssh_ssh_packet_connection_af
 #define ssh_packet_connection_is_on_socket	Fssh_ssh_packet_connection_is_on_socket
@@ -667,11 +628,8 @@
 #define ssh_packet_is_interactive		Fssh_ssh_packet_is_interactive
 #define ssh_packet_is_rekeying			Fssh_ssh_packet_is_rekeying
 #define ssh_packet_need_rekeying		Fssh_ssh_packet_need_rekeying
-#define ssh_packet_next				Fssh_ssh_packet_next
 #define ssh_packet_not_very_much_data_to_write	Fssh_ssh_packet_not_very_much_data_to_write
-#define ssh_packet_payload			Fssh_ssh_packet_payload
 #define ssh_packet_process_incoming		Fssh_ssh_packet_process_incoming
-#define ssh_packet_put				Fssh_ssh_packet_put
 #define ssh_packet_put_bignum			Fssh_ssh_packet_put_bignum
 #define ssh_packet_put_bignum2			Fssh_ssh_packet_put_bignum2
 #define ssh_packet_put_char			Fssh_ssh_packet_put_char
@@ -721,100 +679,10 @@
 #define ssh_request_reply			Fssh_ssh_request_reply
 #define ssh_rsa_sign				Fssh_ssh_rsa_sign
 #define ssh_rsa_verify				Fssh_ssh_rsa_verify
-#define ssh_set_app_data			Fssh_ssh_set_app_data
 #define ssh_set_newkeys				Fssh_ssh_set_newkeys
-#define ssh_set_verify_host_key_callback	Fssh_ssh_set_verify_host_key_callback
 #define ssh_update_card				Fssh_ssh_update_card
-#define sshbuf_alloc				Fssh_sshbuf_alloc
-#define sshbuf_avail				Fssh_sshbuf_avail
-#define sshbuf_b64tod				Fssh_sshbuf_b64tod
-#define sshbuf_check_reserve			Fssh_sshbuf_check_reserve
-#define sshbuf_consume				Fssh_sshbuf_consume
-#define sshbuf_consume_end			Fssh_sshbuf_consume_end
-#define sshbuf_dtob16				Fssh_sshbuf_dtob16
-#define sshbuf_dtob64				Fssh_sshbuf_dtob64
-#define sshbuf_dump				Fssh_sshbuf_dump
-#define sshbuf_dump_data			Fssh_sshbuf_dump_data
-#define sshbuf_free				Fssh_sshbuf_free
-#define sshbuf_from				Fssh_sshbuf_from
-#define sshbuf_fromb				Fssh_sshbuf_fromb
-#define sshbuf_froms				Fssh_sshbuf_froms
-#define sshbuf_get				Fssh_sshbuf_get
-#define sshbuf_get_bignum1			Fssh_sshbuf_get_bignum1
-#define sshbuf_get_bignum2			Fssh_sshbuf_get_bignum2
-#define sshbuf_get_bignum2_bytes_direct		Fssh_sshbuf_get_bignum2_bytes_direct
-#define sshbuf_get_cstring			Fssh_sshbuf_get_cstring
-#define sshbuf_get_ec				Fssh_sshbuf_get_ec
-#define sshbuf_get_eckey			Fssh_sshbuf_get_eckey
-#define sshbuf_get_string			Fssh_sshbuf_get_string
-#define sshbuf_get_string_direct		Fssh_sshbuf_get_string_direct
-#define sshbuf_get_stringb			Fssh_sshbuf_get_stringb
-#define sshbuf_get_u16				Fssh_sshbuf_get_u16
-#define sshbuf_get_u32				Fssh_sshbuf_get_u32
-#define sshbuf_get_u64				Fssh_sshbuf_get_u64
-#define sshbuf_get_u8				Fssh_sshbuf_get_u8
-#define sshbuf_init				Fssh_sshbuf_init
-#define sshbuf_len				Fssh_sshbuf_len
-#define sshbuf_max_size				Fssh_sshbuf_max_size
-#define sshbuf_mutable_ptr			Fssh_sshbuf_mutable_ptr
-#define sshbuf_new				Fssh_sshbuf_new
-#define sshbuf_parent				Fssh_sshbuf_parent
-#define sshbuf_peek_string_direct		Fssh_sshbuf_peek_string_direct
-#define sshbuf_ptr				Fssh_sshbuf_ptr
-#define sshbuf_put				Fssh_sshbuf_put
-#define sshbuf_put_bignum1			Fssh_sshbuf_put_bignum1
-#define sshbuf_put_bignum2			Fssh_sshbuf_put_bignum2
-#define sshbuf_put_bignum2_bytes		Fssh_sshbuf_put_bignum2_bytes
-#define sshbuf_put_cstring			Fssh_sshbuf_put_cstring
-#define sshbuf_put_ec				Fssh_sshbuf_put_ec
-#define sshbuf_put_eckey			Fssh_sshbuf_put_eckey
-#define sshbuf_put_string			Fssh_sshbuf_put_string
-#define sshbuf_put_stringb			Fssh_sshbuf_put_stringb
-#define sshbuf_put_u16				Fssh_sshbuf_put_u16
-#define sshbuf_put_u32				Fssh_sshbuf_put_u32
-#define sshbuf_put_u64				Fssh_sshbuf_put_u64
-#define sshbuf_put_u8				Fssh_sshbuf_put_u8
-#define sshbuf_putb				Fssh_sshbuf_putb
-#define sshbuf_putf				Fssh_sshbuf_putf
-#define sshbuf_putfv				Fssh_sshbuf_putfv
-#define sshbuf_refcount				Fssh_sshbuf_refcount
-#define sshbuf_reserve				Fssh_sshbuf_reserve
-#define sshbuf_reset				Fssh_sshbuf_reset
-#define sshbuf_set_max_size			Fssh_sshbuf_set_max_size
-#define sshbuf_set_parent			Fssh_sshbuf_set_parent
-#define sshkey_add_private			Fssh_sshkey_add_private
-#define sshkey_cert_check_authority		Fssh_sshkey_cert_check_authority
-#define sshkey_cert_copy			Fssh_sshkey_cert_copy
-#define sshkey_cert_type			Fssh_sshkey_cert_type
-#define sshkey_certify				Fssh_sshkey_certify
 #define sshkey_check_revoked			Fssh_sshkey_check_revoked
-#define sshkey_curve_name_to_nid		Fssh_sshkey_curve_name_to_nid
-#define sshkey_curve_nid_to_bits		Fssh_sshkey_curve_nid_to_bits
-#define sshkey_curve_nid_to_name		Fssh_sshkey_curve_nid_to_name
-#define sshkey_demote				Fssh_sshkey_demote
-#define sshkey_drop_cert			Fssh_sshkey_drop_cert
-#define sshkey_dump_ec_key			Fssh_sshkey_dump_ec_key
-#define sshkey_dump_ec_point			Fssh_sshkey_dump_ec_point
-#define sshkey_ec_nid_to_hash_alg		Fssh_sshkey_ec_nid_to_hash_alg
-#define sshkey_ec_validate_private		Fssh_sshkey_ec_validate_private
-#define sshkey_ec_validate_public		Fssh_sshkey_ec_validate_public
-#define sshkey_ecdsa_bits_to_nid		Fssh_sshkey_ecdsa_bits_to_nid
-#define sshkey_ecdsa_key_to_nid			Fssh_sshkey_ecdsa_key_to_nid
-#define sshkey_ecdsa_nid_from_name		Fssh_sshkey_ecdsa_nid_from_name
-#define sshkey_equal				Fssh_sshkey_equal
-#define sshkey_equal_public			Fssh_sshkey_equal_public
-#define sshkey_fingerprint			Fssh_sshkey_fingerprint
-#define sshkey_fingerprint_raw			Fssh_sshkey_fingerprint_raw
-#define sshkey_format_cert_validity		Fssh_sshkey_format_cert_validity
-#define sshkey_free				Fssh_sshkey_free
-#define sshkey_from_blob			Fssh_sshkey_from_blob
-#define sshkey_from_blob_internal		Fssh_sshkey_from_blob_internal
-#define sshkey_from_private			Fssh_sshkey_from_private
-#define sshkey_fromb				Fssh_sshkey_fromb
-#define sshkey_froms				Fssh_sshkey_froms
-#define sshkey_generate				Fssh_sshkey_generate
 #define sshkey_in_file				Fssh_sshkey_in_file
-#define sshkey_is_cert				Fssh_sshkey_is_cert
 #define sshkey_load_cert			Fssh_sshkey_load_cert
 #define sshkey_load_file			Fssh_sshkey_load_file
 #define sshkey_load_private			Fssh_sshkey_load_private
@@ -822,39 +690,9 @@
 #define sshkey_load_private_type		Fssh_sshkey_load_private_type
 #define sshkey_load_private_type_fd		Fssh_sshkey_load_private_type_fd
 #define sshkey_load_public			Fssh_sshkey_load_public
-#define sshkey_names_valid2			Fssh_sshkey_names_valid2
-#define sshkey_new				Fssh_sshkey_new
-#define sshkey_new_private			Fssh_sshkey_new_private
-#define sshkey_parse_private2			Fssh_sshkey_parse_private2
-#define sshkey_parse_private_fileblob		Fssh_sshkey_parse_private_fileblob
-#define sshkey_parse_private_fileblob_type	Fssh_sshkey_parse_private_fileblob_type
-#define sshkey_parse_private_pem_fileblob	Fssh_sshkey_parse_private_pem_fileblob
-#define sshkey_parse_public_rsa1_fileblob	Fssh_sshkey_parse_public_rsa1_fileblob
 #define sshkey_perm_ok				Fssh_sshkey_perm_ok
-#define sshkey_plain_to_blob			Fssh_sshkey_plain_to_blob
-#define sshkey_private_deserialize		Fssh_sshkey_private_deserialize
-#define sshkey_private_serialize		Fssh_sshkey_private_serialize
-#define sshkey_private_to_blob2			Fssh_sshkey_private_to_blob2
-#define sshkey_private_to_fileblob		Fssh_sshkey_private_to_fileblob
-#define sshkey_putb				Fssh_sshkey_putb
-#define sshkey_putb_plain			Fssh_sshkey_putb_plain
-#define sshkey_puts				Fssh_sshkey_puts
-#define sshkey_read				Fssh_sshkey_read
 #define sshkey_save_private			Fssh_sshkey_save_private
-#define sshkey_sign				Fssh_sshkey_sign
-#define sshkey_size				Fssh_sshkey_size
-#define sshkey_ssh_name				Fssh_sshkey_ssh_name
-#define sshkey_ssh_name_plain			Fssh_sshkey_ssh_name_plain
-#define sshkey_to_base64			Fssh_sshkey_to_base64
-#define sshkey_to_blob				Fssh_sshkey_to_blob
-#define sshkey_to_certified			Fssh_sshkey_to_certified
 #define sshkey_try_load_public			Fssh_sshkey_try_load_public
-#define sshkey_type				Fssh_sshkey_type
-#define sshkey_type_from_name			Fssh_sshkey_type_from_name
-#define sshkey_type_is_cert			Fssh_sshkey_type_is_cert
-#define sshkey_type_plain			Fssh_sshkey_type_plain
-#define sshkey_verify				Fssh_sshkey_verify
-#define sshkey_write				Fssh_sshkey_write
 #define sshpkt_add_padding			Fssh_sshpkt_add_padding
 #define sshpkt_disconnect			Fssh_sshpkt_disconnect
 #define sshpkt_fatal				Fssh_sshpkt_fatal
@@ -893,8 +731,6 @@
 #define temporarily_use_uid			Fssh_temporarily_use_uid
 #define tilde_expand_filename			Fssh_tilde_expand_filename
 #define timingsafe_bcmp				Fssh_timingsafe_bcmp
-#define to_blob					Fssh_to_blob
-#define to_blob_buf				Fssh_to_blob_buf
 #define tohex					Fssh_tohex
 #define tty_make_modes				Fssh_tty_make_modes
 #define tty_parse_modes				Fssh_tty_parse_modes
@@ -913,8 +749,10 @@
 #define update_progress_meter			Fssh_update_progress_meter
 #define uudecode				Fssh_uudecode
 #define uuencode				Fssh_uuencode
+#define vasnmprintf				Fssh_vasnmprintf
 #define verbose					Fssh_verbose
 #define verify_host_key_dns			Fssh_verify_host_key_dns
+#define vfmprintf				Fssh_vfmprintf
 #define vis					Fssh_vis
 #define write_host_entry			Fssh_write_host_entry
 #define x11_connect_display			Fssh_x11_connect_display



More information about the Midnightbsd-cvs mailing list