diff --git a/repos/libports/lib/mk/libssh.mk b/repos/libports/lib/mk/libssh.mk index 58295f5f3..97113ba1a 100644 --- a/repos/libports/lib/mk/libssh.mk +++ b/repos/libports/lib/mk/libssh.mk @@ -7,22 +7,27 @@ SRC_C = \ bignum.c \ bind.c \ buffer.c \ + chachapoly.c \ callbacks.c \ channels.c \ client.c \ config.c \ connect.c \ + connector.c \ curve25519.c \ dh.c \ ecdh.c \ + ecdh_crypto.c \ error.c \ getpass.c \ gzip.c \ init.c \ kex.c \ known_hosts.c \ + knownhosts.c \ legacy.c \ libcrypto.c \ + libcrypto-compat.c \ log.c \ match.c \ messages.c \ @@ -47,15 +52,23 @@ SRC_C = \ threads.c \ wrapper.c +# threads/ +SRC_C_threads := noop.c libcrypto.c + # external/ -SRC_C += \ - bcrypt_pbkdf.c \ - blowfish.c \ - curve25519_ref.c \ - ed25519.c \ - fe25519.c \ - ge25519.c \ - sc25519.c +SRC_C_external := \ + bcrypt_pbkdf.c \ + blowfish.c \ + chacha.c \ + curve25519_ref.c \ + ed25519.c \ + fe25519.c \ + ge25519.c \ + poly1305.c \ + sc25519.c + +SRC_C += $(addprefix threads/, $(SRC_C_threads)) +SRC_C += $(addprefix external/, $(SRC_C_external)) INC_DIR += $(LIBSSH_PORT_DIR)/include INC_DIR += $(REP_DIR)/src/lib/libssh @@ -68,5 +81,6 @@ SHARED_LIB = yes vpath %.c $(LIBSSH_PORT_DIR)/src/lib/libssh/src vpath %.c $(LIBSSH_PORT_DIR)/src/lib/libssh/src/external +vpath %.c $(LIBSSH_PORT_DIR)/src/lib/libssh/src/threads CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/symbols/libssh b/repos/libports/lib/symbols/libssh index 7de8a50d0..8c8e1cdde 100644 --- a/repos/libports/lib/symbols/libssh +++ b/repos/libports/lib/symbols/libssh @@ -1,211 +1,4 @@ -Blowfish_decipher T -Blowfish_encipher T -Blowfish_expand0state T -Blowfish_expandstate T -Blowfish_initstate T -Blowfish_stream2word T -_ssh_buffer_pack T -_ssh_buffer_unpack T -_ssh_list_pop_head T _ssh_log T -_ssh_pki_log T -_ssh_set_error T -_ssh_set_error_invalid T -_ssh_set_error_oom T -agent_close T -agent_free T -agent_is_running T -agent_new T -base64_to_bin T -bcrypt_pbkdf T -bin_to_base64 T -blf_cbc_decrypt T -blf_cbc_encrypt T -blf_dec T -blf_ecb_decrypt T -blf_ecb_encrypt T -blf_enc T -blf_key T -buffer_add_attributes T -buffer_add_buffer T -buffer_add_ssh_string T -buffer_add_u16 T -buffer_add_u32 T -buffer_add_u64 T -buffer_add_u8 T -buffer_free T -buffer_get T -buffer_get_data T -buffer_get_len T -buffer_get_mpint T -buffer_get_rest T -buffer_get_rest_len T -buffer_get_ssh_string T -buffer_get_u32 T -buffer_get_u64 T -buffer_get_u8 T -buffer_new T -buffer_pass_bytes T -buffer_pass_bytes_end T -buffer_prepend_data T -channel_accept_x11 T -channel_change_pty_size T -channel_close T -channel_default_bufferize T -channel_forward_accept T -channel_forward_cancel T -channel_forward_listen T -channel_free T -channel_get_exit_status T -channel_get_session T -channel_is_closed T -channel_is_eof T -channel_is_open T -channel_new T -channel_open_forward T -channel_open_session T -channel_poll T -channel_rcv_change_window T -channel_rcv_close T -channel_rcv_data T -channel_rcv_eof T -channel_rcv_request T -channel_read T -channel_read_buffer T -channel_read_nonblocking T -channel_request_env T -channel_request_exec T -channel_request_pty T -channel_request_pty_size T -channel_request_send_signal T -channel_request_sftp T -channel_request_shell T -channel_request_subsystem T -channel_request_x11 T -channel_select T -channel_send_eof T -channel_set_blocking T -channel_write T -channel_write_stderr T -compress_buffer T -crypt_set_algorithms T -crypt_set_algorithms_server T -crypto_free T -crypto_new T -crypto_scalarmult T -crypto_scalarmult_base T -crypto_sign_ed25519 T -crypto_sign_ed25519_keypair T -crypto_sign_ed25519_open T -crypto_sign_ed25519_ref_double_scalarmult_vartime T -crypto_sign_ed25519_ref_fe25519_add T -crypto_sign_ed25519_ref_fe25519_cmov T -crypto_sign_ed25519_ref_fe25519_freeze T -crypto_sign_ed25519_ref_fe25519_getparity T -crypto_sign_ed25519_ref_fe25519_invert T -crypto_sign_ed25519_ref_fe25519_iseq_vartime T -crypto_sign_ed25519_ref_fe25519_iszero T -crypto_sign_ed25519_ref_fe25519_mul T -crypto_sign_ed25519_ref_fe25519_neg T -crypto_sign_ed25519_ref_fe25519_pack T -crypto_sign_ed25519_ref_fe25519_pow2523 T -crypto_sign_ed25519_ref_fe25519_setone T -crypto_sign_ed25519_ref_fe25519_setzero T -crypto_sign_ed25519_ref_fe25519_square T -crypto_sign_ed25519_ref_fe25519_sub T -crypto_sign_ed25519_ref_fe25519_unpack T -crypto_sign_ed25519_ref_ge25519_base R 512 -crypto_sign_ed25519_ref_isneutral_vartime T -crypto_sign_ed25519_ref_pack T -crypto_sign_ed25519_ref_sc25519_2interleave2 T -crypto_sign_ed25519_ref_sc25519_add T -crypto_sign_ed25519_ref_sc25519_from32bytes T -crypto_sign_ed25519_ref_sc25519_from64bytes T -crypto_sign_ed25519_ref_sc25519_from_shortsc T -crypto_sign_ed25519_ref_sc25519_isshort_vartime T -crypto_sign_ed25519_ref_sc25519_iszero_vartime T -crypto_sign_ed25519_ref_sc25519_lt_vartime T -crypto_sign_ed25519_ref_sc25519_mul T -crypto_sign_ed25519_ref_sc25519_mul_shortsc T -crypto_sign_ed25519_ref_sc25519_sub_nored T -crypto_sign_ed25519_ref_sc25519_to32bytes T -crypto_sign_ed25519_ref_sc25519_window3 T -crypto_sign_ed25519_ref_sc25519_window5 T -crypto_sign_ed25519_ref_scalarmult_base T -crypto_sign_ed25519_ref_shortsc25519_from16bytes T -crypto_sign_ed25519_ref_unpackneg_vartime T -decompress_buffer T -dh_build_k T -dh_generate_e T -dh_generate_f T -dh_generate_x T -dh_generate_y T -dh_get_e T -dh_get_f T -dh_import_e T -dh_import_f T -dh_import_pubkey T -evp T -evp_final T -evp_init T -evp_update T -generate_session_keys T -hashbufin_add_cookie T -hashbufout_add_cookie T -hmac_digest_len T -hmac_final T -hmac_init T -hmac_update T -make_bignum_string T -make_sessionid T -make_string_bn T -make_string_bn_inplace T -match_hostname T -md5_final T -md5_init T -md5_update T -ntohll T -packet_decrypt T -packet_decrypt_len T -packet_encrypt T -packet_hmac_verify T -packet_send T -pki_do_sign T -pki_do_sign_sessionid T -pki_ed25519_key_cmp T -pki_ed25519_key_dup T -pki_ed25519_public_key_to_blob T -pki_ed25519_sig_from_blob T -pki_ed25519_sig_to_blob T -pki_ed25519_sign T -pki_ed25519_verify T -pki_export_pubkey_rsa1 T -pki_key_compare T -pki_key_dup T -pki_key_ecdsa_nid_from_name T -pki_key_ecdsa_nid_to_name T -pki_key_generate_dss T -pki_key_generate_ecdsa T -pki_key_generate_ed25519 T -pki_key_generate_rsa T -pki_private_key_from_base64 T -pki_private_key_to_pem T -pki_privatekey_type_from_string T -pki_pubkey_build_dss T -pki_pubkey_build_ecdsa T -pki_pubkey_build_rsa T -pki_publickey_to_blob T -pki_signature_from_blob T -pki_signature_to_blob T -pki_signature_verify T -privatekey_free T -privatekey_from_file T -publickey_free T -publickey_from_file T -publickey_from_privatekey T -publickey_from_string T -publickey_to_string T -set_client_kex T sftp_async_read T sftp_async_read_begin T sftp_attributes_free T @@ -216,6 +9,7 @@ sftp_client_message_free T sftp_client_message_get_data T sftp_client_message_get_filename T sftp_client_message_get_flags T +sftp_client_message_get_submessage T sftp_client_message_get_type T sftp_client_message_set_filename T sftp_close T @@ -230,6 +24,7 @@ sftp_file_set_nonblocking T sftp_free T sftp_fstat T sftp_fstatvfs T +sftp_fsync T sftp_get_client_message T sftp_get_error T sftp_handle T @@ -275,28 +70,17 @@ sftp_tell64 T sftp_unlink T sftp_utimes T sftp_write T -sha1 T -sha1_final T -sha1_init T -sha1_update T -sha256 T -sha256_final T -sha256_init T -sha256_update T -sha384 T -sha384_final T -sha384_init T -sha384_update T -sha512 T -sha512_final T -sha512_init T -sha512_update T -space_tokenize T ssh_accept T +ssh_add_channel_callbacks T +ssh_agent_close T +ssh_agent_free T ssh_agent_get_first_ident T ssh_agent_get_ident_count T ssh_agent_get_next_ident T +ssh_agent_is_running T +ssh_agent_new T ssh_agent_sign_data T +ssh_agent_state_free T ssh_analyze_banner T ssh_auth_list T ssh_auth_reply_default T @@ -314,16 +98,40 @@ ssh_bind_options_set T ssh_bind_set_blocking T ssh_bind_set_callbacks T ssh_bind_set_fd T +ssh_blf_cbc_decrypt T +ssh_blf_cbc_encrypt T +ssh_blf_dec T +ssh_blf_ecb_decrypt T +ssh_blf_ecb_encrypt T +ssh_blf_enc T +ssh_blf_key T ssh_blocking_flush T +ssh_buffer_add_buffer T ssh_buffer_add_data T +ssh_buffer_add_ssh_string T +ssh_buffer_add_u16 T +ssh_buffer_add_u32 T +ssh_buffer_add_u64 T +ssh_buffer_add_u8 T +ssh_buffer_allocate T +ssh_buffer_allocate_size T ssh_buffer_free T -ssh_buffer_get_begin T +ssh_buffer_get T +ssh_buffer_get_data T ssh_buffer_get_len T +ssh_buffer_get_ssh_string T +ssh_buffer_get_u32 T +ssh_buffer_get_u64 T +ssh_buffer_get_u8 T ssh_buffer_new T ssh_buffer_pack_va T +ssh_buffer_pass_bytes T +ssh_buffer_pass_bytes_end T +ssh_buffer_prepend_data T ssh_buffer_reinit T ssh_buffer_set_secure T ssh_buffer_unpack_va T +ssh_buffer_validate_length T ssh_channel_accept_forward T ssh_channel_accept_x11 T ssh_channel_cancel_forward T @@ -351,10 +159,12 @@ ssh_channel_poll_timeout T ssh_channel_read T ssh_channel_read_nonblocking T ssh_channel_read_timeout T +ssh_channel_request_auth_agent T ssh_channel_request_env T ssh_channel_request_exec T ssh_channel_request_pty T ssh_channel_request_pty_size T +ssh_channel_request_send_break T ssh_channel_request_send_exit_signal T ssh_channel_request_send_exit_status T ssh_channel_request_send_signal T @@ -381,17 +191,47 @@ ssh_config_parse_file T ssh_connect T ssh_connect_host T ssh_connect_host_nonblocking T +ssh_connector_free T +ssh_connector_new T +ssh_connector_remove_event T +ssh_connector_set_event T +ssh_connector_set_in_channel T +ssh_connector_set_in_fd T +ssh_connector_set_out_channel T +ssh_connector_set_out_fd T ssh_copyright T ssh_crypto_finalize T ssh_crypto_init T +ssh_dh_build_k T +ssh_dh_finalize T +ssh_dh_generate_e T +ssh_dh_generate_f T +ssh_dh_generate_x T +ssh_dh_generate_y T +ssh_dh_get_current_server_publickey T +ssh_dh_get_current_server_publickey_blob T +ssh_dh_get_e T +ssh_dh_get_f T +ssh_dh_get_next_server_publickey T +ssh_dh_get_next_server_publickey_blob T +ssh_dh_import_e T +ssh_dh_import_f T +ssh_dh_import_next_pubkey_blob T +ssh_dh_import_pubkey_blob T +ssh_dh_init T ssh_dirname T ssh_disconnect T +ssh_dump_knownhost T +ssh_event_add_connector T ssh_event_add_fd T +ssh_event_add_poll T ssh_event_add_session T ssh_event_dopoll T ssh_event_free T ssh_event_new T +ssh_event_remove_connector T ssh_event_remove_fd T +ssh_event_remove_poll T ssh_event_remove_session T ssh_execute_command T ssh_execute_message_callbacks T @@ -402,6 +242,8 @@ ssh_forward_accept T ssh_forward_cancel T ssh_forward_listen T ssh_free T +ssh_generate_session_keys T +ssh_get_chacha20poly1305_cipher T ssh_get_cipher_in T ssh_get_cipher_out T ssh_get_ciphertab T @@ -410,6 +252,7 @@ ssh_get_disconnect_message T ssh_get_error T ssh_get_error_code T ssh_get_fd T +ssh_get_fingerprint_hash T ssh_get_hexa T ssh_get_hmac_in T ssh_get_hmac_out T @@ -428,6 +271,7 @@ ssh_get_pubkey_hash T ssh_get_publickey T ssh_get_publickey_hash T ssh_get_random T +ssh_get_server_publickey T ssh_get_serverbanner T ssh_get_status T ssh_get_user_home_dir T @@ -436,6 +280,8 @@ ssh_getpass T ssh_handle_key_exchange T ssh_handle_packets T ssh_handle_packets_termination T +ssh_hashbufin_add_cookie T +ssh_hashbufout_add_cookie T ssh_hmac_type_to_string T ssh_hostport T ssh_init T @@ -447,21 +293,31 @@ ssh_is_server_known T ssh_kbdint_clean T ssh_kbdint_free T ssh_kbdint_new T +ssh_keep_known_algos T +ssh_kex_get_default_methods T ssh_kex_get_description T ssh_kex_get_supported_method T ssh_kex_select_methods T +ssh_key_algorithm_allowed T ssh_key_clean T ssh_key_cmp T ssh_key_dup T ssh_key_free T +ssh_key_get_signature_algorithm T ssh_key_is_private T ssh_key_is_public T ssh_key_new T +ssh_key_signature_to_char T ssh_key_type T ssh_key_type_from_name T +ssh_key_type_from_signature_name T ssh_key_type_to_char T -ssh_knownhosts_algorithms T +ssh_key_type_to_hash T +ssh_known_hosts_get_algorithms T +ssh_known_hosts_parse_line T +ssh_knownhosts_entry_free T ssh_list_append T +ssh_list_count T ssh_list_find T ssh_list_free T ssh_list_get_iterator T @@ -470,16 +326,17 @@ ssh_list_new T ssh_list_prepend T ssh_list_remove T ssh_log T -ssh_log_cb B 8 ssh_log_common T ssh_log_function T -ssh_log_level B 4 -ssh_log_userdata B 8 ssh_lowercase T ssh_mac_ctx_init T ssh_mac_final T ssh_mac_update T +ssh_make_bignum_string T ssh_make_milliseconds T +ssh_make_sessionid T +ssh_make_string_bn T +ssh_make_string_bn_inplace T ssh_match_group T ssh_message_auth_interactive_request T ssh_message_auth_kbdint_is_response T @@ -542,9 +399,14 @@ ssh_packet_channel_open T ssh_packet_channel_open_conf T ssh_packet_channel_open_fail T ssh_packet_channel_success T +ssh_packet_decrypt T +ssh_packet_decrypt_len T ssh_packet_dh_reply T ssh_packet_disconnect_callback T +ssh_packet_encrypt T +ssh_packet_ext_info T ssh_packet_global_request T +ssh_packet_hmac_verify T ssh_packet_ignore_callback T ssh_packet_kexdh_init T ssh_packet_kexinit T @@ -552,6 +414,7 @@ ssh_packet_newkeys T ssh_packet_parse_type T ssh_packet_process T ssh_packet_register_socket_callback T +ssh_packet_send T ssh_packet_send_unimplemented T ssh_packet_service_accept T ssh_packet_service_request T @@ -574,16 +437,20 @@ ssh_pcap_file_new T ssh_pcap_file_open T ssh_pki_convert_key_to_privatekey T ssh_pki_convert_key_to_publickey T +ssh_pki_copy_cert_to_privkey T ssh_pki_do_sign T ssh_pki_do_sign_agent T +ssh_pki_export_privkey_base64 T ssh_pki_export_privkey_file T ssh_pki_export_privkey_to_pubkey T ssh_pki_export_pubkey_base64 T ssh_pki_export_pubkey_blob T ssh_pki_export_pubkey_file T -ssh_pki_export_pubkey_rsa1 T ssh_pki_export_signature_blob T ssh_pki_generate T +ssh_pki_import_cert_base64 T +ssh_pki_import_cert_blob T +ssh_pki_import_cert_file T ssh_pki_import_privkey_base64 T ssh_pki_import_privkey_file T ssh_pki_import_pubkey_base64 T @@ -593,6 +460,7 @@ ssh_pki_import_signature_blob T ssh_pki_key_ecdsa_name T ssh_pki_openssh_privkey_export T ssh_pki_openssh_privkey_import T +ssh_pki_openssh_pubkey_import T ssh_pki_signature_verify_blob T ssh_poll T ssh_poll_add_events T @@ -615,12 +483,15 @@ ssh_poll_set_callback T ssh_poll_set_events T ssh_poll_set_fd T ssh_print_bignum T +ssh_print_hash T ssh_print_hexa T ssh_privatekey_type T ssh_publickey_to_file T +ssh_remove_channel_callbacks T ssh_request_denied T ssh_request_success T ssh_reseed T +ssh_reset_error T ssh_scp_accept_request T ssh_scp_close T ssh_scp_deny_request T @@ -651,13 +522,20 @@ ssh_send_keepalive T ssh_send_kex T ssh_server_curve25519_init T ssh_server_ecdh_init T +ssh_server_init_kex T ssh_service_request T +ssh_session_export_known_hosts_entry T +ssh_session_get_known_hosts_entry T +ssh_session_has_known_hosts_entry T +ssh_session_is_known_server T +ssh_session_update_known_hosts T ssh_set_agent_channel T ssh_set_agent_socket T ssh_set_auth_methods T ssh_set_blocking T ssh_set_callbacks T ssh_set_channel_callbacks T +ssh_set_client_kex T ssh_set_counters T ssh_set_fd_except T ssh_set_fd_toread T @@ -704,6 +582,7 @@ ssh_socket_set_read_wontblock T ssh_socket_set_write_wontblock T ssh_socket_unix T ssh_socket_write T +ssh_space_tokenize T ssh_srv_pki_do_sign_sessionid T ssh_string_burn T ssh_string_copy T @@ -717,7 +596,6 @@ ssh_string_len T ssh_string_new T ssh_string_to_char T ssh_threads_finalize T -ssh_threads_get_noop T ssh_threads_get_type T ssh_threads_init T ssh_threads_set_callbacks T @@ -748,15 +626,9 @@ ssh_userauth_pubkey T ssh_userauth_publickey T ssh_userauth_publickey_auto T ssh_userauth_try_publickey T +ssh_verify_existing_algo T ssh_version T ssh_write_knownhost T -string_burn T -string_copy T -string_data T -string_fill T -string_free T -string_from_char T -string_len T -string_new T -string_to_char T -verify_existing_algo T +ssh_event_add_bind T +ssh_event_remove_bind T +ssh_mutex_lock T diff --git a/repos/libports/ports/libssh.hash b/repos/libports/ports/libssh.hash index b4c799bf7..ad58f5df2 100644 --- a/repos/libports/ports/libssh.hash +++ b/repos/libports/ports/libssh.hash @@ -1 +1 @@ -0240141d78be803b36f141bdab67a3dc18fa59d2 +4a4abe3dbedf573e4889a6b2fa4d83c73cd8fd4c diff --git a/repos/libports/ports/libssh.port b/repos/libports/ports/libssh.port index ab17cc040..4d35a0db4 100644 --- a/repos/libports/ports/libssh.port +++ b/repos/libports/ports/libssh.port @@ -1,9 +1,9 @@ LICENSE := LGPL -VERSION := 0.7.5 +VERSION := 0.8.4 DOWNLOADS := libssh.archive -URL(libssh) := https://www.libssh.org/files/0.7/libssh-0.7.5.tar.xz -SHA(libssh) := 54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095 +URL(libssh) := https://www.libssh.org/files/0.8/libssh-0.8.4.tar.xz +SHA(libssh) := 6bb07713021a8586ba2120b2c36c468dc9ac8096d043f9b1726639aa4275b81b DIR(libssh) := src/lib/libssh DIRS := include