From 4e56082527a22dc89c22a93f1de56441aed8dc21 Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Fri, 14 Jan 2022 12:05:08 +0100 Subject: [PATCH] add missing options: PUBLICKEY_ACCEPTED_TYPES, PROCESS_CONFIG, REKEY_DATA, REKEY_TIME --- ssh/c_ssh.pxd | 6 +- ssh/options.c | 345 ++++++++++++++++++++++++++++-------------------- ssh/options.pyx | 28 ++-- 3 files changed, 220 insertions(+), 159 deletions(-) diff --git a/ssh/c_ssh.pxd b/ssh/c_ssh.pxd index 5176b65..a47ec68 100644 --- a/ssh/c_ssh.pxd +++ b/ssh/c_ssh.pxd @@ -240,7 +240,11 @@ cdef extern from "libssh/libssh.h" nogil: SSH_OPTIONS_KBDINT_AUTH, SSH_OPTIONS_GSSAPI_AUTH, SSH_OPTIONS_GLOBAL_KNOWNHOSTS, - SSH_OPTIONS_NODELAY + SSH_OPTIONS_NODELAY, + SSH_OPTIONS_PUBLICKEY_ACCEPTED_TYPES, + SSH_OPTIONS_PROCESS_CONFIG, + SSH_OPTIONS_REKEY_DATA, + SSH_OPTIONS_REKEY_TIME enum: SSH_SCP_WRITE SSH_SCP_READ diff --git a/ssh/options.c b/ssh/options.c index 234aa35..6125989 100644 --- a/ssh/options.c +++ b/ssh/options.c @@ -1241,6 +1241,8 @@ static const char __pyx_k_setstate[] = "__setstate__"; static const char __pyx_k_pyx_state[] = "__pyx_state"; static const char __pyx_k_reduce_ex[] = "__reduce_ex__"; static const char __pyx_k_KNOWNHOSTS[] = "KNOWNHOSTS"; +static const char __pyx_k_REKEY_DATA[] = "REKEY_DATA"; +static const char __pyx_k_REKEY_TIME[] = "REKEY_TIME"; static const char __pyx_k_pyx_result[] = "__pyx_result"; static const char __pyx_k_pyx_vtable[] = "__pyx_vtable__"; static const char __pyx_k_CIPHERS_C_S[] = "CIPHERS_C_S"; @@ -1260,6 +1262,7 @@ static const char __pyx_k_stringsource[] = "stringsource"; static const char __pyx_k_LOG_VERBOSITY[] = "LOG_VERBOSITY"; static const char __pyx_k_PASSWORD_AUTH[] = "PASSWORD_AUTH"; static const char __pyx_k_reduce_cython[] = "__reduce_cython__"; +static const char __pyx_k_PROCESS_CONFIG[] = "PROCESS_CONFIG"; static const char __pyx_k_COMPRESSION_C_S[] = "COMPRESSION_C_S"; static const char __pyx_k_COMPRESSION_S_C[] = "COMPRESSION_S_C"; static const char __pyx_k_pyx_PickleError[] = "__pyx_PickleError"; @@ -1272,6 +1275,7 @@ static const char __pyx_k_cline_in_traceback[] = "cline_in_traceback"; static const char __pyx_k_pyx_unpickle_Option[] = "__pyx_unpickle_Option"; static const char __pyx_k_GSSAPI_CLIENT_IDENTITY[] = "GSSAPI_CLIENT_IDENTITY"; static const char __pyx_k_GSSAPI_SERVER_IDENTITY[] = "GSSAPI_SERVER_IDENTITY"; +static const char __pyx_k_PUBLICKEY_ACCEPTED_TYPES[] = "PUBLICKEY_ACCEPTED_TYPES"; static const char __pyx_k_GSSAPI_DELEGATE_CREDENTIALS[] = "GSSAPI_DELEGATE_CREDENTIALS"; static const char __pyx_k_Incompatible_checksums_s_vs_0x80[] = "Incompatible checksums (%s vs 0x80dcc6c = (_option))"; static PyObject *__pyx_n_s_ADD_IDENTITY; @@ -1304,9 +1308,13 @@ static PyObject *__pyx_n_s_Option; static PyObject *__pyx_n_s_PASSWORD_AUTH; static PyObject *__pyx_n_s_PORT; static PyObject *__pyx_n_s_PORT_STR; +static PyObject *__pyx_n_s_PROCESS_CONFIG; static PyObject *__pyx_n_s_PROXYCOMMAND; static PyObject *__pyx_n_s_PUBKEY_AUTH; +static PyObject *__pyx_n_s_PUBLICKEY_ACCEPTED_TYPES; static PyObject *__pyx_n_s_PickleError; +static PyObject *__pyx_n_s_REKEY_DATA; +static PyObject *__pyx_n_s_REKEY_TIME; static PyObject *__pyx_n_s_SSH1; static PyObject *__pyx_n_s_SSH2; static PyObject *__pyx_n_s_SSH_DIR; @@ -2598,9 +2606,13 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_PASSWORD_AUTH, __pyx_k_PASSWORD_AUTH, sizeof(__pyx_k_PASSWORD_AUTH), 0, 0, 1, 1}, {&__pyx_n_s_PORT, __pyx_k_PORT, sizeof(__pyx_k_PORT), 0, 0, 1, 1}, {&__pyx_n_s_PORT_STR, __pyx_k_PORT_STR, sizeof(__pyx_k_PORT_STR), 0, 0, 1, 1}, + {&__pyx_n_s_PROCESS_CONFIG, __pyx_k_PROCESS_CONFIG, sizeof(__pyx_k_PROCESS_CONFIG), 0, 0, 1, 1}, {&__pyx_n_s_PROXYCOMMAND, __pyx_k_PROXYCOMMAND, sizeof(__pyx_k_PROXYCOMMAND), 0, 0, 1, 1}, {&__pyx_n_s_PUBKEY_AUTH, __pyx_k_PUBKEY_AUTH, sizeof(__pyx_k_PUBKEY_AUTH), 0, 0, 1, 1}, + {&__pyx_n_s_PUBLICKEY_ACCEPTED_TYPES, __pyx_k_PUBLICKEY_ACCEPTED_TYPES, sizeof(__pyx_k_PUBLICKEY_ACCEPTED_TYPES), 0, 0, 1, 1}, {&__pyx_n_s_PickleError, __pyx_k_PickleError, sizeof(__pyx_k_PickleError), 0, 0, 1, 1}, + {&__pyx_n_s_REKEY_DATA, __pyx_k_REKEY_DATA, sizeof(__pyx_k_REKEY_DATA), 0, 0, 1, 1}, + {&__pyx_n_s_REKEY_TIME, __pyx_k_REKEY_TIME, sizeof(__pyx_k_REKEY_TIME), 0, 0, 1, 1}, {&__pyx_n_s_SSH1, __pyx_k_SSH1, sizeof(__pyx_k_SSH1), 0, 0, 1, 1}, {&__pyx_n_s_SSH2, __pyx_k_SSH2, sizeof(__pyx_k_SSH2), 0, 0, 1, 1}, {&__pyx_n_s_SSH_DIR, __pyx_k_SSH_DIR, sizeof(__pyx_k_SSH_DIR), 0, 0, 1, 1}, @@ -2952,33 +2964,21 @@ if (!__Pyx_RefNanny) { if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error) #endif - /* "ssh/options.pyx":43 - * - * - * HOST = Option.from_option(ssh_options_e.SSH_OPTIONS_HOST) # <<<<<<<<<<<<<< - * USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER) - * PORT = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT) - */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_HOST)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 43, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_HOST, __pyx_t_1) < 0) __PYX_ERR(0, 43, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":44 * - * HOST = Option.from_option(ssh_options_e.SSH_OPTIONS_HOST) - * USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER) # <<<<<<<<<<<<<< + * # grep SSH_OPTIONS libssh/include/libssh/libssh.h | tr -d , | sed -E 's/SSH_OPTIONS_([A-Z0-9_]+)/\1 = Option.from_option(ssh_options_e.\0)/' + * HOST = Option.from_option(ssh_options_e.SSH_OPTIONS_HOST) # <<<<<<<<<<<<<< * PORT = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT) * PORT_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT_STR) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_USER)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 44, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_HOST)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 44, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_USER, __pyx_t_1) < 0) __PYX_ERR(0, 44, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_HOST, __pyx_t_1) < 0) __PYX_ERR(0, 44, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "ssh/options.pyx":45 + * # grep SSH_OPTIONS libssh/include/libssh/libssh.h | tr -d , | sed -E 's/SSH_OPTIONS_([A-Z0-9_]+)/\1 = Option.from_option(ssh_options_e.\0)/' * HOST = Option.from_option(ssh_options_e.SSH_OPTIONS_HOST) - * USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER) * PORT = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT) # <<<<<<<<<<<<<< * PORT_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT_STR) * FD = Option.from_option(ssh_options_e.SSH_OPTIONS_FD) @@ -2989,11 +2989,11 @@ if (!__Pyx_RefNanny) { __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "ssh/options.pyx":46 - * USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER) + * HOST = Option.from_option(ssh_options_e.SSH_OPTIONS_HOST) * PORT = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT) * PORT_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT_STR) # <<<<<<<<<<<<<< * FD = Option.from_option(ssh_options_e.SSH_OPTIONS_FD) - * SSH_DIR = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH_DIR) + * USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER) */ __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_PORT_STR)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 46, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -3004,8 +3004,8 @@ if (!__Pyx_RefNanny) { * PORT = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT) * PORT_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT_STR) * FD = Option.from_option(ssh_options_e.SSH_OPTIONS_FD) # <<<<<<<<<<<<<< + * USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER) * SSH_DIR = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH_DIR) - * IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_IDENTITY) */ __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_FD)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 47, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -3015,126 +3015,138 @@ if (!__Pyx_RefNanny) { /* "ssh/options.pyx":48 * PORT_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT_STR) * FD = Option.from_option(ssh_options_e.SSH_OPTIONS_FD) - * SSH_DIR = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH_DIR) # <<<<<<<<<<<<<< + * USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER) # <<<<<<<<<<<<<< + * SSH_DIR = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH_DIR) * IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_IDENTITY) - * ADD_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_ADD_IDENTITY) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_SSH_DIR)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 48, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_USER)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 48, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_SSH_DIR, __pyx_t_1) < 0) __PYX_ERR(0, 48, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_USER, __pyx_t_1) < 0) __PYX_ERR(0, 48, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "ssh/options.pyx":49 * FD = Option.from_option(ssh_options_e.SSH_OPTIONS_FD) + * USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER) + * SSH_DIR = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH_DIR) # <<<<<<<<<<<<<< + * IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_IDENTITY) + * ADD_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_ADD_IDENTITY) + */ + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_SSH_DIR)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 49, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_SSH_DIR, __pyx_t_1) < 0) __PYX_ERR(0, 49, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "ssh/options.pyx":50 + * USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER) * SSH_DIR = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH_DIR) * IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_IDENTITY) # <<<<<<<<<<<<<< * ADD_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_ADD_IDENTITY) * KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_KNOWNHOSTS) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_IDENTITY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 49, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_IDENTITY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 50, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_IDENTITY, __pyx_t_1) < 0) __PYX_ERR(0, 49, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_IDENTITY, __pyx_t_1) < 0) __PYX_ERR(0, 50, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":50 + /* "ssh/options.pyx":51 * SSH_DIR = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH_DIR) * IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_IDENTITY) * ADD_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_ADD_IDENTITY) # <<<<<<<<<<<<<< * KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_KNOWNHOSTS) * TIMEOUT = Option.from_option(ssh_options_e.SSH_OPTIONS_TIMEOUT) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_ADD_IDENTITY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 50, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_ADD_IDENTITY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 51, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_ADD_IDENTITY, __pyx_t_1) < 0) __PYX_ERR(0, 50, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_ADD_IDENTITY, __pyx_t_1) < 0) __PYX_ERR(0, 51, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":51 + /* "ssh/options.pyx":52 * IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_IDENTITY) * ADD_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_ADD_IDENTITY) * KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_KNOWNHOSTS) # <<<<<<<<<<<<<< * TIMEOUT = Option.from_option(ssh_options_e.SSH_OPTIONS_TIMEOUT) * TIMEOUT_USEC = Option.from_option(ssh_options_e.SSH_OPTIONS_TIMEOUT_USEC) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_KNOWNHOSTS)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 51, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_KNOWNHOSTS)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 52, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_KNOWNHOSTS, __pyx_t_1) < 0) __PYX_ERR(0, 51, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_KNOWNHOSTS, __pyx_t_1) < 0) __PYX_ERR(0, 52, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":52 + /* "ssh/options.pyx":53 * ADD_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_ADD_IDENTITY) * KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_KNOWNHOSTS) * TIMEOUT = Option.from_option(ssh_options_e.SSH_OPTIONS_TIMEOUT) # <<<<<<<<<<<<<< * TIMEOUT_USEC = Option.from_option(ssh_options_e.SSH_OPTIONS_TIMEOUT_USEC) * SSH1 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH1) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_TIMEOUT)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 52, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_TIMEOUT)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 53, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_TIMEOUT, __pyx_t_1) < 0) __PYX_ERR(0, 52, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_TIMEOUT, __pyx_t_1) < 0) __PYX_ERR(0, 53, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":53 + /* "ssh/options.pyx":54 * KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_KNOWNHOSTS) * TIMEOUT = Option.from_option(ssh_options_e.SSH_OPTIONS_TIMEOUT) * TIMEOUT_USEC = Option.from_option(ssh_options_e.SSH_OPTIONS_TIMEOUT_USEC) # <<<<<<<<<<<<<< * SSH1 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH1) * SSH2 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH2) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_TIMEOUT_USEC)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 53, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_TIMEOUT_USEC)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 54, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_TIMEOUT_USEC, __pyx_t_1) < 0) __PYX_ERR(0, 53, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_TIMEOUT_USEC, __pyx_t_1) < 0) __PYX_ERR(0, 54, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":54 + /* "ssh/options.pyx":55 * TIMEOUT = Option.from_option(ssh_options_e.SSH_OPTIONS_TIMEOUT) * TIMEOUT_USEC = Option.from_option(ssh_options_e.SSH_OPTIONS_TIMEOUT_USEC) * SSH1 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH1) # <<<<<<<<<<<<<< * SSH2 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH2) * LOG_VERBOSITY = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_SSH1)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 54, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_SSH1)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 55, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_SSH1, __pyx_t_1) < 0) __PYX_ERR(0, 54, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_SSH1, __pyx_t_1) < 0) __PYX_ERR(0, 55, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":55 + /* "ssh/options.pyx":56 * TIMEOUT_USEC = Option.from_option(ssh_options_e.SSH_OPTIONS_TIMEOUT_USEC) * SSH1 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH1) * SSH2 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH2) # <<<<<<<<<<<<<< * LOG_VERBOSITY = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY) - * LOG_VERBOSITY_STR = Option.from_option( + * LOG_VERBOSITY_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_SSH2)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 55, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_SSH2)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 56, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_SSH2, __pyx_t_1) < 0) __PYX_ERR(0, 55, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_SSH2, __pyx_t_1) < 0) __PYX_ERR(0, 56, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":56 + /* "ssh/options.pyx":57 * SSH1 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH1) * SSH2 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH2) * LOG_VERBOSITY = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY) # <<<<<<<<<<<<<< - * LOG_VERBOSITY_STR = Option.from_option( - * ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR) + * LOG_VERBOSITY_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR) + * CIPHERS_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_CIPHERS_C_S) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_LOG_VERBOSITY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 56, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_LOG_VERBOSITY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 57, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_LOG_VERBOSITY, __pyx_t_1) < 0) __PYX_ERR(0, 56, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_LOG_VERBOSITY, __pyx_t_1) < 0) __PYX_ERR(0, 57, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":57 + /* "ssh/options.pyx":58 * SSH2 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH2) * LOG_VERBOSITY = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY) - * LOG_VERBOSITY_STR = Option.from_option( # <<<<<<<<<<<<<< - * ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR) + * LOG_VERBOSITY_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR) # <<<<<<<<<<<<<< * CIPHERS_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_CIPHERS_C_S) + * CIPHERS_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_CIPHERS_S_C) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_LOG_VERBOSITY_STR)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 57, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_LOG_VERBOSITY_STR)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 58, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_LOG_VERBOSITY_STR, __pyx_t_1) < 0) __PYX_ERR(0, 57, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_LOG_VERBOSITY_STR, __pyx_t_1) < 0) __PYX_ERR(0, 58, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "ssh/options.pyx":59 - * LOG_VERBOSITY_STR = Option.from_option( - * ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR) + * LOG_VERBOSITY = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY) + * LOG_VERBOSITY_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR) * CIPHERS_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_CIPHERS_C_S) # <<<<<<<<<<<<<< * CIPHERS_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_CIPHERS_S_C) * COMPRESSION_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_C_S) @@ -3145,7 +3157,7 @@ if (!__Pyx_RefNanny) { __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "ssh/options.pyx":60 - * ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR) + * LOG_VERBOSITY_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR) * CIPHERS_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_CIPHERS_C_S) * CIPHERS_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_CIPHERS_S_C) # <<<<<<<<<<<<<< * COMPRESSION_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_C_S) @@ -3185,7 +3197,7 @@ if (!__Pyx_RefNanny) { * COMPRESSION_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_S_C) * PROXYCOMMAND = Option.from_option(ssh_options_e.SSH_OPTIONS_PROXYCOMMAND) # <<<<<<<<<<<<<< * BINDADDR = Option.from_option(ssh_options_e.SSH_OPTIONS_BINDADDR) - * STRICTHOSTKEYCHECK = Option.from_option( + * STRICTHOSTKEYCHECK = Option.from_option(ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK) */ __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_PROXYCOMMAND)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 63, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -3196,8 +3208,8 @@ if (!__Pyx_RefNanny) { * COMPRESSION_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_S_C) * PROXYCOMMAND = Option.from_option(ssh_options_e.SSH_OPTIONS_PROXYCOMMAND) * BINDADDR = Option.from_option(ssh_options_e.SSH_OPTIONS_BINDADDR) # <<<<<<<<<<<<<< - * STRICTHOSTKEYCHECK = Option.from_option( - * ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK) + * STRICTHOSTKEYCHECK = Option.from_option(ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK) + * COMPRESSION = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION) */ __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_BINDADDR)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 64, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -3207,191 +3219,238 @@ if (!__Pyx_RefNanny) { /* "ssh/options.pyx":65 * PROXYCOMMAND = Option.from_option(ssh_options_e.SSH_OPTIONS_PROXYCOMMAND) * BINDADDR = Option.from_option(ssh_options_e.SSH_OPTIONS_BINDADDR) - * STRICTHOSTKEYCHECK = Option.from_option( # <<<<<<<<<<<<<< - * ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK) + * STRICTHOSTKEYCHECK = Option.from_option(ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK) # <<<<<<<<<<<<<< * COMPRESSION = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION) + * COMPRESSION_LEVEL = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL) */ __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_STRICTHOSTKEYCHECK)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); if (PyDict_SetItem(__pyx_d, __pyx_n_s_STRICTHOSTKEYCHECK, __pyx_t_1) < 0) __PYX_ERR(0, 65, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":67 - * STRICTHOSTKEYCHECK = Option.from_option( - * ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK) + /* "ssh/options.pyx":66 + * BINDADDR = Option.from_option(ssh_options_e.SSH_OPTIONS_BINDADDR) + * STRICTHOSTKEYCHECK = Option.from_option(ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK) * COMPRESSION = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION) # <<<<<<<<<<<<<< - * COMPRESSION_LEVEL = Option.from_option( - * ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL) + * COMPRESSION_LEVEL = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL) + * KEY_EXCHANGE = Option.from_option(ssh_options_e.SSH_OPTIONS_KEY_EXCHANGE) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_COMPRESSION)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 67, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_COMPRESSION)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_COMPRESSION, __pyx_t_1) < 0) __PYX_ERR(0, 67, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_COMPRESSION, __pyx_t_1) < 0) __PYX_ERR(0, 66, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":68 - * ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK) + /* "ssh/options.pyx":67 + * STRICTHOSTKEYCHECK = Option.from_option(ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK) * COMPRESSION = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION) - * COMPRESSION_LEVEL = Option.from_option( # <<<<<<<<<<<<<< - * ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL) + * COMPRESSION_LEVEL = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL) # <<<<<<<<<<<<<< * KEY_EXCHANGE = Option.from_option(ssh_options_e.SSH_OPTIONS_KEY_EXCHANGE) + * HOSTKEYS = Option.from_option(ssh_options_e.SSH_OPTIONS_HOSTKEYS) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_COMPRESSION_LEVEL)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 68, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_COMPRESSION_LEVEL)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 67, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_COMPRESSION_LEVEL, __pyx_t_1) < 0) __PYX_ERR(0, 68, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_COMPRESSION_LEVEL, __pyx_t_1) < 0) __PYX_ERR(0, 67, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":70 - * COMPRESSION_LEVEL = Option.from_option( - * ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL) + /* "ssh/options.pyx":68 + * COMPRESSION = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION) + * COMPRESSION_LEVEL = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL) * KEY_EXCHANGE = Option.from_option(ssh_options_e.SSH_OPTIONS_KEY_EXCHANGE) # <<<<<<<<<<<<<< * HOSTKEYS = Option.from_option(ssh_options_e.SSH_OPTIONS_HOSTKEYS) - * GSSAPI_SERVER_IDENTITY = Option.from_option( + * GSSAPI_SERVER_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_KEY_EXCHANGE)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 70, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_KEY_EXCHANGE)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 68, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_KEY_EXCHANGE, __pyx_t_1) < 0) __PYX_ERR(0, 70, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_KEY_EXCHANGE, __pyx_t_1) < 0) __PYX_ERR(0, 68, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":71 - * ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL) + /* "ssh/options.pyx":69 + * COMPRESSION_LEVEL = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL) * KEY_EXCHANGE = Option.from_option(ssh_options_e.SSH_OPTIONS_KEY_EXCHANGE) * HOSTKEYS = Option.from_option(ssh_options_e.SSH_OPTIONS_HOSTKEYS) # <<<<<<<<<<<<<< - * GSSAPI_SERVER_IDENTITY = Option.from_option( - * ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY) + * GSSAPI_SERVER_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY) + * GSSAPI_CLIENT_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_HOSTKEYS)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 71, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_HOSTKEYS)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 69, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_HOSTKEYS, __pyx_t_1) < 0) __PYX_ERR(0, 71, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_HOSTKEYS, __pyx_t_1) < 0) __PYX_ERR(0, 69, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":72 + /* "ssh/options.pyx":70 * KEY_EXCHANGE = Option.from_option(ssh_options_e.SSH_OPTIONS_KEY_EXCHANGE) * HOSTKEYS = Option.from_option(ssh_options_e.SSH_OPTIONS_HOSTKEYS) - * GSSAPI_SERVER_IDENTITY = Option.from_option( # <<<<<<<<<<<<<< - * ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY) - * GSSAPI_CLIENT_IDENTITY = Option.from_option( + * GSSAPI_SERVER_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY) # <<<<<<<<<<<<<< + * GSSAPI_CLIENT_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY) + * GSSAPI_DELEGATE_CREDENTIALS = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_GSSAPI_SERVER_IDENTITY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 72, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_GSSAPI_SERVER_IDENTITY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 70, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_GSSAPI_SERVER_IDENTITY, __pyx_t_1) < 0) __PYX_ERR(0, 72, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_GSSAPI_SERVER_IDENTITY, __pyx_t_1) < 0) __PYX_ERR(0, 70, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":74 - * GSSAPI_SERVER_IDENTITY = Option.from_option( - * ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY) - * GSSAPI_CLIENT_IDENTITY = Option.from_option( # <<<<<<<<<<<<<< - * ssh_options_e.SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY) - * GSSAPI_DELEGATE_CREDENTIALS = Option.from_option( + /* "ssh/options.pyx":71 + * HOSTKEYS = Option.from_option(ssh_options_e.SSH_OPTIONS_HOSTKEYS) + * GSSAPI_SERVER_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY) + * GSSAPI_CLIENT_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY) # <<<<<<<<<<<<<< + * GSSAPI_DELEGATE_CREDENTIALS = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS) + * HMAC_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_C_S) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 74, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 71, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_GSSAPI_CLIENT_IDENTITY, __pyx_t_1) < 0) __PYX_ERR(0, 74, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_GSSAPI_CLIENT_IDENTITY, __pyx_t_1) < 0) __PYX_ERR(0, 71, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":76 - * GSSAPI_CLIENT_IDENTITY = Option.from_option( - * ssh_options_e.SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY) - * GSSAPI_DELEGATE_CREDENTIALS = Option.from_option( # <<<<<<<<<<<<<< - * ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS) + /* "ssh/options.pyx":72 + * GSSAPI_SERVER_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY) + * GSSAPI_CLIENT_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY) + * GSSAPI_DELEGATE_CREDENTIALS = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS) # <<<<<<<<<<<<<< * HMAC_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_C_S) + * HMAC_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_S_C) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 76, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 72, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_GSSAPI_DELEGATE_CREDENTIALS, __pyx_t_1) < 0) __PYX_ERR(0, 76, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_GSSAPI_DELEGATE_CREDENTIALS, __pyx_t_1) < 0) __PYX_ERR(0, 72, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":78 - * GSSAPI_DELEGATE_CREDENTIALS = Option.from_option( - * ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS) + /* "ssh/options.pyx":73 + * GSSAPI_CLIENT_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY) + * GSSAPI_DELEGATE_CREDENTIALS = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS) * HMAC_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_C_S) # <<<<<<<<<<<<<< * HMAC_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_S_C) * PASSWORD_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PASSWORD_AUTH) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_HMAC_C_S)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 78, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_HMAC_C_S)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 73, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_HMAC_C_S, __pyx_t_1) < 0) __PYX_ERR(0, 78, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_HMAC_C_S, __pyx_t_1) < 0) __PYX_ERR(0, 73, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":79 - * ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS) + /* "ssh/options.pyx":74 + * GSSAPI_DELEGATE_CREDENTIALS = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS) * HMAC_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_C_S) * HMAC_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_S_C) # <<<<<<<<<<<<<< * PASSWORD_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PASSWORD_AUTH) * PUBKEY_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBKEY_AUTH) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_HMAC_S_C)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 79, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_HMAC_S_C)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 74, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_HMAC_S_C, __pyx_t_1) < 0) __PYX_ERR(0, 79, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_HMAC_S_C, __pyx_t_1) < 0) __PYX_ERR(0, 74, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":80 + /* "ssh/options.pyx":75 * HMAC_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_C_S) * HMAC_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_S_C) * PASSWORD_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PASSWORD_AUTH) # <<<<<<<<<<<<<< * PUBKEY_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBKEY_AUTH) * KBDINT_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_KBDINT_AUTH) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_PASSWORD_AUTH)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 80, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_PASSWORD_AUTH)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 75, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_PASSWORD_AUTH, __pyx_t_1) < 0) __PYX_ERR(0, 80, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_PASSWORD_AUTH, __pyx_t_1) < 0) __PYX_ERR(0, 75, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":81 + /* "ssh/options.pyx":76 * HMAC_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_S_C) * PASSWORD_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PASSWORD_AUTH) * PUBKEY_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBKEY_AUTH) # <<<<<<<<<<<<<< * KBDINT_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_KBDINT_AUTH) * GSSAPI_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_AUTH) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_PUBKEY_AUTH)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 81, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_PUBKEY_AUTH)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 76, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_PUBKEY_AUTH, __pyx_t_1) < 0) __PYX_ERR(0, 81, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_PUBKEY_AUTH, __pyx_t_1) < 0) __PYX_ERR(0, 76, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":82 + /* "ssh/options.pyx":77 * PASSWORD_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PASSWORD_AUTH) * PUBKEY_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBKEY_AUTH) * KBDINT_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_KBDINT_AUTH) # <<<<<<<<<<<<<< * GSSAPI_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_AUTH) - * GLOBAL_KNOWNHOSTS = Option.from_option( + * GLOBAL_KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_KBDINT_AUTH)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 82, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_KBDINT_AUTH)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 77, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_KBDINT_AUTH, __pyx_t_1) < 0) __PYX_ERR(0, 82, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_KBDINT_AUTH, __pyx_t_1) < 0) __PYX_ERR(0, 77, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":83 + /* "ssh/options.pyx":78 * PUBKEY_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBKEY_AUTH) * KBDINT_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_KBDINT_AUTH) * GSSAPI_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_AUTH) # <<<<<<<<<<<<<< - * GLOBAL_KNOWNHOSTS = Option.from_option( - * ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS) + * GLOBAL_KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS) + * NODELAY = Option.from_option(ssh_options_e.SSH_OPTIONS_NODELAY) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_GSSAPI_AUTH)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 83, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_GSSAPI_AUTH)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 78, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_GSSAPI_AUTH, __pyx_t_1) < 0) __PYX_ERR(0, 83, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_GSSAPI_AUTH, __pyx_t_1) < 0) __PYX_ERR(0, 78, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":84 + /* "ssh/options.pyx":79 * KBDINT_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_KBDINT_AUTH) * GSSAPI_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_AUTH) - * GLOBAL_KNOWNHOSTS = Option.from_option( # <<<<<<<<<<<<<< - * ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS) + * GLOBAL_KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS) # <<<<<<<<<<<<<< * NODELAY = Option.from_option(ssh_options_e.SSH_OPTIONS_NODELAY) + * PUBLICKEY_ACCEPTED_TYPES = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBLICKEY_ACCEPTED_TYPES) */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_GLOBAL_KNOWNHOSTS)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 84, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_GLOBAL_KNOWNHOSTS)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 79, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_GLOBAL_KNOWNHOSTS, __pyx_t_1) < 0) __PYX_ERR(0, 84, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_GLOBAL_KNOWNHOSTS, __pyx_t_1) < 0) __PYX_ERR(0, 79, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "ssh/options.pyx":86 - * GLOBAL_KNOWNHOSTS = Option.from_option( - * ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS) + /* "ssh/options.pyx":80 + * GSSAPI_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_AUTH) + * GLOBAL_KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS) * NODELAY = Option.from_option(ssh_options_e.SSH_OPTIONS_NODELAY) # <<<<<<<<<<<<<< + * PUBLICKEY_ACCEPTED_TYPES = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBLICKEY_ACCEPTED_TYPES) + * PROCESS_CONFIG = Option.from_option(ssh_options_e.SSH_OPTIONS_PROCESS_CONFIG) + */ + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_NODELAY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 80, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_NODELAY, __pyx_t_1) < 0) __PYX_ERR(0, 80, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "ssh/options.pyx":81 + * GLOBAL_KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS) + * NODELAY = Option.from_option(ssh_options_e.SSH_OPTIONS_NODELAY) + * PUBLICKEY_ACCEPTED_TYPES = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBLICKEY_ACCEPTED_TYPES) # <<<<<<<<<<<<<< + * PROCESS_CONFIG = Option.from_option(ssh_options_e.SSH_OPTIONS_PROCESS_CONFIG) + * REKEY_DATA = Option.from_option(ssh_options_e.SSH_OPTIONS_REKEY_DATA) + */ + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_PUBLICKEY_ACCEPTED_TYPES)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 81, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_PUBLICKEY_ACCEPTED_TYPES, __pyx_t_1) < 0) __PYX_ERR(0, 81, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "ssh/options.pyx":82 + * NODELAY = Option.from_option(ssh_options_e.SSH_OPTIONS_NODELAY) + * PUBLICKEY_ACCEPTED_TYPES = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBLICKEY_ACCEPTED_TYPES) + * PROCESS_CONFIG = Option.from_option(ssh_options_e.SSH_OPTIONS_PROCESS_CONFIG) # <<<<<<<<<<<<<< + * REKEY_DATA = Option.from_option(ssh_options_e.SSH_OPTIONS_REKEY_DATA) + * REKEY_TIME = Option.from_option(ssh_options_e.SSH_OPTIONS_REKEY_TIME) + */ + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_PROCESS_CONFIG)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 82, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_PROCESS_CONFIG, __pyx_t_1) < 0) __PYX_ERR(0, 82, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "ssh/options.pyx":83 + * PUBLICKEY_ACCEPTED_TYPES = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBLICKEY_ACCEPTED_TYPES) + * PROCESS_CONFIG = Option.from_option(ssh_options_e.SSH_OPTIONS_PROCESS_CONFIG) + * REKEY_DATA = Option.from_option(ssh_options_e.SSH_OPTIONS_REKEY_DATA) # <<<<<<<<<<<<<< + * REKEY_TIME = Option.from_option(ssh_options_e.SSH_OPTIONS_REKEY_TIME) + */ + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_REKEY_DATA)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 83, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_REKEY_DATA, __pyx_t_1) < 0) __PYX_ERR(0, 83, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "ssh/options.pyx":84 + * PROCESS_CONFIG = Option.from_option(ssh_options_e.SSH_OPTIONS_PROCESS_CONFIG) + * REKEY_DATA = Option.from_option(ssh_options_e.SSH_OPTIONS_REKEY_DATA) + * REKEY_TIME = Option.from_option(ssh_options_e.SSH_OPTIONS_REKEY_TIME) # <<<<<<<<<<<<<< */ - __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_NODELAY)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 86, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)__pyx_f_3ssh_7options_6Option_from_option(SSH_OPTIONS_REKEY_TIME)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 84, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_NODELAY, __pyx_t_1) < 0) __PYX_ERR(0, 86, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_REKEY_TIME, __pyx_t_1) < 0) __PYX_ERR(0, 84, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "(tree fragment)":1 diff --git a/ssh/options.pyx b/ssh/options.pyx index 375a5fe..3d65a4b 100644 --- a/ssh/options.pyx +++ b/ssh/options.pyx @@ -40,11 +40,12 @@ cdef class Option: return self.__str__() +# grep SSH_OPTIONS libssh/include/libssh/libssh.h | tr -d , | sed -E 's/SSH_OPTIONS_([A-Z0-9_]+)/\1 = Option.from_option(ssh_options_e.\0)/' HOST = Option.from_option(ssh_options_e.SSH_OPTIONS_HOST) -USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER) PORT = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT) PORT_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT_STR) FD = Option.from_option(ssh_options_e.SSH_OPTIONS_FD) +USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER) SSH_DIR = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH_DIR) IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_IDENTITY) ADD_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_ADD_IDENTITY) @@ -54,33 +55,30 @@ TIMEOUT_USEC = Option.from_option(ssh_options_e.SSH_OPTIONS_TIMEOUT_USEC) SSH1 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH1) SSH2 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH2) LOG_VERBOSITY = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY) -LOG_VERBOSITY_STR = Option.from_option( - ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR) +LOG_VERBOSITY_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR) CIPHERS_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_CIPHERS_C_S) CIPHERS_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_CIPHERS_S_C) COMPRESSION_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_C_S) COMPRESSION_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_S_C) PROXYCOMMAND = Option.from_option(ssh_options_e.SSH_OPTIONS_PROXYCOMMAND) BINDADDR = Option.from_option(ssh_options_e.SSH_OPTIONS_BINDADDR) -STRICTHOSTKEYCHECK = Option.from_option( - ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK) +STRICTHOSTKEYCHECK = Option.from_option(ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK) COMPRESSION = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION) -COMPRESSION_LEVEL = Option.from_option( - ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL) +COMPRESSION_LEVEL = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL) KEY_EXCHANGE = Option.from_option(ssh_options_e.SSH_OPTIONS_KEY_EXCHANGE) HOSTKEYS = Option.from_option(ssh_options_e.SSH_OPTIONS_HOSTKEYS) -GSSAPI_SERVER_IDENTITY = Option.from_option( - ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY) -GSSAPI_CLIENT_IDENTITY = Option.from_option( - ssh_options_e.SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY) -GSSAPI_DELEGATE_CREDENTIALS = Option.from_option( - ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS) +GSSAPI_SERVER_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY) +GSSAPI_CLIENT_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY) +GSSAPI_DELEGATE_CREDENTIALS = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS) HMAC_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_C_S) HMAC_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_S_C) PASSWORD_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PASSWORD_AUTH) PUBKEY_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBKEY_AUTH) KBDINT_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_KBDINT_AUTH) GSSAPI_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_AUTH) -GLOBAL_KNOWNHOSTS = Option.from_option( - ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS) +GLOBAL_KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS) NODELAY = Option.from_option(ssh_options_e.SSH_OPTIONS_NODELAY) +PUBLICKEY_ACCEPTED_TYPES = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBLICKEY_ACCEPTED_TYPES) +PROCESS_CONFIG = Option.from_option(ssh_options_e.SSH_OPTIONS_PROCESS_CONFIG) +REKEY_DATA = Option.from_option(ssh_options_e.SSH_OPTIONS_REKEY_DATA) +REKEY_TIME = Option.from_option(ssh_options_e.SSH_OPTIONS_REKEY_TIME)