diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-02-07 03:54:44 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-02-07 15:03:20 +1100 |
commit | d4d9e1d40514e2746f9e05335d646512ea1020c6 (patch) | |
tree | bed063bc542afb6e2972ee1476ce14a425267de6 /sshd_config.5 | |
parent | fd68dc27864b099b552a6d9d507ca4b83afd6a76 (diff) |
upstream: Add ssh -Q key-sig for all key and signature types.
Teach ssh -Q to accept ssh_config(5) and sshd_config(5) algorithm keywords as
an alias for the corresponding query. Man page help jmc@, ok djm@.
OpenBSD-Commit-ID: 1e110aee3db2fc4bc5bee2d893b7128fd622e0f8
Diffstat (limited to 'sshd_config.5')
-rw-r--r-- | sshd_config.5 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index 15a108676..70ccea449 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.306 2020/02/06 22:34:58 naddy Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.307 2020/02/07 03:54:44 dtucker Exp $ |
37 | .Dd $Mdocdate: February 6 2020 $ | 37 | .Dd $Mdocdate: February 7 2020 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -693,7 +693,7 @@ rsa-sha2-512,rsa-sha2-256,ssh-rsa | |||
693 | .Ed | 693 | .Ed |
694 | .Pp | 694 | .Pp |
695 | The list of available key types may also be obtained using | 695 | The list of available key types may also be obtained using |
696 | .Qq ssh -Q key . | 696 | .Qq ssh -Q HostbasedAcceptedKeyTypes . |
697 | .It Cm HostbasedAuthentication | 697 | .It Cm HostbasedAuthentication |
698 | Specifies whether rhosts or /etc/hosts.equiv authentication together | 698 | Specifies whether rhosts or /etc/hosts.equiv authentication together |
699 | with successful public key client host authentication is allowed | 699 | with successful public key client host authentication is allowed |
@@ -776,7 +776,7 @@ rsa-sha2-512,rsa-sha2-256,ssh-rsa | |||
776 | .Ed | 776 | .Ed |
777 | .Pp | 777 | .Pp |
778 | The list of available key types may also be obtained using | 778 | The list of available key types may also be obtained using |
779 | .Qq ssh -Q key . | 779 | .Qq ssh -Q HostKeyAlgorithms . |
780 | .It Cm IgnoreRhosts | 780 | .It Cm IgnoreRhosts |
781 | Specifies that | 781 | Specifies that |
782 | .Pa .rhosts | 782 | .Pa .rhosts |
@@ -949,7 +949,7 @@ diffie-hellman-group14-sha256 | |||
949 | .Ed | 949 | .Ed |
950 | .Pp | 950 | .Pp |
951 | The list of available key exchange algorithms may also be obtained using | 951 | The list of available key exchange algorithms may also be obtained using |
952 | .Qq ssh -Q kex . | 952 | .Qq ssh -Q KexAlgorithms . |
953 | .It Cm ListenAddress | 953 | .It Cm ListenAddress |
954 | Specifies the local addresses | 954 | Specifies the local addresses |
955 | .Xr sshd 8 | 955 | .Xr sshd 8 |
@@ -1461,7 +1461,7 @@ rsa-sha2-512,rsa-sha2-256,ssh-rsa | |||
1461 | .Ed | 1461 | .Ed |
1462 | .Pp | 1462 | .Pp |
1463 | The list of available key types may also be obtained using | 1463 | The list of available key types may also be obtained using |
1464 | .Qq ssh -Q key . | 1464 | .Qq ssh -Q PubkeyAcceptedKeyTypes . |
1465 | .It Cm PubkeyAuthOptions | 1465 | .It Cm PubkeyAuthOptions |
1466 | Sets one or more public key authentication options. | 1466 | Sets one or more public key authentication options. |
1467 | Two option keywords are currently supported: | 1467 | Two option keywords are currently supported: |