diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-02-07 04:54:44 +0100 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-02-07 05:03:20 +0100 |
commit | d4d9e1d40514e2746f9e05335d646512ea1020c6 (patch) | |
tree | bed063bc542afb6e2972ee1476ce14a425267de6 /sshd_config.5 | |
parent | upstream: fix two PIN entry bugs on FIDO keygen: 1) it would allow more (diff) | |
download | openssh-d4d9e1d40514e2746f9e05335d646512ea1020c6.tar.xz openssh-d4d9e1d40514e2746f9e05335d646512ea1020c6.zip |
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 '')
-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 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.306 2020/02/06 22:34:58 naddy Exp $ -.Dd $Mdocdate: February 6 2020 $ +.\" $OpenBSD: sshd_config.5,v 1.307 2020/02/07 03:54:44 dtucker Exp $ +.Dd $Mdocdate: February 7 2020 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -693,7 +693,7 @@ rsa-sha2-512,rsa-sha2-256,ssh-rsa .Ed .Pp The list of available key types may also be obtained using -.Qq ssh -Q key . +.Qq ssh -Q HostbasedAcceptedKeyTypes . .It Cm HostbasedAuthentication Specifies whether rhosts or /etc/hosts.equiv authentication together with successful public key client host authentication is allowed @@ -776,7 +776,7 @@ rsa-sha2-512,rsa-sha2-256,ssh-rsa .Ed .Pp The list of available key types may also be obtained using -.Qq ssh -Q key . +.Qq ssh -Q HostKeyAlgorithms . .It Cm IgnoreRhosts Specifies that .Pa .rhosts @@ -949,7 +949,7 @@ diffie-hellman-group14-sha256 .Ed .Pp The list of available key exchange algorithms may also be obtained using -.Qq ssh -Q kex . +.Qq ssh -Q KexAlgorithms . .It Cm ListenAddress Specifies the local addresses .Xr sshd 8 @@ -1461,7 +1461,7 @@ rsa-sha2-512,rsa-sha2-256,ssh-rsa .Ed .Pp The list of available key types may also be obtained using -.Qq ssh -Q key . +.Qq ssh -Q PubkeyAcceptedKeyTypes . .It Cm PubkeyAuthOptions Sets one or more public key authentication options. Two option keywords are currently supported: |