Skip to content

Commit 4ca2751

Browse files
JakujeJakuje
committed
Update configuration options list for OpenSSH 8.6
1 parent 69b9368 commit 4ca2751

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

‎.dev-tools/options_body‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ GSSAPIKexAlgorithms
4444
HashKnownHosts
4545
HostbasedAuthentication
4646
HostbasedKeyTypes
47+
HostbasedAcceptedAlgorithms
4748
HostKeyAlgorithms
4849
HostKeyAlias
4950
Hostname
@@ -57,14 +58,17 @@ IPQoS
5758
KbdInteractiveAuthentication
5859
KbdInteractiveDevices
5960
KexAlgorithms
61+
KnownHostsCommand
6062
LocalCommand
6163
LocalForward
6264
LogLevel
65+
LogVerbose
6366
MACs
6467
NoHostAuthenticationForLocalhost
6568
NumberOfPasswordPrompts
6669
PasswordAuthentication
6770
PermitLocalCommand
71+
PermitRemoteOpen
6872
PKCS11Provider
6973
Port
7074
PreferredAuthentications
@@ -73,6 +77,7 @@ ProxyCommand
7377
ProxyJump
7478
ProxyUseFdpass
7579
PubkeyAcceptedKeyTypes
80+
PubkeyAcceptedAlgorithms
7681
PubkeyAuthentication
7782
RekeyLimit
7883
RemoteCommand

‎templates/ssh_config.j2‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ Match {{ match["Condition"] }}
7979
{{ render_option("HashKnownHosts",match["HashKnownHosts"],true) -}}
8080
{{ render_option("HostbasedAuthentication",match["HostbasedAuthentication"],true) -}}
8181
{{ render_option("HostbasedKeyTypes",match["HostbasedKeyTypes"],true) -}}
82+
{{ render_option("HostbasedAcceptedAlgorithms",match["HostbasedAcceptedAlgorithms"],true) -}}
8283
{{ render_option("HostKeyAlgorithms",match["HostKeyAlgorithms"],true) -}}
8384
{{ render_option("HostKeyAlias",match["HostKeyAlias"],true) -}}
8485
{{ render_option("Hostname",match["Hostname"],true) -}}
@@ -92,14 +93,17 @@ Match {{ match["Condition"] }}
9293
{{ render_option("KbdInteractiveAuthentication",match["KbdInteractiveAuthentication"],true) -}}
9394
{{ render_option("KbdInteractiveDevices",match["KbdInteractiveDevices"],true) -}}
9495
{{ render_option("KexAlgorithms",match["KexAlgorithms"],true) -}}
96+
{{ render_option("KnownHostsCommand",match["KnownHostsCommand"],true) -}}
9597
{{ render_option("LocalCommand",match["LocalCommand"],true) -}}
9698
{{ render_option("LocalForward",match["LocalForward"],true) -}}
9799
{{ render_option("LogLevel",match["LogLevel"],true) -}}
100+
{{ render_option("LogVerbose",match["LogVerbose"],true) -}}
98101
{{ render_option("MACs",match["MACs"],true) -}}
99102
{{ render_option("NoHostAuthenticationForLocalhost",match["NoHostAuthenticationForLocalhost"],true) -}}
100103
{{ render_option("NumberOfPasswordPrompts",match["NumberOfPasswordPrompts"],true) -}}
101104
{{ render_option("PasswordAuthentication",match["PasswordAuthentication"],true) -}}
102105
{{ render_option("PermitLocalCommand",match["PermitLocalCommand"],true) -}}
106+
{{ render_option("PermitRemoteOpen",match["PermitRemoteOpen"],true) -}}
103107
{{ render_option("PKCS11Provider",match["PKCS11Provider"],true) -}}
104108
{{ render_option("Port",match["Port"],true) -}}
105109
{{ render_option("PreferredAuthentications",match["PreferredAuthentications"],true) -}}
@@ -108,6 +112,7 @@ Match {{ match["Condition"] }}
108112
{{ render_option("ProxyJump",match["ProxyJump"],true) -}}
109113
{{ render_option("ProxyUseFdpass",match["ProxyUseFdpass"],true) -}}
110114
{{ render_option("PubkeyAcceptedKeyTypes",match["PubkeyAcceptedKeyTypes"],true) -}}
115+
{{ render_option("PubkeyAcceptedAlgorithms",match["PubkeyAcceptedAlgorithms"],true) -}}
111116
{{ render_option("PubkeyAuthentication",match["PubkeyAuthentication"],true) -}}
112117
{{ render_option("RekeyLimit",match["RekeyLimit"],true) -}}
113118
{{ render_option("RemoteCommand",match["RemoteCommand"],true) -}}
@@ -191,6 +196,7 @@ Host {{ host["Condition"] }}
191196
{{ render_option("HashKnownHosts",host["HashKnownHosts"],true) -}}
192197
{{ render_option("HostbasedAuthentication",host["HostbasedAuthentication"],true) -}}
193198
{{ render_option("HostbasedKeyTypes",host["HostbasedKeyTypes"],true) -}}
199+
{{ render_option("HostbasedAcceptedAlgorithms",host["HostbasedAcceptedAlgorithms"],true) -}}
194200
{{ render_option("HostKeyAlgorithms",host["HostKeyAlgorithms"],true) -}}
195201
{{ render_option("HostKeyAlias",host["HostKeyAlias"],true) -}}
196202
{{ render_option("Hostname",host["Hostname"],true) -}}
@@ -204,14 +210,17 @@ Host {{ host["Condition"] }}
204210
{{ render_option("KbdInteractiveAuthentication",host["KbdInteractiveAuthentication"],true) -}}
205211
{{ render_option("KbdInteractiveDevices",host["KbdInteractiveDevices"],true) -}}
206212
{{ render_option("KexAlgorithms",host["KexAlgorithms"],true) -}}
213+
{{ render_option("KnownHostsCommand",host["KnownHostsCommand"],true) -}}
207214
{{ render_option("LocalCommand",host["LocalCommand"],true) -}}
208215
{{ render_option("LocalForward",host["LocalForward"],true) -}}
209216
{{ render_option("LogLevel",host["LogLevel"],true) -}}
217+
{{ render_option("LogVerbose",host["LogVerbose"],true) -}}
210218
{{ render_option("MACs",host["MACs"],true) -}}
211219
{{ render_option("NoHostAuthenticationForLocalhost",host["NoHostAuthenticationForLocalhost"],true) -}}
212220
{{ render_option("NumberOfPasswordPrompts",host["NumberOfPasswordPrompts"],true) -}}
213221
{{ render_option("PasswordAuthentication",host["PasswordAuthentication"],true) -}}
214222
{{ render_option("PermitLocalCommand",host["PermitLocalCommand"],true) -}}
223+
{{ render_option("PermitRemoteOpen",host["PermitRemoteOpen"],true) -}}
215224
{{ render_option("PKCS11Provider",host["PKCS11Provider"],true) -}}
216225
{{ render_option("Port",host["Port"],true) -}}
217226
{{ render_option("PreferredAuthentications",host["PreferredAuthentications"],true) -}}
@@ -220,6 +229,7 @@ Host {{ host["Condition"] }}
220229
{{ render_option("ProxyJump",host["ProxyJump"],true) -}}
221230
{{ render_option("ProxyUseFdpass",host["ProxyUseFdpass"],true) -}}
222231
{{ render_option("PubkeyAcceptedKeyTypes",host["PubkeyAcceptedKeyTypes"],true) -}}
232+
{{ render_option("PubkeyAcceptedAlgorithms",host["PubkeyAcceptedAlgorithms"],true) -}}
223233
{{ render_option("PubkeyAuthentication",host["PubkeyAuthentication"],true) -}}
224234
{{ render_option("RekeyLimit",host["RekeyLimit"],true) -}}
225235
{{ render_option("RemoteCommand",host["RemoteCommand"],true) -}}
@@ -296,6 +306,7 @@ Host {{ host["Condition"] }}
296306
{{ body_option("HashKnownHosts",ssh_HashKnownHosts) -}}
297307
{{ body_option("HostbasedAuthentication",ssh_HostbasedAuthentication) -}}
298308
{{ body_option("HostbasedKeyTypes",ssh_HostbasedKeyTypes) -}}
309+
{{ body_option("HostbasedAcceptedAlgorithms",ssh_HostbasedAcceptedAlgorithms) -}}
299310
{{ body_option("HostKeyAlgorithms",ssh_HostKeyAlgorithms) -}}
300311
{{ body_option("HostKeyAlias",ssh_HostKeyAlias) -}}
301312
{{ body_option("Hostname",ssh_Hostname) -}}
@@ -309,14 +320,17 @@ Host {{ host["Condition"] }}
309320
{{ body_option("KbdInteractiveAuthentication",ssh_KbdInteractiveAuthentication) -}}
310321
{{ body_option("KbdInteractiveDevices",ssh_KbdInteractiveDevices) -}}
311322
{{ body_option("KexAlgorithms",ssh_KexAlgorithms) -}}
323+
{{ body_option("KnownHostsCommand",ssh_KnownHostsCommand) -}}
312324
{{ body_option("LocalCommand",ssh_LocalCommand) -}}
313325
{{ body_option("LocalForward",ssh_LocalForward) -}}
314326
{{ body_option("LogLevel",ssh_LogLevel) -}}
327+
{{ body_option("LogVerbose",ssh_LogVerbose) -}}
315328
{{ body_option("MACs",ssh_MACs) -}}
316329
{{ body_option("NoHostAuthenticationForLocalhost",ssh_NoHostAuthenticationForLocalhost) -}}
317330
{{ body_option("NumberOfPasswordPrompts",ssh_NumberOfPasswordPrompts) -}}
318331
{{ body_option("PasswordAuthentication",ssh_PasswordAuthentication) -}}
319332
{{ body_option("PermitLocalCommand",ssh_PermitLocalCommand) -}}
333+
{{ body_option("PermitRemoteOpen",ssh_PermitRemoteOpen) -}}
320334
{{ body_option("PKCS11Provider",ssh_PKCS11Provider) -}}
321335
{{ body_option("Port",ssh_Port) -}}
322336
{{ body_option("PreferredAuthentications",ssh_PreferredAuthentications) -}}
@@ -325,6 +339,7 @@ Host {{ host["Condition"] }}
325339
{{ body_option("ProxyJump",ssh_ProxyJump) -}}
326340
{{ body_option("ProxyUseFdpass",ssh_ProxyUseFdpass) -}}
327341
{{ body_option("PubkeyAcceptedKeyTypes",ssh_PubkeyAcceptedKeyTypes) -}}
342+
{{ body_option("PubkeyAcceptedAlgorithms",ssh_PubkeyAcceptedAlgorithms) -}}
328343
{{ body_option("PubkeyAuthentication",ssh_PubkeyAuthentication) -}}
329344
{{ body_option("RekeyLimit",ssh_RekeyLimit) -}}
330345
{{ body_option("RemoteCommand",ssh_RemoteCommand) -}}

0 commit comments

Comments
 (0)