Skip to content

Commit d2d74ba

Browse files
committed
add missing options: PUBLICKEY_ACCEPTED_TYPES, PROCESS_CONFIG, REKEY_DATA, REKEY_TIME
1 parent 3c52ff4 commit d2d74ba

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

ssh/options.pyx

+13-15
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ cdef class Option:
4040
return self.__str__()
4141

4242

43+
# 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)/'
4344
HOST = Option.from_option(ssh_options_e.SSH_OPTIONS_HOST)
44-
USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER)
4545
PORT = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT)
4646
PORT_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_PORT_STR)
4747
FD = Option.from_option(ssh_options_e.SSH_OPTIONS_FD)
48+
USER = Option.from_option(ssh_options_e.SSH_OPTIONS_USER)
4849
SSH_DIR = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH_DIR)
4950
IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_IDENTITY)
5051
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)
5455
SSH1 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH1)
5556
SSH2 = Option.from_option(ssh_options_e.SSH_OPTIONS_SSH2)
5657
LOG_VERBOSITY = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY)
57-
LOG_VERBOSITY_STR = Option.from_option(
58-
ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR)
58+
LOG_VERBOSITY_STR = Option.from_option(ssh_options_e.SSH_OPTIONS_LOG_VERBOSITY_STR)
5959
CIPHERS_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_CIPHERS_C_S)
6060
CIPHERS_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_CIPHERS_S_C)
6161
COMPRESSION_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_C_S)
6262
COMPRESSION_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_S_C)
6363
PROXYCOMMAND = Option.from_option(ssh_options_e.SSH_OPTIONS_PROXYCOMMAND)
6464
BINDADDR = Option.from_option(ssh_options_e.SSH_OPTIONS_BINDADDR)
65-
STRICTHOSTKEYCHECK = Option.from_option(
66-
ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK)
65+
STRICTHOSTKEYCHECK = Option.from_option(ssh_options_e.SSH_OPTIONS_STRICTHOSTKEYCHECK)
6766
COMPRESSION = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION)
68-
COMPRESSION_LEVEL = Option.from_option(
69-
ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL)
67+
COMPRESSION_LEVEL = Option.from_option(ssh_options_e.SSH_OPTIONS_COMPRESSION_LEVEL)
7068
KEY_EXCHANGE = Option.from_option(ssh_options_e.SSH_OPTIONS_KEY_EXCHANGE)
7169
HOSTKEYS = Option.from_option(ssh_options_e.SSH_OPTIONS_HOSTKEYS)
72-
GSSAPI_SERVER_IDENTITY = Option.from_option(
73-
ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY)
74-
GSSAPI_CLIENT_IDENTITY = Option.from_option(
75-
ssh_options_e.SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY)
76-
GSSAPI_DELEGATE_CREDENTIALS = Option.from_option(
77-
ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS)
70+
GSSAPI_SERVER_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_SERVER_IDENTITY)
71+
GSSAPI_CLIENT_IDENTITY = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY)
72+
GSSAPI_DELEGATE_CREDENTIALS = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_DELEGATE_CREDENTIALS)
7873
HMAC_C_S = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_C_S)
7974
HMAC_S_C = Option.from_option(ssh_options_e.SSH_OPTIONS_HMAC_S_C)
8075
PASSWORD_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PASSWORD_AUTH)
8176
PUBKEY_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBKEY_AUTH)
8277
KBDINT_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_KBDINT_AUTH)
8378
GSSAPI_AUTH = Option.from_option(ssh_options_e.SSH_OPTIONS_GSSAPI_AUTH)
84-
GLOBAL_KNOWNHOSTS = Option.from_option(
85-
ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS)
79+
GLOBAL_KNOWNHOSTS = Option.from_option(ssh_options_e.SSH_OPTIONS_GLOBAL_KNOWNHOSTS)
8680
NODELAY = Option.from_option(ssh_options_e.SSH_OPTIONS_NODELAY)
81+
PUBLICKEY_ACCEPTED_TYPES = Option.from_option(ssh_options_e.SSH_OPTIONS_PUBLICKEY_ACCEPTED_TYPES)
82+
PROCESS_CONFIG = Option.from_option(ssh_options_e.SSH_OPTIONS_PROCESS_CONFIG)
83+
REKEY_DATA = Option.from_option(ssh_options_e.SSH_OPTIONS_REKEY_DATA)
84+
REKEY_TIME = Option.from_option(ssh_options_e.SSH_OPTIONS_REKEY_TIME)

0 commit comments

Comments
 (0)