Deleted Added
full compact
ssh_namespace.h (294336) ssh_namespace.h (294464)
1/*
2 * Namespace munging inspired by an equivalent hack in NetBSD's tree: add
3 * the "Fssh_" 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 libprivatessh.a | LC_ALL=C awk '
11 /^[0-9a-z]+ [Tt] [A-Za-z_][0-9A-Za-z_]*$/ && $3 !~ /^Fssh_/ {
12 printf("#define %-39s Fssh_%s\n", $3, $3)
13 }' | unexpand -a | LC_ALL=C sort -u
14 *
1/*
2 * Namespace munging inspired by an equivalent hack in NetBSD's tree: add
3 * the "Fssh_" 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 libprivatessh.a | LC_ALL=C awk '
11 /^[0-9a-z]+ [Tt] [A-Za-z_][0-9A-Za-z_]*$/ && $3 !~ /^Fssh_/ {
12 printf("#define %-39s Fssh_%s\n", $3, $3)
13 }' | unexpand -a | LC_ALL=C sort -u
14 *
15 * $FreeBSD: head/crypto/openssh/ssh_namespace.h 294336 2016-01-19 18:55:44Z des $
15 * $FreeBSD: head/crypto/openssh/ssh_namespace.h 294464 2016-01-20 22:57:10Z des $
16 */
17
18#define Blowfish_decipher Fssh_Blowfish_decipher
19#define Blowfish_encipher Fssh_Blowfish_encipher
20#define Blowfish_expand0state Fssh_Blowfish_expand0state
21#define Blowfish_expandstate Fssh_Blowfish_expandstate
22#define Blowfish_initstate Fssh_Blowfish_initstate
23#define Blowfish_stream2word Fssh_Blowfish_stream2word
16 */
17
18#define Blowfish_decipher Fssh_Blowfish_decipher
19#define Blowfish_encipher Fssh_Blowfish_encipher
20#define Blowfish_expand0state Fssh_Blowfish_expand0state
21#define Blowfish_expandstate Fssh_Blowfish_expandstate
22#define Blowfish_initstate Fssh_Blowfish_initstate
23#define Blowfish_stream2word Fssh_Blowfish_stream2word
24#define _ssh_compat_realpath Fssh__ssh_compat_realpath
24#define _ssh_exchange_banner Fssh__ssh_exchange_banner
25#define _ssh_host_key_sign Fssh__ssh_host_key_sign
26#define _ssh_host_private_key Fssh__ssh_host_private_key
27#define _ssh_host_public_key Fssh__ssh_host_public_key
28#define _ssh_order_hostkeyalgs Fssh__ssh_order_hostkeyalgs
29#define _ssh_read_banner Fssh__ssh_read_banner
30#define _ssh_send_banner Fssh__ssh_send_banner
31#define _ssh_verify_host_key Fssh__ssh_verify_host_key

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

374#define input_kex_dh_gex_init Fssh_input_kex_dh_gex_init
375#define input_kex_dh_gex_reply Fssh_input_kex_dh_gex_reply
376#define input_kex_dh_gex_request Fssh_input_kex_dh_gex_request
377#define input_kex_dh_init Fssh_input_kex_dh_init
378#define input_kex_ecdh_init Fssh_input_kex_ecdh_init
379#define input_kex_ecdh_reply Fssh_input_kex_ecdh_reply
380#define iptos2str Fssh_iptos2str
381#define ipv64_normalise_mapped Fssh_ipv64_normalise_mapped
25#define _ssh_exchange_banner Fssh__ssh_exchange_banner
26#define _ssh_host_key_sign Fssh__ssh_host_key_sign
27#define _ssh_host_private_key Fssh__ssh_host_private_key
28#define _ssh_host_public_key Fssh__ssh_host_public_key
29#define _ssh_order_hostkeyalgs Fssh__ssh_order_hostkeyalgs
30#define _ssh_read_banner Fssh__ssh_read_banner
31#define _ssh_send_banner Fssh__ssh_send_banner
32#define _ssh_verify_host_key Fssh__ssh_verify_host_key

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

375#define input_kex_dh_gex_init Fssh_input_kex_dh_gex_init
376#define input_kex_dh_gex_reply Fssh_input_kex_dh_gex_reply
377#define input_kex_dh_gex_request Fssh_input_kex_dh_gex_request
378#define input_kex_dh_init Fssh_input_kex_dh_init
379#define input_kex_ecdh_init Fssh_input_kex_ecdh_init
380#define input_kex_ecdh_reply Fssh_input_kex_ecdh_reply
381#define iptos2str Fssh_iptos2str
382#define ipv64_normalise_mapped Fssh_ipv64_normalise_mapped
382#define is_cert_revoked Fssh_is_cert_revoked
383#define is_key_revoked Fssh_is_key_revoked
384#define kex_alg_by_name Fssh_kex_alg_by_name
385#define kex_alg_list Fssh_kex_alg_list
383#define is_key_revoked Fssh_is_key_revoked
384#define kex_alg_by_name Fssh_kex_alg_by_name
385#define kex_alg_list Fssh_kex_alg_list
386#define kex_assemble_names Fssh_kex_assemble_names
386#define kex_buf2prop Fssh_kex_buf2prop
387#define kex_c25519_hash Fssh_kex_c25519_hash
388#define kex_derive_keys Fssh_kex_derive_keys
389#define kex_derive_keys_bn Fssh_kex_derive_keys_bn
390#define kex_dh_hash Fssh_kex_dh_hash
391#define kex_ecdh_hash Fssh_kex_ecdh_hash
392#define kex_free Fssh_kex_free
393#define kex_free_newkeys Fssh_kex_free_newkeys
394#define kex_input_kexinit Fssh_kex_input_kexinit
395#define kex_input_newkeys Fssh_kex_input_newkeys
387#define kex_buf2prop Fssh_kex_buf2prop
388#define kex_c25519_hash Fssh_kex_c25519_hash
389#define kex_derive_keys Fssh_kex_derive_keys
390#define kex_derive_keys_bn Fssh_kex_derive_keys_bn
391#define kex_dh_hash Fssh_kex_dh_hash
392#define kex_ecdh_hash Fssh_kex_ecdh_hash
393#define kex_free Fssh_kex_free
394#define kex_free_newkeys Fssh_kex_free_newkeys
395#define kex_input_kexinit Fssh_kex_input_kexinit
396#define kex_input_newkeys Fssh_kex_input_newkeys
397#define kex_names_cat Fssh_kex_names_cat
396#define kex_names_valid Fssh_kex_names_valid
397#define kex_new Fssh_kex_new
398#define kex_prop2buf Fssh_kex_prop2buf
399#define kex_prop_free Fssh_kex_prop_free
400#define kex_protocol_error Fssh_kex_protocol_error
401#define kex_send_kexinit Fssh_kex_send_kexinit
402#define kex_send_newkeys Fssh_kex_send_newkeys
403#define kex_setup Fssh_kex_setup

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

595#define ssh_err Fssh_ssh_err
596#define ssh_fetch_identitylist Fssh_ssh_fetch_identitylist
597#define ssh_free Fssh_ssh_free
598#define ssh_free_identitylist Fssh_ssh_free_identitylist
599#define ssh_gai_strerror Fssh_ssh_gai_strerror
600#define ssh_get_app_data Fssh_ssh_get_app_data
601#define ssh_get_authentication_socket Fssh_ssh_get_authentication_socket
602#define ssh_get_progname Fssh_ssh_get_progname
398#define kex_names_valid Fssh_kex_names_valid
399#define kex_new Fssh_kex_new
400#define kex_prop2buf Fssh_kex_prop2buf
401#define kex_prop_free Fssh_kex_prop_free
402#define kex_protocol_error Fssh_kex_protocol_error
403#define kex_send_kexinit Fssh_kex_send_kexinit
404#define kex_send_newkeys Fssh_kex_send_newkeys
405#define kex_setup Fssh_kex_setup

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

597#define ssh_err Fssh_ssh_err
598#define ssh_fetch_identitylist Fssh_ssh_fetch_identitylist
599#define ssh_free Fssh_ssh_free
600#define ssh_free_identitylist Fssh_ssh_free_identitylist
601#define ssh_gai_strerror Fssh_ssh_gai_strerror
602#define ssh_get_app_data Fssh_ssh_get_app_data
603#define ssh_get_authentication_socket Fssh_ssh_get_authentication_socket
604#define ssh_get_progname Fssh_ssh_get_progname
603#define ssh_gssapi_build_ctx Fssh_ssh_gssapi_build_ctx
604#define ssh_gssapi_buildmic Fssh_ssh_gssapi_buildmic
605#define ssh_gssapi_check_mechanism Fssh_ssh_gssapi_check_mechanism
606#define ssh_gssapi_check_oid Fssh_ssh_gssapi_check_oid
607#define ssh_gssapi_delete_ctx Fssh_ssh_gssapi_delete_ctx
608#define ssh_gssapi_error Fssh_ssh_gssapi_error
609#define ssh_gssapi_import_name Fssh_ssh_gssapi_import_name
610#define ssh_gssapi_init_ctx Fssh_ssh_gssapi_init_ctx
611#define ssh_gssapi_last_error Fssh_ssh_gssapi_last_error
612#define ssh_gssapi_set_oid Fssh_ssh_gssapi_set_oid
613#define ssh_gssapi_set_oid_data Fssh_ssh_gssapi_set_oid_data
614#define ssh_gssapi_sign Fssh_ssh_gssapi_sign
615#define ssh_hmac_bytes Fssh_ssh_hmac_bytes
616#define ssh_hmac_final Fssh_ssh_hmac_final
617#define ssh_hmac_free Fssh_ssh_hmac_free
618#define ssh_hmac_init Fssh_ssh_hmac_init
619#define ssh_hmac_start Fssh_ssh_hmac_start
620#define ssh_hmac_update Fssh_ssh_hmac_update
621#define ssh_hmac_update_buffer Fssh_ssh_hmac_update_buffer
622#define ssh_init Fssh_ssh_init

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

783#define sshbuf_refcount Fssh_sshbuf_refcount
784#define sshbuf_reserve Fssh_sshbuf_reserve
785#define sshbuf_reset Fssh_sshbuf_reset
786#define sshbuf_set_max_size Fssh_sshbuf_set_max_size
787#define sshbuf_set_parent Fssh_sshbuf_set_parent
788#define sshkey_add_private Fssh_sshkey_add_private
789#define sshkey_cert_check_authority Fssh_sshkey_cert_check_authority
790#define sshkey_cert_copy Fssh_sshkey_cert_copy
605#define ssh_hmac_bytes Fssh_ssh_hmac_bytes
606#define ssh_hmac_final Fssh_ssh_hmac_final
607#define ssh_hmac_free Fssh_ssh_hmac_free
608#define ssh_hmac_init Fssh_ssh_hmac_init
609#define ssh_hmac_start Fssh_ssh_hmac_start
610#define ssh_hmac_update Fssh_ssh_hmac_update
611#define ssh_hmac_update_buffer Fssh_ssh_hmac_update_buffer
612#define ssh_init Fssh_ssh_init

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

773#define sshbuf_refcount Fssh_sshbuf_refcount
774#define sshbuf_reserve Fssh_sshbuf_reserve
775#define sshbuf_reset Fssh_sshbuf_reset
776#define sshbuf_set_max_size Fssh_sshbuf_set_max_size
777#define sshbuf_set_parent Fssh_sshbuf_set_parent
778#define sshkey_add_private Fssh_sshkey_add_private
779#define sshkey_cert_check_authority Fssh_sshkey_cert_check_authority
780#define sshkey_cert_copy Fssh_sshkey_cert_copy
791#define sshkey_cert_is_legacy Fssh_sshkey_cert_is_legacy
792#define sshkey_cert_type Fssh_sshkey_cert_type
793#define sshkey_certify Fssh_sshkey_certify
794#define sshkey_check_revoked Fssh_sshkey_check_revoked
795#define sshkey_curve_name_to_nid Fssh_sshkey_curve_name_to_nid
796#define sshkey_curve_nid_to_bits Fssh_sshkey_curve_nid_to_bits
797#define sshkey_curve_nid_to_name Fssh_sshkey_curve_nid_to_name
798#define sshkey_demote Fssh_sshkey_demote
799#define sshkey_drop_cert Fssh_sshkey_drop_cert

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

925#define x11_input_open Fssh_x11_input_open
926#define x11_open_helper Fssh_x11_open_helper
927#define x11_request_forwarding_with_spoofing Fssh_x11_request_forwarding_with_spoofing
928#define xasprintf Fssh_xasprintf
929#define xcalloc Fssh_xcalloc
930#define xcrypt Fssh_xcrypt
931#define xmalloc Fssh_xmalloc
932#define xmmap Fssh_xmmap
781#define sshkey_cert_type Fssh_sshkey_cert_type
782#define sshkey_certify Fssh_sshkey_certify
783#define sshkey_check_revoked Fssh_sshkey_check_revoked
784#define sshkey_curve_name_to_nid Fssh_sshkey_curve_name_to_nid
785#define sshkey_curve_nid_to_bits Fssh_sshkey_curve_nid_to_bits
786#define sshkey_curve_nid_to_name Fssh_sshkey_curve_nid_to_name
787#define sshkey_demote Fssh_sshkey_demote
788#define sshkey_drop_cert Fssh_sshkey_drop_cert

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

914#define x11_input_open Fssh_x11_input_open
915#define x11_open_helper Fssh_x11_open_helper
916#define x11_request_forwarding_with_spoofing Fssh_x11_request_forwarding_with_spoofing
917#define xasprintf Fssh_xasprintf
918#define xcalloc Fssh_xcalloc
919#define xcrypt Fssh_xcrypt
920#define xmalloc Fssh_xmalloc
921#define xmmap Fssh_xmmap
933#define xrealloc Fssh_xrealloc
934#define xreallocarray Fssh_xreallocarray
935#define xstrdup Fssh_xstrdup
922#define xreallocarray Fssh_xreallocarray
923#define xstrdup Fssh_xstrdup