summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshd_config.5
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2020-02-07 03:54:44 +0000
committerdtucker <dtucker@openbsd.org>2020-02-07 03:54:44 +0000
commite645c36a51927aaf60a6d285a6254716a1987c4f (patch)
tree6698e53fd1db63e9708bc6236882cf41f5cadebc /usr.bin/ssh/sshd_config.5
parentfix two PIN entry bugs on FIDO keygen: 1) it would allow more than the (diff)
downloadwireguard-openbsd-e645c36a51927aaf60a6d285a6254716a1987c4f.tar.xz
wireguard-openbsd-e645c36a51927aaf60a6d285a6254716a1987c4f.zip
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@.
Diffstat (limited to 'usr.bin/ssh/sshd_config.5')
-rw-r--r--usr.bin/ssh/sshd_config.512
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index f037f920525..cf88f2acfe2 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/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
@@ -695,7 +695,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
@@ -778,7 +778,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
@@ -951,7 +951,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
@@ -1463,7 +1463,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: