View | Details | Raw Unified | Return to bug 2518
Collapse All | Expand All

(-)a/ssh_config.5 (-32 / +6 lines)
Lines 868-889 Alternately if the specified value begins with a Link Here
868
.Sq +
868
.Sq +
869
character, then the specified key types will be appended to the default set
869
character, then the specified key types will be appended to the default set
870
instead of replacing them.
870
instead of replacing them.
871
The default for this option is:
871
The default for this option is the same as for
872
.Bd -literal -offset 3n
872
.Cm HostKeyAlgorithms
873
ecdsa-sha2-nistp256-cert-v01@openssh.com,
873
option.
874
ecdsa-sha2-nistp384-cert-v01@openssh.com,
875
ecdsa-sha2-nistp521-cert-v01@openssh.com,
876
ssh-ed25519-cert-v01@openssh.com,
877
ssh-rsa-cert-v01@openssh.com,
878
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
879
ssh-ed25519,ssh-rsa
880
.Ed
881
.Pp
882
The
883
.Fl Q
884
option of
885
.Xr ssh 1
886
may be used to list supported key types.
887
.It Cm HostKeyAlgorithms
874
.It Cm HostKeyAlgorithms
888
Specifies the protocol version 2 host key algorithms
875
Specifies the protocol version 2 host key algorithms
889
that the client wants to use in order of preference.
876
that the client wants to use in order of preference.
Lines 1332-1353 Alternately if the specified value begins with a Link Here
1332
.Sq +
1319
.Sq +
1333
character, then the key types after it will be appended to the default
1320
character, then the key types after it will be appended to the default
1334
instead of replacing it.
1321
instead of replacing it.
1335
The default for this option is:
1322
The default for this option is the same as for
1336
.Bd -literal -offset 3n
1323
.Cm HostKeyAlgorithms
1337
ecdsa-sha2-nistp256-cert-v01@openssh.com,
1324
option.
1338
ecdsa-sha2-nistp384-cert-v01@openssh.com,
1339
ecdsa-sha2-nistp521-cert-v01@openssh.com,
1340
ssh-ed25519-cert-v01@openssh.com,
1341
ssh-rsa-cert-v01@openssh.com,
1342
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
1343
ssh-ed25519,ssh-rsa
1344
.Ed
1345
.Pp
1346
The
1347
.Fl Q
1348
option of
1349
.Xr ssh 1
1350
may be used to list supported key types.
1351
.It Cm PubkeyAuthentication
1325
.It Cm PubkeyAuthentication
1352
Specifies whether to try public key authentication.
1326
Specifies whether to try public key authentication.
1353
The argument to this keyword must be
1327
The argument to this keyword must be
(-)a/sshd_config.5 (-33 / +6 lines)
Lines 656-677 Alternately if the specified value begins with a Link Here
656
.Sq +
656
.Sq +
657
character, then the specified key types will be appended to the default set
657
character, then the specified key types will be appended to the default set
658
instead of replacing them.
658
instead of replacing them.
659
The default for this option is:
659
The default for this option is the same as for
660
.Bd -literal -offset 3n
660
.Cm HostKeyAlgorithms
661
ecdsa-sha2-nistp256-cert-v01@openssh.com,
661
option.
662
ecdsa-sha2-nistp384-cert-v01@openssh.com,
663
ecdsa-sha2-nistp521-cert-v01@openssh.com,
664
ssh-ed25519-cert-v01@openssh.com,
665
ssh-rsa-cert-v01@openssh.com,
666
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
667
ssh-ed25519,ssh-rsa
668
.Ed
669
.Pp
670
The
671
.Fl Q
672
option of
673
.Xr ssh 1
674
may be used to list supported key types.
675
.It Cm HostbasedAuthentication
662
.It Cm HostbasedAuthentication
676
Specifies whether rhosts or /etc/hosts.equiv authentication together
663
Specifies whether rhosts or /etc/hosts.equiv authentication together
677
with successful public key client host authentication is allowed
664
with successful public key client host authentication is allowed
Lines 1347-1368 Alternately if the specified value begins with a Link Here
1347
.Sq +
1334
.Sq +
1348
character, then the specified key types will be appended to the default set
1335
character, then the specified key types will be appended to the default set
1349
instead of replacing them.
1336
instead of replacing them.
1350
The default for this option is:
1337
The default for this option is the same as for
1351
.Bd -literal -offset 3n
1338
.Cm HostKeyAlgorithms
1352
ecdsa-sha2-nistp256-cert-v01@openssh.com,
1339
option.
1353
ecdsa-sha2-nistp384-cert-v01@openssh.com,
1354
ecdsa-sha2-nistp521-cert-v01@openssh.com,
1355
ssh-ed25519-cert-v01@openssh.com,
1356
ssh-rsa-cert-v01@openssh.com,
1357
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
1358
ssh-ed25519,ssh-rsa
1359
.Ed
1360
.Pp
1361
The
1362
.Fl Q
1363
option of
1364
.Xr ssh 1
1365
may be used to list supported key types.
1366
.It Cm PubkeyAuthentication
1340
.It Cm PubkeyAuthentication
1367
Specifies whether public key authentication is allowed.
1341
Specifies whether public key authentication is allowed.
1368
The default is
1342
The default is
1369
- 

Return to bug 2518