Update build for OpenSSH-5.6.
authorPeter Avalos <pavalos@dragonflybsd.org>
Wed, 29 Sep 2010 10:14:54 +0000 (00:14 -1000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Wed, 29 Sep 2010 10:14:54 +0000 (00:14 -1000)
14 files changed:
crypto/openssh/authfile.c
crypto/openssh/authfile.h
crypto/openssh/ssh-vulnkey.c
crypto/openssh/ssh_namespace.h
lib/pam_module/pam_ssh/pam_ssh.c
secure/lib/libssh/Makefile
secure/lib/libssh/config.h
secure/lib/libssh/version.h
secure/libexec/Makefile
secure/libexec/sftp-server/Makefile
secure/libexec/ssh-pkcs11-helper/Makefile [new file with mode: 0644]
secure/usr.bin/sftp/Makefile
secure/usr.bin/ssh/Makefile
secure/usr.sbin/sshd/Makefile

index b9ee40e..aa4c1df 100644 (file)
@@ -706,7 +706,7 @@ blacklist_filename(const Key *key)
 
 /* Scan a blacklist of known-vulnerable keys. */
 int
-blacklisted_key(const Key *key)
+blacklisted_key(Key *key)
 {
        char *blacklist_file;
        int fd = -1;
index f32e028..d2f5d10 100644 (file)
@@ -27,6 +27,6 @@ int    key_perm_ok(int, const char *);
 int     key_in_file(Key *, const char *, int);
 
 char   *blacklist_filename(const Key *key);
-int     blacklisted_key(const Key *key);
+int     blacklisted_key(Key *key);
 
 #endif
index 3297c43..e9552e2 100644 (file)
@@ -73,7 +73,7 @@ usage(void)
 }
 
 void
-describe_key(const char *msg, const Key *key, const char *comment)
+describe_key(const char *msg, Key *key, const char *comment)
 {
        char *fp;
 
@@ -84,7 +84,7 @@ describe_key(const char *msg, const Key *key, const char *comment)
 }
 
 int
-do_key(const Key *key, const char *comment)
+do_key(Key *key, const char *comment)
 {
        char *blacklist_file;
        struct stat st;
index 518b7b2..683bee3 100644 (file)
@@ -7,7 +7,7 @@
  *
  * A list of symbols which need munging is obtained as follows:
  *
- * nm libssh.a | awk '$2 == "T" && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
+ * nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
  *
  * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.4 2008/08/01 02:48:36 des Exp $
  */
 #define acss_setsubkey                         ssh_acss_setsubkey
 #define add_host_to_hostfile                   ssh_add_host_to_hostfile
 #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
 #define atomiciov                              ssh_atomiciov
 #define auth_request_forwarding                        ssh_auth_request_forwarding
+#define blacklist_filename                     ssh_blacklist_filename
+#define blacklisted_key                                ssh_blacklisted_key
+#define bn_rand_range_gt_one                   ssh_bn_rand_range_gt_one
 #define buffer_append                          ssh_buffer_append
 #define buffer_append_space                    ssh_buffer_append_space
 #define buffer_check_alloc                     ssh_buffer_check_alloc
@@ -52,6 +57,8 @@
 #define buffer_get_short                       ssh_buffer_get_short
 #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
@@ -71,6 +78,7 @@
 #define chan_is_dead                           ssh_chan_is_dead
 #define chan_mark_dead                         ssh_chan_mark_dead
 #define chan_obuf_empty                                ssh_chan_obuf_empty
+#define chan_rcvd_eow                          ssh_chan_rcvd_eow
 #define chan_rcvd_ieof                         ssh_chan_rcvd_ieof
 #define chan_rcvd_oclose                       ssh_chan_rcvd_oclose
 #define chan_read_failed                       ssh_chan_read_failed
@@ -86,6 +94,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
 #define channel_input_open_failure             ssh_channel_input_open_failure
 #define channel_input_port_forward_request     ssh_channel_input_port_forward_request
 #define channel_input_port_open                        ssh_channel_input_port_open
+#define channel_input_status_confirm           ssh_channel_input_status_confirm
 #define channel_input_window_adjust            ssh_channel_input_window_adjust
 #define channel_lookup                         ssh_channel_lookup
 #define channel_new                            ssh_channel_new
 #define channel_open_message                   ssh_channel_open_message
 #define channel_output_poll                    ssh_channel_output_poll
 #define channel_permit_all_opens               ssh_channel_permit_all_opens
+#define channel_post                           ssh_channel_post
+#define channel_pre                            ssh_channel_pre
 #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
 #define channel_request_remote_forwarding      ssh_channel_request_remote_forwarding
 #define channel_request_rforward_cancel                ssh_channel_request_rforward_cancel
 #define channel_request_start                  ssh_channel_request_start
 #define channel_send_window_changes            ssh_channel_send_window_changes
 #define channel_set_af                         ssh_channel_set_af
 #define channel_set_fds                                ssh_channel_set_fds
+#define channel_set_hpn                                ssh_channel_set_hpn
 #define channel_setup_local_fwd_listener       ssh_channel_setup_local_fwd_listener
 #define channel_setup_remote_fwd_listener      ssh_channel_setup_remote_fwd_listener
 #define channel_still_open                     ssh_channel_still_open
 #define channel_stop_listening                 ssh_channel_stop_listening
+#define channel_tcpwinsz                       ssh_channel_tcpwinsz
 #define check_host_in_hostfile                 ssh_check_host_in_hostfile
 #define choose_dh                              ssh_choose_dh
 #define chop                                   ssh_chop
 #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_is_cbc                          ssh_cipher_is_cbc
 #define cipher_keylen                          ssh_cipher_keylen
 #define cipher_mask_ssh1                       ssh_cipher_mask_ssh1
 #define cipher_name                            ssh_cipher_name
 #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                                        ssh_ciphers
 #define ciphers_valid                          ssh_ciphers_valid
 #define cleanhostname                          ssh_cleanhostname
 #define cleanup_exit                           ssh_cleanup_exit
+#define clear_cached_addr                      ssh_clear_cached_addr
 #define colon                                  ssh_colon
+#define compat13                               ssh_compat13
+#define compat20                               ssh_compat20
 #define compat_cipher_proposal                 ssh_compat_cipher_proposal
 #define compat_datafellows                     ssh_compat_datafellows
 #define convtime                               ssh_convtime
+#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 debug3_bn                              ssh_debug3_bn
+#define debug3_buf                             ssh_debug3_buf
 #define decode_reply                           ssh_decode_reply
 #define deny_input_open                                ssh_deny_input_open
 #define derive_ssh1_session_id                 ssh_derive_ssh1_session_id
 #define dh_new_group14                         ssh_dh_new_group14
 #define dh_new_group_asc                       ssh_dh_new_group_asc
 #define dh_pub_is_valid                                ssh_dh_pub_is_valid
+#define dispatch                               ssh_dispatch
 #define dispatch_init                          ssh_dispatch_init
 #define dispatch_protocol_error                        ssh_dispatch_protocol_error
 #define dispatch_protocol_ignore               ssh_dispatch_protocol_ignore
 #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
 #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
 #define gen_candidates                         ssh_gen_candidates
 #define get_remote_ipaddr                      ssh_get_remote_ipaddr
 #define get_remote_name_or_ip                  ssh_get_remote_name_or_ip
 #define get_remote_port                                ssh_get_remote_port
+#define get_sock_port                          ssh_get_sock_port
 #define get_u16                                        ssh_get_u16
 #define get_u32                                        ssh_get_u32
 #define get_u64                                        ssh_get_u64
 #define getrrsetbyname                         ssh_getrrsetbyname
+#define hash_buffer                            ssh_hash_buffer
 #define host_hash                              ssh_host_hash
 #define hostfile_read_key                      ssh_hostfile_read_key
 #define hpdelim                                        ssh_hpdelim
+#define incoming_stream                                ssh_incoming_stream
 #define init_rng                               ssh_init_rng
 #define ipv64_normalise_mapped                 ssh_ipv64_normalise_mapped
 #define kex_derive_keys                                ssh_kex_derive_keys
 #define kex_finish                             ssh_kex_finish
 #define kex_get_newkeys                                ssh_kex_get_newkeys
 #define kex_input_kexinit                      ssh_kex_input_kexinit
+#define kex_prop2buf                           ssh_kex_prop2buf
 #define kex_send_kexinit                       ssh_kex_send_kexinit
 #define kex_setup                              ssh_kex_setup
 #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_cert_is_legacy                     ssh_key_cert_is_legacy
+#define key_cert_type                          ssh_key_cert_type
+#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_cert                          ssh_key_load_cert
 #define key_load_private                       ssh_key_load_private
+#define key_load_private_cert                  ssh_key_load_private_cert
 #define key_load_private_pem                   ssh_key_load_private_pem
 #define key_load_private_type                  ssh_key_load_private_type
 #define key_load_public                                ssh_key_load_public
 #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
 #define log_facility_number                    ssh_log_facility_number
 #define log_init                               ssh_log_init
+#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
 #define mac_init                               ssh_mac_init
+#define mac_setup                              ssh_mac_setup
 #define mac_valid                              ssh_mac_valid
+#define macs                                   ssh_macs
 #define match_host_and_ip                      ssh_match_host_and_ip
 #define match_hostname                         ssh_match_hostname
 #define match_list                             ssh_match_list
 #define match_user                             ssh_match_user
 #define mm_receive_fd                          ssh_mm_receive_fd
 #define mm_send_fd                             ssh_mm_send_fd
+#define modp_group_free                                ssh_modp_group_free
+#define modp_group_from_g_and_safe_p           ssh_modp_group_from_g_and_safe_p
+#define ms_subtract_diff                       ssh_ms_subtract_diff
+#define ms_to_timeval                          ssh_ms_to_timeval
 #define mysignal                               ssh_mysignal
+#define outgoing_stream                                ssh_outgoing_stream
 #define packet_add_padding                     ssh_packet_add_padding
+#define packet_authentication_state            ssh_packet_authentication_state
+#define packet_backup_state                    ssh_packet_backup_state
 #define packet_close                           ssh_packet_close
 #define packet_connection_is_ipv4              ssh_packet_connection_is_ipv4
 #define packet_connection_is_on_socket         ssh_packet_connection_is_on_socket
 #define packet_get_connection_in               ssh_packet_get_connection_in
 #define packet_get_connection_out              ssh_packet_get_connection_out
 #define packet_get_encryption_key              ssh_packet_get_encryption_key
+#define packet_get_input                       ssh_packet_get_input
 #define packet_get_int                         ssh_packet_get_int
+#define packet_get_int64                       ssh_packet_get_int64
 #define packet_get_keycontext                  ssh_packet_get_keycontext
 #define packet_get_keyiv                       ssh_packet_get_keyiv
 #define packet_get_keyiv_len                   ssh_packet_get_keyiv_len
+#define packet_get_maxsize                     ssh_packet_get_maxsize
+#define packet_get_newkeys                     ssh_packet_get_newkeys
+#define packet_get_output                      ssh_packet_get_output
 #define packet_get_protocol_flags              ssh_packet_get_protocol_flags
 #define packet_get_raw                         ssh_packet_get_raw
 #define packet_get_ssh1_cipher                 ssh_packet_get_ssh1_cipher
 #define packet_get_state                       ssh_packet_get_state
 #define packet_get_string                      ssh_packet_get_string
+#define packet_get_string_ptr                  ssh_packet_get_string_ptr
 #define packet_have_data_to_write              ssh_packet_have_data_to_write
+#define packet_inc_alive_timeouts              ssh_packet_inc_alive_timeouts
 #define packet_is_interactive                  ssh_packet_is_interactive
 #define packet_need_rekeying                   ssh_packet_need_rekeying
 #define packet_not_very_much_data_to_write     ssh_packet_not_very_much_data_to_write
 #define packet_put_char                                ssh_packet_put_char
 #define packet_put_cstring                     ssh_packet_put_cstring
 #define packet_put_int                         ssh_packet_put_int
+#define packet_put_int64                       ssh_packet_put_int64
 #define packet_put_raw                         ssh_packet_put_raw
 #define packet_put_string                      ssh_packet_put_string
 #define packet_read                            ssh_packet_read
 #define packet_read_poll_seqnr                 ssh_packet_read_poll_seqnr
 #define packet_read_seqnr                      ssh_packet_read_seqnr
 #define packet_remaining                       ssh_packet_remaining
+#define packet_request_rekeying                        ssh_packet_request_rekeying
+#define packet_restore_state                   ssh_packet_restore_state
 #define packet_send                            ssh_packet_send
 #define packet_send_debug                      ssh_packet_send_debug
 #define packet_send_ignore                     ssh_packet_send_ignore
+#define packet_set_alive_timeouts              ssh_packet_set_alive_timeouts
 #define packet_set_authenticated               ssh_packet_set_authenticated
 #define packet_set_connection                  ssh_packet_set_connection
 #define packet_set_encryption_key              ssh_packet_set_encryption_key
 #define packet_set_rekey_limit                 ssh_packet_set_rekey_limit
 #define packet_set_server                      ssh_packet_set_server
 #define packet_set_state                       ssh_packet_set_state
+#define packet_set_timeout                     ssh_packet_set_timeout
 #define packet_start                           ssh_packet_start
 #define packet_start_compression               ssh_packet_start_compression
 #define packet_write_poll                      ssh_packet_write_poll
 #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
 #define read_keyfile_line                      ssh_read_keyfile_line
 #define read_passphrase                                ssh_read_passphrase
 #define refresh_progress_meter                 ssh_refresh_progress_meter
+#define rekey_requested                                ssh_rekey_requested
 #define replacearg                             ssh_replacearg
 #define restore_uid                            ssh_restore_uid
 #define rijndael_decrypt                       ssh_rijndael_decrypt
 #define rsa_private_decrypt                    ssh_rsa_private_decrypt
 #define rsa_public_encrypt                     ssh_rsa_public_encrypt
 #define sanitise_stdfd                         ssh_sanitise_stdfd
+#define scan_scaled                            ssh_scan_scaled
+#define schnorr_sign                           ssh_schnorr_sign
+#define schnorr_sign_buf                       ssh_schnorr_sign_buf
+#define schnorr_verify                         ssh_schnorr_verify
+#define schnorr_verify_buf                     ssh_schnorr_verify_buf
 #define seed_rng                               ssh_seed_rng
 #define set_newkeys                            ssh_set_newkeys
 #define set_nodelay                            ssh_set_nodelay
 #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
 #define sys_tun_open                           ssh_sys_tun_open
 #define temporarily_use_uid                    ssh_temporarily_use_uid
 #define tilde_expand_filename                  ssh_tilde_expand_filename
+#define timingsafe_bcmp                                ssh_timingsafe_bcmp
 #define tohex                                  ssh_tohex
 #define tty_make_modes                         ssh_tty_make_modes
 #define tty_parse_modes                                ssh_tty_parse_modes
 #define tun_open                               ssh_tun_open
+#define umac_ctx                               ssh_umac_ctx
+#define umac_delete                            ssh_umac_delete
+#define umac_final                             ssh_umac_final
+#define umac_new                               ssh_umac_new
+#define umac_update                            ssh_umac_update
 #define unset_nonblock                         ssh_unset_nonblock
 #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
 #define xmmap                                  ssh_xmmap
 #define xrealloc                               ssh_xrealloc
 #define xstrdup                                        ssh_xstrdup
-#define fmt_scaled                             ssh_fmt_scaled
-#define scan_scaled                            ssh_scan_scaled
-#define addr_match_list                                ssh_addr_match_list
-#define packet_get_string_ptr                  ssh_packet_get_string_ptr
-#define packet_set_timeout                     ssh_packet_set_timeout
-#define mac_clear                              ssh_mac_clear
-#define mac_setup                              ssh_mac_setup
-#define umac_delete                            ssh_umac_delete
-#define umac_final                             ssh_umac_final
-#define umac_new                               ssh_umac_new
-#define umac_update                            ssh_umac_update
-#define chan_rcvd_eow                          ssh_chan_rcvd_eow
-#define channel_input_status_confirm           ssh_channel_input_status_confirm
-#define channel_print_adm_permitted_opens      ssh_channel_print_adm_permitted_opens
-#define channel_register_open_confirm          ssh_channel_register_open_confirm
-#define channel_register_status_confirm                ssh_channel_register_status_confirm
-#define buffer_get_string_ptr                  ssh_buffer_get_string_ptr
-#define ms_subtract_diff                       ssh_ms_subtract_diff
-#define ms_to_timeval                          ssh_ms_to_timeval
-#define fatal                                  ssh_fatal
-#define debug                                  ssh_debug
-#define debug2                                 ssh_debug2
-#define debug3                                 ssh_debug3
-#define error                                  ssh_error
-#define log_facility_name                      ssh_log_facility_name
-#define log_level_name                         ssh_log_level_name
-#define logit                                  ssh_logit
-#define verbose                                        ssh_verbose
index 1f53638..2ce608c 100644 (file)
@@ -62,6 +62,9 @@
 #include "authfd.h"
 #include "authfile.h"
 
+#define ssh_add_identity(auth, key, comment) \
+               ssh_add_identity_constrained(auth, key, comment, 0, 0)
+
 extern char **environ;
 
 struct pam_ssh_key {
index e2920dc..785eab3 100644 (file)
@@ -11,8 +11,9 @@ SRCS= acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \
        readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \
        atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
        monitor_fdpass.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c \
-       kexgex.c kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
-       entropy.c scard-opensc.c gss-genr.c umac.c jpake.c schnorr.c
+       kexgex.c kexdhc.c kexgexc.c msg.c progressmeter.c dns.c \
+       entropy.c gss-genr.c umac.c jpake.c schnorr.c \
+       ssh-pkcs11.c
 # Portability layer
 SRCS+= bsd-misc.c getrrsetbyname.c port-tun.c
 # FreeBSD additions
index e2104f2..322afed 100644 (file)
@@ -1,9 +1,6 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
 /* Define if you have a getaddrinfo that fails for the all-zeros IPv6 address
    */
 /* #undef AIX_GETNAMEINFO_HACK */
@@ -84,9 +81,6 @@
 /* Define if you want to specify the path to your lastlog file */
 /* #undef CONF_LASTLOG_FILE */
 
-/* Define if you want to specify the path to your utmpx file */
-/* #undef CONF_UTMPX_FILE */
-
 /* Define if you want to specify the path to your utmp file */
 #define CONF_UTMP_FILE "/var/run/utmp"
 
 /* Define if you don't want to use wtmpx */
 #define DISABLE_WTMPX 1
 
+/* Enable for PKCS#11 support */
+#define ENABLE_PKCS11 
+
 /* Builtin PRNG command timeout */
 #define ENTROPY_TIMEOUT_MSEC 200
 
 /* Define to 1 if you have the `getutxline' function. */
 /* #undef HAVE_GETUTXLINE */
 
+/* Define to 1 if you have the `getutxuser' function. */
+/* #undef HAVE_GETUTXUSER */
+
 /* Define to 1 if you have the `get_default_context_with_level' function. */
 /* #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL */
 
 /* Define to 1 if you have the <glob.h> header file. */
 #define HAVE_GLOB_H 1
 
+/* Define to 1 if you have the `group_from_gid' function. */
+#define HAVE_GROUP_FROM_GID 1
+
 /* Define to 1 if you have the <gssapi_generic.h> header file. */
 /* #undef HAVE_GSSAPI_GENERIC_H */
 
 /* Define if system has libiaf that supports set_id */
 /* #undef HAVE_LIBIAF */
 
+/* Define to 1 if you have the `network' library (-lnetwork). */
+/* #undef HAVE_LIBNETWORK */
+
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 /* #undef HAVE_LIBNSL */
 
 /* Define to 1 if you have the `pam' library (-lpam). */
 #define HAVE_LIBPAM 1
 
-/* Define to 1 if you have the `sectok' library (-lsectok). */
-/* #undef HAVE_LIBSECTOK */
-
 /* Define to 1 if you have the `socket' library (-lsocket). */
 /* #undef HAVE_LIBSOCKET */
 
 /* define if you have sa_family_t data type */
 #define HAVE_SA_FAMILY_T 1
 
-/* Define to 1 if you have the <sectok.h> header file. */
-/* #undef HAVE_SECTOK_H */
-
 /* Define if you have SecureWare-based protected password database */
 /* #undef HAVE_SECUREWARE */
 
 /* Define to 1 if you have the `seteuid' function. */
 #define HAVE_SETEUID 1
 
+/* Define to 1 if you have the `setgroupent' function. */
+#define HAVE_SETGROUPENT 1
+
 /* Define to 1 if you have the `setgroups' function. */
 #define HAVE_SETGROUPS 1
 
 /* Define to 1 if you have the `setluid' function. */
 /* #undef HAVE_SETLUID */
 
+/* Define to 1 if you have the `setpassent' function. */
+#define HAVE_SETPASSENT 1
+
 /* Define to 1 if you have the `setpcred' function. */
 /* #undef HAVE_SETPCRED */
 
 /* Define to 1 if you have the `setutent' function. */
 /* #undef HAVE_SETUTENT */
 
+/* Define to 1 if you have the `setutxdb' function. */
+/* #undef HAVE_SETUTXDB */
+
 /* Define to 1 if you have the `setutxent' function. */
 /* #undef HAVE_SETUTXENT */
 
 /* Define to 1 if you have the `strnvis' function. */
 #define HAVE_STRNVIS 1
 
+/* Define to 1 if you have the `strptime' function. */
+#define HAVE_STRPTIME 1
+
 /* Define to 1 if you have the `strsep' function. */
 #define HAVE_STRSEP 1
 
 /* Define to 1 if you have the <usersec.h> header file. */
 /* #undef HAVE_USERSEC_H */
 
+/* Define to 1 if you have the `user_from_uid' function. */
+#define HAVE_USER_FROM_UID 1
+
 /* Define to 1 if you have the <util.h> header file. */
 /* #undef HAVE_UTIL_H */
 
    EOPNOTSUPP. */
 /* #undef LINK_OPNOTSUPP_ERRNO */
 
+/* Adjust Linux out-of-memory killer */
+/* #undef LINUX_OOM_ADJUST */
+
 /* max value of long long calculated by configure */
 /* #undef LLONG_MAX */
 
 /* Define if your skeychallenge() function takes 4 arguments (NetBSD) */
 /* #undef SKEYCHALLENGE_4ARG */
 
-/* Define if you want smartcard support */
-/* #undef SMARTCARD */
-
 /* Define as const if snprintf() can declare const char *fmt */
 #define SNPRINTF_CONST const
 
 /* Use libedit for sftp */
 #define USE_LIBEDIT 1
 
-/* Define if you want smartcard support using OpenSC */
-/* #undef USE_OPENSC */
-
 /* Enable OpenSSL engine support */
 /* #undef USE_OPENSSL_ENGINE */
 
 /* Use PIPES instead of a socketpair() */
 /* #undef USE_PIPES */
 
-/* Define if you want smartcard support using sectok */
-/* #undef USE_SECTOK */
-
 /* Define if you have Solaris process contracts */
 /* #undef USE_SOLARIS_PROCESS_CONTRACTS */
 
 /* Define if you want SELinux support. */
 /* #undef WITH_SELINUX */
 
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
 
 /* Define if xauth is found in your path */
 /* #undef XAUTH_PATH */
index 093d664..69334e4 100644 (file)
@@ -5,8 +5,8 @@
 
 #define        SSH_VERSION             (ssh_version_get())
 #define        SSH_RELEASE             (ssh_version_get())
-#define        SSH_VERSION_BASE        "OpenSSH_5.3p1-hpn13v7"
-#define        SSH_VERSION_ADDENDUM    "DragonFly-20100109"
+#define        SSH_VERSION_BASE        "OpenSSH_5.6p1-hpn13v10"
+#define        SSH_VERSION_ADDENDUM    "DragonFly-20100928"
 
 const char *ssh_version_get(void);
 void ssh_version_set_addendum(const char *add);
index f97f18c..2124e78 100644 (file)
@@ -2,7 +2,7 @@
 # $DragonFly: src/secure/libexec/Makefile,v 1.4 2005/09/06 18:55:31 dillon Exp $
 
 .if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
-SUBDIR+=sftp-server ssh-keysign
+SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper
 .endif
 
 .include <bsd.subdir.mk>
index 6cd7bca..d900175 100644 (file)
@@ -4,6 +4,12 @@
 PROG=   sftp-server
 SRCS=   sftp-server.c sftp-common.c sftp-server-main.c roaming_dummy.c
 MAN=   sftp-server.8
+WARNS?=        0
+
+# Portability layer
+SRCS+= fmt_scaled.c
 
 .include "../../Makefile.ssh.common"
 .include <bsd.prog.mk>
+
+.PATH: ${SSHDIR}/openbsd-compat
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile
new file mode 100644 (file)
index 0000000..8809287
--- /dev/null
@@ -0,0 +1,9 @@
+PROG=  ssh-pkcs11-helper
+SRCS=  ssh-pkcs11-helper.c roaming_dummy.c
+MAN=   ssh-pkcs11-helper.8
+
+DPADD+=        ${LIBZ}
+LDADD+=        -lz
+
+.include "../../Makefile.ssh.common"
+.include <bsd.prog.mk>
index 65c8d9d..2392e26 100644 (file)
@@ -3,7 +3,7 @@
 
 PROG=  sftp
 SRCS=  sftp.c sftp-client.c sftp-common.c sftp-glob.c roaming_dummy.c
-WARNS?=        2
+WARNS?=        0
 
 # Portability layer
 SRCS+= fmt_scaled.c
index 03acc2e..4f9d294 100644 (file)
@@ -10,7 +10,7 @@ WARNS?=       2
 
 SRCS=  ssh.c readconf.c clientloop.c sshtty.c \
        sshconnect.c sshconnect1.c sshconnect2.c mux.c \
-       roaming_common.c
+       roaming_common.c roaming_client.c
 
 .if defined(X11BASE)
 CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
index 8116d3e..c62ce1e 100644 (file)
@@ -14,10 +14,11 @@ SRCS=       sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
        auth2-gss.c gss-serv.c gss-serv-krb5.c \
        loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \
        audit.c audit-bsm.c platform.c sftp-server.c sftp-common.c \
-       roaming_common.c
+       roaming_common.c roaming_serv.c
+WARNS?=        0
 
 # Portability layer
-SRCS+= xmmap.c
+SRCS+= fmt_scaled.c xmmap.c
 MAN=   sshd.8 sshd_config.5
 
 # Passwd routine