Deleted Added
full compact
ssh_namespace.h (158519) ssh_namespace.h (162856)
1/*
2 * Namespace munging inspired by an equivalent hack in NetBSD's tree: add
3 * the "ssh_" prefix to every symbol in libssh which doesn't already have
4 * it. This prevents collisions between symbols in libssh and symbols in
5 * other libraries or applications which link with libssh, either directly
6 * or indirectly (e.g. through PAM loading pam_ssh).
7 *
8 * A list of symbols which need munging is obtained as follows:
9 *
1/*
2 * Namespace munging inspired by an equivalent hack in NetBSD's tree: add
3 * the "ssh_" prefix to every symbol in libssh which doesn't already have
4 * it. This prevents collisions between symbols in libssh and symbols in
5 * other libraries or applications which link with libssh, either directly
6 * or indirectly (e.g. through PAM loading pam_ssh).
7 *
8 * A list of symbols which need munging is obtained as follows:
9 *
10 * nm libssh.a | awk '$2 == "T" && $3 !~ /^ssh_/ { print $3 }'
10 * nm libssh.a | awk '$2 == "T" && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
11 *
11 *
12 * $FreeBSD: head/crypto/openssh/ssh_namespace.h 158519 2006-05-13 13:47:45Z des $
12 * $FreeBSD: head/crypto/openssh/ssh_namespace.h 162856 2006-09-30 13:38:06Z des $
13 */
14
15#define a2port ssh_a2port
16#define a2tun ssh_a2tun
17#define acss ssh_acss
18#define acss_setkey ssh_acss_setkey
19#define acss_setsubkey ssh_acss_setsubkey
20#define add_host_to_hostfile ssh_add_host_to_hostfile
21#define addargs ssh_addargs
22#define ask_permission ssh_ask_permission
23#define atomicio ssh_atomicio
13 */
14
15#define a2port ssh_a2port
16#define a2tun ssh_a2tun
17#define acss ssh_acss
18#define acss_setkey ssh_acss_setkey
19#define acss_setsubkey ssh_acss_setsubkey
20#define add_host_to_hostfile ssh_add_host_to_hostfile
21#define addargs ssh_addargs
22#define ask_permission ssh_ask_permission
23#define atomicio ssh_atomicio
24#define atomiciov ssh_atomiciov
24#define auth_request_forwarding ssh_auth_request_forwarding
25#define buffer_append ssh_buffer_append
26#define buffer_append_space ssh_buffer_append_space
25#define auth_request_forwarding ssh_auth_request_forwarding
26#define buffer_append ssh_buffer_append
27#define buffer_append_space ssh_buffer_append_space
28#define buffer_check_alloc ssh_buffer_check_alloc
27#define buffer_clear ssh_buffer_clear
28#define buffer_compress ssh_buffer_compress
29#define buffer_compress_init_recv ssh_buffer_compress_init_recv
30#define buffer_compress_init_send ssh_buffer_compress_init_send
31#define buffer_compress_uninit ssh_buffer_compress_uninit
32#define buffer_consume ssh_buffer_consume
33#define buffer_consume_end ssh_buffer_consume_end
34#define buffer_consume_end_ret ssh_buffer_consume_end_ret

--- 33 unchanged lines hidden (view full) ---

68#define chan_ibuf_empty ssh_chan_ibuf_empty
69#define chan_is_dead ssh_chan_is_dead
70#define chan_mark_dead ssh_chan_mark_dead
71#define chan_obuf_empty ssh_chan_obuf_empty
72#define chan_rcvd_ieof ssh_chan_rcvd_ieof
73#define chan_rcvd_oclose ssh_chan_rcvd_oclose
74#define chan_read_failed ssh_chan_read_failed
75#define chan_write_failed ssh_chan_write_failed
29#define buffer_clear ssh_buffer_clear
30#define buffer_compress ssh_buffer_compress
31#define buffer_compress_init_recv ssh_buffer_compress_init_recv
32#define buffer_compress_init_send ssh_buffer_compress_init_send
33#define buffer_compress_uninit ssh_buffer_compress_uninit
34#define buffer_consume ssh_buffer_consume
35#define buffer_consume_end ssh_buffer_consume_end
36#define buffer_consume_end_ret ssh_buffer_consume_end_ret

--- 33 unchanged lines hidden (view full) ---

70#define chan_ibuf_empty ssh_chan_ibuf_empty
71#define chan_is_dead ssh_chan_is_dead
72#define chan_mark_dead ssh_chan_mark_dead
73#define chan_obuf_empty ssh_chan_obuf_empty
74#define chan_rcvd_ieof ssh_chan_rcvd_ieof
75#define chan_rcvd_oclose ssh_chan_rcvd_oclose
76#define chan_read_failed ssh_chan_read_failed
77#define chan_write_failed ssh_chan_write_failed
78#define channel_add_adm_permitted_opens ssh_channel_add_adm_permitted_opens
76#define channel_add_permitted_opens ssh_channel_add_permitted_opens
77#define channel_after_select ssh_channel_after_select
78#define channel_by_id ssh_channel_by_id
79#define channel_cancel_cleanup ssh_channel_cancel_cleanup
80#define channel_cancel_rport_listener ssh_channel_cancel_rport_listener
79#define channel_add_permitted_opens ssh_channel_add_permitted_opens
80#define channel_after_select ssh_channel_after_select
81#define channel_by_id ssh_channel_by_id
82#define channel_cancel_cleanup ssh_channel_cancel_cleanup
83#define channel_cancel_rport_listener ssh_channel_cancel_rport_listener
84#define channel_clear_adm_permitted_opens ssh_channel_clear_adm_permitted_opens
81#define channel_clear_permitted_opens ssh_channel_clear_permitted_opens
82#define channel_close_all ssh_channel_close_all
83#define channel_close_fd ssh_channel_close_fd
84#define channel_connect_by_listen_address ssh_channel_connect_by_listen_address
85#define channel_connect_to ssh_channel_connect_to
86#define channel_find_open ssh_channel_find_open
87#define channel_free ssh_channel_free
88#define channel_free_all ssh_channel_free_all

--- 91 unchanged lines hidden (view full) ---

180#define get_local_ipaddr ssh_get_local_ipaddr
181#define get_local_name ssh_get_local_name
182#define get_local_port ssh_get_local_port
183#define get_peer_ipaddr ssh_get_peer_ipaddr
184#define get_peer_port ssh_get_peer_port
185#define get_remote_ipaddr ssh_get_remote_ipaddr
186#define get_remote_name_or_ip ssh_get_remote_name_or_ip
187#define get_remote_port ssh_get_remote_port
85#define channel_clear_permitted_opens ssh_channel_clear_permitted_opens
86#define channel_close_all ssh_channel_close_all
87#define channel_close_fd ssh_channel_close_fd
88#define channel_connect_by_listen_address ssh_channel_connect_by_listen_address
89#define channel_connect_to ssh_channel_connect_to
90#define channel_find_open ssh_channel_find_open
91#define channel_free ssh_channel_free
92#define channel_free_all ssh_channel_free_all

--- 91 unchanged lines hidden (view full) ---

184#define get_local_ipaddr ssh_get_local_ipaddr
185#define get_local_name ssh_get_local_name
186#define get_local_port ssh_get_local_port
187#define get_peer_ipaddr ssh_get_peer_ipaddr
188#define get_peer_port ssh_get_peer_port
189#define get_remote_ipaddr ssh_get_remote_ipaddr
190#define get_remote_name_or_ip ssh_get_remote_name_or_ip
191#define get_remote_port ssh_get_remote_port
192#define get_u16 ssh_get_u16
193#define get_u32 ssh_get_u32
194#define get_u64 ssh_get_u64
188#define getrrsetbyname ssh_getrrsetbyname
189#define host_hash ssh_host_hash
190#define hostfile_read_key ssh_hostfile_read_key
191#define hpdelim ssh_hpdelim
192#define init_rng ssh_init_rng
193#define ipv64_normalise_mapped ssh_ipv64_normalise_mapped
194#define kex_derive_keys ssh_kex_derive_keys
195#define kex_dh_hash ssh_kex_dh_hash

--- 16 unchanged lines hidden (view full) ---

212#define key_load_private ssh_key_load_private
213#define key_load_private_pem ssh_key_load_private_pem
214#define key_load_private_type ssh_key_load_private_type
215#define key_load_public ssh_key_load_public
216#define key_load_public_type ssh_key_load_public_type
217#define key_names_valid2 ssh_key_names_valid2
218#define key_new ssh_key_new
219#define key_new_private ssh_key_new_private
195#define getrrsetbyname ssh_getrrsetbyname
196#define host_hash ssh_host_hash
197#define hostfile_read_key ssh_hostfile_read_key
198#define hpdelim ssh_hpdelim
199#define init_rng ssh_init_rng
200#define ipv64_normalise_mapped ssh_ipv64_normalise_mapped
201#define kex_derive_keys ssh_kex_derive_keys
202#define kex_dh_hash ssh_kex_dh_hash

--- 16 unchanged lines hidden (view full) ---

219#define key_load_private ssh_key_load_private
220#define key_load_private_pem ssh_key_load_private_pem
221#define key_load_private_type ssh_key_load_private_type
222#define key_load_public ssh_key_load_public
223#define key_load_public_type ssh_key_load_public_type
224#define key_names_valid2 ssh_key_names_valid2
225#define key_new ssh_key_new
226#define key_new_private ssh_key_new_private
227#define key_perm_ok ssh_key_perm_ok
220#define key_read ssh_key_read
221#define key_save_private ssh_key_save_private
222#define key_sign ssh_key_sign
223#define key_size ssh_key_size
224#define key_ssh_name ssh_key_ssh_name
225#define key_to_blob ssh_key_to_blob
226#define key_type ssh_key_type
227#define key_type_from_name ssh_key_type_from_name

--- 68 unchanged lines hidden (view full) ---

296#define packet_set_rekey_limit ssh_packet_set_rekey_limit
297#define packet_set_server ssh_packet_set_server
298#define packet_set_state ssh_packet_set_state
299#define packet_start ssh_packet_start
300#define packet_start_compression ssh_packet_start_compression
301#define packet_write_poll ssh_packet_write_poll
302#define packet_write_wait ssh_packet_write_wait
303#define percent_expand ssh_percent_expand
228#define key_read ssh_key_read
229#define key_save_private ssh_key_save_private
230#define key_sign ssh_key_sign
231#define key_size ssh_key_size
232#define key_ssh_name ssh_key_ssh_name
233#define key_to_blob ssh_key_to_blob
234#define key_type ssh_key_type
235#define key_type_from_name ssh_key_type_from_name

--- 68 unchanged lines hidden (view full) ---

304#define packet_set_rekey_limit ssh_packet_set_rekey_limit
305#define packet_set_server ssh_packet_set_server
306#define packet_set_state ssh_packet_set_state
307#define packet_start ssh_packet_start
308#define packet_start_compression ssh_packet_start_compression
309#define packet_write_poll ssh_packet_write_poll
310#define packet_write_wait ssh_packet_write_wait
311#define percent_expand ssh_percent_expand
312#define permanently_drop_suid ssh_permanently_drop_suid
304#define permanently_set_uid ssh_permanently_set_uid
305#define prime_test ssh_prime_test
306#define proto_spec ssh_proto_spec
313#define permanently_set_uid ssh_permanently_set_uid
314#define prime_test ssh_prime_test
315#define proto_spec ssh_proto_spec
316#define put_host_port ssh_put_host_port
317#define put_u16 ssh_put_u16
318#define put_u32 ssh_put_u32
319#define put_u64 ssh_put_u64
307#define pwcopy ssh_pwcopy
308#define read_keyfile_line ssh_read_keyfile_line
309#define read_passphrase ssh_read_passphrase
310#define refresh_progress_meter ssh_refresh_progress_meter
311#define replacearg ssh_replacearg
312#define restore_uid ssh_restore_uid
313#define rijndael_decrypt ssh_rijndael_decrypt
314#define rijndael_encrypt ssh_rijndael_encrypt
315#define rijndael_set_key ssh_rijndael_set_key
316#define rsa_generate_additional_parameters ssh_rsa_generate_additional_parameters
317#define rsa_private_decrypt ssh_rsa_private_decrypt
318#define rsa_public_encrypt ssh_rsa_public_encrypt
319#define sanitise_stdfd ssh_sanitise_stdfd
320#define seed_rng ssh_seed_rng
321#define set_newkeys ssh_set_newkeys
322#define set_nodelay ssh_set_nodelay
323#define set_nonblock ssh_set_nonblock
324#define shadow_pw ssh_shadow_pw
320#define pwcopy ssh_pwcopy
321#define read_keyfile_line ssh_read_keyfile_line
322#define read_passphrase ssh_read_passphrase
323#define refresh_progress_meter ssh_refresh_progress_meter
324#define replacearg ssh_replacearg
325#define restore_uid ssh_restore_uid
326#define rijndael_decrypt ssh_rijndael_decrypt
327#define rijndael_encrypt ssh_rijndael_encrypt
328#define rijndael_set_key ssh_rijndael_set_key
329#define rsa_generate_additional_parameters ssh_rsa_generate_additional_parameters
330#define rsa_private_decrypt ssh_rsa_private_decrypt
331#define rsa_public_encrypt ssh_rsa_public_encrypt
332#define sanitise_stdfd ssh_sanitise_stdfd
333#define seed_rng ssh_seed_rng
334#define set_newkeys ssh_set_newkeys
335#define set_nodelay ssh_set_nodelay
336#define set_nonblock ssh_set_nonblock
337#define shadow_pw ssh_shadow_pw
338#define sigdie ssh_sigdie
325#define ssh1_3des_iv ssh_ssh1_3des_iv
326#define start_progress_meter ssh_start_progress_meter
327#define stop_progress_meter ssh_stop_progress_meter
328#define strdelim ssh_strdelim
329#define strnvis ssh_strnvis
330#define strvis ssh_strvis
331#define strvisx ssh_strvisx
332#define sys_tun_open ssh_sys_tun_open

--- 7 unchanged lines hidden (view full) ---

340#define uudecode ssh_uudecode
341#define uuencode ssh_uuencode
342#define verify_host_key_dns ssh_verify_host_key_dns
343#define vis ssh_vis
344#define x11_connect_display ssh_x11_connect_display
345#define x11_create_display_inet ssh_x11_create_display_inet
346#define x11_input_open ssh_x11_input_open
347#define x11_request_forwarding_with_spoofing ssh_x11_request_forwarding_with_spoofing
339#define ssh1_3des_iv ssh_ssh1_3des_iv
340#define start_progress_meter ssh_start_progress_meter
341#define stop_progress_meter ssh_stop_progress_meter
342#define strdelim ssh_strdelim
343#define strnvis ssh_strnvis
344#define strvis ssh_strvis
345#define strvisx ssh_strvisx
346#define sys_tun_open ssh_sys_tun_open

--- 7 unchanged lines hidden (view full) ---

354#define uudecode ssh_uudecode
355#define uuencode ssh_uuencode
356#define verify_host_key_dns ssh_verify_host_key_dns
357#define vis ssh_vis
358#define x11_connect_display ssh_x11_connect_display
359#define x11_create_display_inet ssh_x11_create_display_inet
360#define x11_input_open ssh_x11_input_open
361#define x11_request_forwarding_with_spoofing ssh_x11_request_forwarding_with_spoofing
362#define xasprintf ssh_xasprintf
363#define xcalloc ssh_xcalloc
348#define xcrypt ssh_xcrypt
349#define xfree ssh_xfree
350#define xmalloc ssh_xmalloc
351#define xmmap ssh_xmmap
352#define xrealloc ssh_xrealloc
353#define xstrdup ssh_xstrdup
364#define xcrypt ssh_xcrypt
365#define xfree ssh_xfree
366#define xmalloc ssh_xmalloc
367#define xmmap ssh_xmmap
368#define xrealloc ssh_xrealloc
369#define xstrdup ssh_xstrdup