update to libssh-0.11.1

Author: wez

libssh-rs-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libssh-rs-sys"
-version = "0.2.4"
+version = "0.2.5"
 authors = ["Wez Furlong"]
 edition = "2018"
 links = "libssh"
@@ -16,7 +16,7 @@ cc = "1.0"
 
 [dependencies]
 libz-sys = { optional=true, version = "1.1", default-features = false, features = ["libc"] }
-openssl-sys = "0.9.93"
+openssl-sys = "0.9.105"
 
 [features]
 vendored = ["libz-sys"]

libssh-rs-sys/build.rs

@@ -229,7 +229,7 @@ fn main() {
         "pki.c",
         "pki_container_openssh.c",
         "pki_crypto.c",
-        "pki_ed25519.c",
+        // "pki_ed25519.c", gcrypt only
         "pki_ed25519_common.c",
         "poll.c",
         "scp.c",

libssh-rs-sys/src/lib.rs

@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.65.1 */
+/* automatically generated by rust-bindgen 0.69.4 */
 
 #![allow(non_snake_case)]
 #![allow(non_camel_case_types)]
@@ -343,6 +343,7 @@ pub enum ssh_global_requests_e {
     SSH_GLOBAL_REQUEST_TCPIP_FORWARD = 1,
     SSH_GLOBAL_REQUEST_CANCEL_TCPIP_FORWARD = 2,
     SSH_GLOBAL_REQUEST_KEEPALIVE = 3,
+    SSH_GLOBAL_REQUEST_NO_MORE_SESSIONS = 4,
 }
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
@@ -399,6 +400,7 @@ pub type ssh_keytypes_e = ::std::os::raw::c_uint;
 pub enum ssh_keycmp_e {
     SSH_KEY_CMP_PUBLIC = 0,
     SSH_KEY_CMP_PRIVATE = 1,
+    SSH_KEY_CMP_CERTIFICATE = 2,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -424,6 +426,15 @@ pub enum _bindgen_ty_10 {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub enum ssh_control_master_options_e {
+    SSH_CONTROL_MASTER_NO = 0,
+    SSH_CONTROL_MASTER_AUTO = 1,
+    SSH_CONTROL_MASTER_YES = 2,
+    SSH_CONTROL_MASTER_ASK = 3,
+    SSH_CONTROL_MASTER_AUTOASK = 4,
+}
+#[repr(u32)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum ssh_options_e {
     SSH_OPTIONS_HOST = 0,
     SSH_OPTIONS_PORT = 1,
@@ -468,6 +479,12 @@ pub enum ssh_options_e {
     SSH_OPTIONS_REKEY_TIME = 40,
     SSH_OPTIONS_RSA_MIN_SIZE = 41,
     SSH_OPTIONS_IDENTITY_AGENT = 42,
+    SSH_OPTIONS_IDENTITIES_ONLY = 43,
+    SSH_OPTIONS_CONTROL_MASTER = 44,
+    SSH_OPTIONS_CONTROL_PATH = 45,
+    SSH_OPTIONS_CERTIFICATE = 46,
+    SSH_OPTIONS_PROXYJUMP = 47,
+    SSH_OPTIONS_PROXYJUMP_CB_LIST_APPEND = 48,
 }
 pub const SSH_SCP_WRITE: _bindgen_ty_11 = _bindgen_ty_11::SSH_SCP_WRITE;
 pub const SSH_SCP_READ: _bindgen_ty_11 = _bindgen_ty_11::SSH_SCP_READ;
@@ -524,6 +541,14 @@ extern "C" {
 extern "C" {
     pub fn ssh_channel_free(channel: ssh_channel);
 }
+extern "C" {
+    pub fn ssh_channel_get_exit_state(
+        channel: ssh_channel,
+        pexit_code: *mut u32,
+        pexit_signal: *mut *mut ::std::os::raw::c_char,
+        pcore_dumped: *mut ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn ssh_channel_get_exit_status(channel: ssh_channel) -> ::std::os::raw::c_int;
 }
@@ -634,6 +659,16 @@ extern "C" {
         rows: ::std::os::raw::c_int,
     ) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn ssh_channel_request_pty_size_modes(
+        channel: ssh_channel,
+        term: *const ::std::os::raw::c_char,
+        cols: ::std::os::raw::c_int,
+        rows: ::std::os::raw::c_int,
+        modes: *const ::std::os::raw::c_uchar,
+        modes_len: usize,
+    ) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn ssh_channel_request_shell(channel: ssh_channel) -> ::std::os::raw::c_int;
 }
@@ -801,6 +836,9 @@ extern "C" {
 extern "C" {
     pub fn ssh_get_openssh_version(session: ssh_session) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn ssh_request_no_more_sessions(session: ssh_session) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn ssh_get_server_publickey(
         session: ssh_session,
@@ -1137,6 +1175,13 @@ pub type ssh_auth_callback = ::std::option::Option<
         userdata: *mut ::std::os::raw::c_void,
     ) -> ::std::os::raw::c_int,
 >;
+#[repr(u32)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub enum ssh_file_format_e {
+    SSH_FILE_FORMAT_DEFAULT = 0,
+    SSH_FILE_FORMAT_OPENSSH = 1,
+    SSH_FILE_FORMAT_PEM = 2,
+}
 extern "C" {
     pub fn ssh_key_new() -> ssh_key;
 }
@@ -1189,6 +1234,16 @@ extern "C" {
         b64_key: *mut *mut ::std::os::raw::c_char,
     ) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn ssh_pki_export_privkey_base64_format(
+        privkey: ssh_key,
+        passphrase: *const ::std::os::raw::c_char,
+        auth_fn: ssh_auth_callback,
+        auth_data: *mut ::std::os::raw::c_void,
+        b64_key: *mut *mut ::std::os::raw::c_char,
+        format: ssh_file_format_e,
+    ) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn ssh_pki_import_privkey_file(
         filename: *const ::std::os::raw::c_char,
@@ -1207,6 +1262,16 @@ extern "C" {
         filename: *const ::std::os::raw::c_char,
     ) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn ssh_pki_export_privkey_file_format(
+        privkey: ssh_key,
+        passphrase: *const ::std::os::raw::c_char,
+        auth_fn: ssh_auth_callback,
+        auth_data: *mut ::std::os::raw::c_void,
+        filename: *const ::std::os::raw::c_char,
+        format: ssh_file_format_e,
+    ) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn ssh_pki_copy_cert_to_privkey(
         cert_key: ssh_key,
@@ -1751,6 +1816,16 @@ pub type ssh_channel_open_request_auth_agent_callback = ::std::option::Option<
         userdata: *mut ::std::os::raw::c_void,
     ) -> ssh_channel,
 >;
+pub type ssh_channel_open_request_forwarded_tcpip_callback = ::std::option::Option<
+    unsafe extern "C" fn(
+        session: ssh_session,
+        destination_address: *const ::std::os::raw::c_char,
+        destination_port: ::std::os::raw::c_int,
+        originator_address: *const ::std::os::raw::c_char,
+        originator_port: ::std::os::raw::c_int,
+        userdata: *mut ::std::os::raw::c_void,
+    ) -> ssh_channel,
+>;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct ssh_callbacks_struct {
@@ -1764,6 +1839,8 @@ pub struct ssh_callbacks_struct {
     pub global_request_function: ssh_global_request_callback,
     pub channel_open_request_x11_function: ssh_channel_open_request_x11_callback,
     pub channel_open_request_auth_agent_function: ssh_channel_open_request_auth_agent_callback,
+    pub channel_open_request_forwarded_tcpip_function:
+        ssh_channel_open_request_forwarded_tcpip_callback,
 }
 pub type ssh_callbacks = *mut ssh_callbacks_struct;
 pub type ssh_auth_password_callback = ::std::option::Option<
@@ -2021,6 +2098,21 @@ pub type ssh_channel_write_wontblock_callback = ::std::option::Option<
         userdata: *mut ::std::os::raw::c_void,
     ) -> ::std::os::raw::c_int,
 >;
+pub type ssh_channel_open_resp_callback = ::std::option::Option<
+    unsafe extern "C" fn(
+        session: ssh_session,
+        channel: ssh_channel,
+        is_success: bool,
+        userdata: *mut ::std::os::raw::c_void,
+    ),
+>;
+pub type ssh_channel_request_resp_callback = ::std::option::Option<
+    unsafe extern "C" fn(
+        session: ssh_session,
+        channel: ssh_channel,
+        userdata: *mut ::std::os::raw::c_void,
+    ),
+>;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct ssh_channel_callbacks_struct {
@@ -2041,6 +2133,8 @@ pub struct ssh_channel_callbacks_struct {
     pub channel_env_request_function: ssh_channel_env_request_callback,
     pub channel_subsystem_request_function: ssh_channel_subsystem_request_callback,
     pub channel_write_wontblock_function: ssh_channel_write_wontblock_callback,
+    pub channel_open_response_function: ssh_channel_open_resp_callback,
+    pub channel_request_response_function: ssh_channel_request_resp_callback,
 }
 pub type ssh_channel_callbacks = *mut ssh_channel_callbacks_struct;
 extern "C" {
@@ -2096,6 +2190,32 @@ extern "C" {
 extern "C" {
     pub fn ssh_get_log_callback() -> ssh_logging_callback;
 }
+pub type ssh_jump_before_connection_callback = ::std::option::Option<
+    unsafe extern "C" fn(
+        session: ssh_session,
+        userdata: *mut ::std::os::raw::c_void,
+    ) -> ::std::os::raw::c_int,
+>;
+pub type ssh_jump_verify_knownhost_callback = ::std::option::Option<
+    unsafe extern "C" fn(
+        session: ssh_session,
+        userdata: *mut ::std::os::raw::c_void,
+    ) -> ::std::os::raw::c_int,
+>;
+pub type ssh_jump_authenticate_callback = ::std::option::Option<
+    unsafe extern "C" fn(
+        session: ssh_session,
+        userdata: *mut ::std::os::raw::c_void,
+    ) -> ::std::os::raw::c_int,
+>;
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct ssh_jump_callbacks_struct {
+    pub userdata: *mut ::std::os::raw::c_void,
+    pub before_connection: ssh_jump_before_connection_callback,
+    pub verify_knownhost: ssh_jump_verify_knownhost_callback,
+    pub authenticate: ssh_jump_authenticate_callback,
+}
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum ssh_bind_options_e {
@@ -2121,6 +2241,7 @@ pub enum ssh_bind_options_e {
     SSH_BIND_OPTIONS_PROCESS_CONFIG = 19,
     SSH_BIND_OPTIONS_MODULI = 20,
     SSH_BIND_OPTIONS_RSA_MIN_SIZE = 21,
+    SSH_BIND_OPTIONS_IMPORT_KEY_STR = 22,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2406,6 +2527,13 @@ pub type sftp_request_queue = *mut sftp_request_queue_struct;
 pub type sftp_session = *mut sftp_session_struct;
 pub type sftp_status_message = *mut sftp_status_message_struct;
 pub type sftp_statvfs_t = *mut sftp_statvfs_struct;
+pub type sftp_limits_t = *mut sftp_limits_struct;
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct sftp_aio_struct {
+    _unused: [u8; 0],
+}
+pub type sftp_aio = *mut sftp_aio_struct;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct sftp_session_struct {
@@ -2420,6 +2548,7 @@ pub struct sftp_session_struct {
     pub handles: *mut *mut ::std::os::raw::c_void,
     pub ext: sftp_ext,
     pub read_packet: sftp_packet,
+    pub limits: sftp_limits_t,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2532,6 +2661,14 @@ pub struct sftp_statvfs_struct {
     pub f_flag: u64,
     pub f_namemax: u64,
 }
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct sftp_limits_struct {
+    pub max_packet_length: u64,
+    pub max_read_length: u64,
+    pub max_write_length: u64,
+    pub max_open_handles: u64,
+}
 extern "C" {
     pub fn sftp_new(session: ssh_session) -> sftp_session;
 }
@@ -2631,6 +2768,30 @@ extern "C" {
 extern "C" {
     pub fn sftp_write(file: sftp_file, buf: *const ::std::os::raw::c_void, count: usize) -> isize;
 }
+extern "C" {
+    pub fn sftp_aio_free(aio: sftp_aio);
+}
+extern "C" {
+    pub fn sftp_aio_begin_read(file: sftp_file, len: usize, aio: *mut sftp_aio) -> isize;
+}
+extern "C" {
+    pub fn sftp_aio_wait_read(
+        aio: *mut sftp_aio,
+        buf: *mut ::std::os::raw::c_void,
+        buf_size: usize,
+    ) -> isize;
+}
+extern "C" {
+    pub fn sftp_aio_begin_write(
+        file: sftp_file,
+        buf: *const ::std::os::raw::c_void,
+        len: usize,
+        aio: *mut sftp_aio,
+    ) -> isize;
+}
+extern "C" {
+    pub fn sftp_aio_wait_write(aio: *mut sftp_aio) -> isize;
+}
 extern "C" {
     pub fn sftp_seek(file: sftp_file, new_offset: u32) -> ::std::os::raw::c_int;
 }
@@ -2679,6 +2840,13 @@ extern "C" {
         attr: sftp_attributes,
     ) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn sftp_lsetstat(
+        sftp: sftp_session,
+        file: *const ::std::os::raw::c_char,
+        attr: sftp_attributes,
+    ) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn sftp_chown(
         sftp: sftp_session,
@@ -2714,6 +2882,13 @@ extern "C" {
         path: *const ::std::os::raw::c_char,
     ) -> *mut ::std::os::raw::c_char;
 }
+extern "C" {
+    pub fn sftp_hardlink(
+        sftp: sftp_session,
+        oldpath: *const ::std::os::raw::c_char,
+        newpath: *const ::std::os::raw::c_char,
+    ) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn sftp_statvfs(sftp: sftp_session, path: *const ::std::os::raw::c_char) -> sftp_statvfs_t;
 }
@@ -2726,6 +2901,12 @@ extern "C" {
 extern "C" {
     pub fn sftp_fsync(file: sftp_file) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn sftp_limits(sftp: sftp_session) -> sftp_limits_t;
+}
+extern "C" {
+    pub fn sftp_limits_free(limits: sftp_limits_t);
+}
 extern "C" {
     pub fn sftp_canonicalize_path(
         sftp: sftp_session,
@@ -2735,6 +2916,18 @@ extern "C" {
 extern "C" {
     pub fn sftp_server_version(sftp: sftp_session) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn sftp_expand_path(
+        sftp: sftp_session,
+        path: *const ::std::os::raw::c_char,
+    ) -> *mut ::std::os::raw::c_char;
+}
+extern "C" {
+    pub fn sftp_home_directory(
+        sftp: sftp_session,
+        username: *const ::std::os::raw::c_char,
+    ) -> *mut ::std::os::raw::c_char;
+}
 extern "C" {
     pub fn sftp_get_client_message(sftp: sftp_session) -> sftp_client_message;
 }