summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2020-02-07 03:54:44 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-02-07 15:03:20 +1100
commitd4d9e1d40514e2746f9e05335d646512ea1020c6 (patch)
treebed063bc542afb6e2972ee1476ce14a425267de6 /ssh.1
parentfd68dc27864b099b552a6d9d507ca4b83afd6a76 (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 'ssh.1')
-rw-r--r--ssh.112
1 files changed, 10 insertions, 2 deletions
diff --git a/ssh.1 b/ssh.1
index 971337520..60de6087a 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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: ssh.1,v 1.409 2019/12/21 20:22:34 naddy Exp $ 36.\" $OpenBSD: ssh.1,v 1.410 2020/02/07 03:54:44 dtucker Exp $
37.Dd $Mdocdate: December 21 2019 $ 37.Dd $Mdocdate: February 7 2020 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -585,10 +585,18 @@ flag),
585(certificate key types), 585(certificate key types),
586.Ar key-plain 586.Ar key-plain
587(non-certificate key types), 587(non-certificate key types),
588.Ar key-sig
589(all key types and signature algorithms),
588.Ar protocol-version 590.Ar protocol-version
589(supported SSH protocol versions), and 591(supported SSH protocol versions), and
590.Ar sig 592.Ar sig
591(supported signature algorithms). 593(supported signature algorithms).
594Alternatively, any keyword from
595.Xr ssh_config 5
596or
597.Xr sshd_config 5
598that takes an algorithm list may be used as an alias for the corresponding
599query_option.
592.Pp 600.Pp
593.It Fl q 601.It Fl q
594Quiet mode. 602Quiet mode.