From 873d3e7d9a4707d0934fb4c4299354418f91b541 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Sun, 30 Apr 2017 23:18:44 +0000 Subject: upstream commit remove KEY_RSA1 ok markus@ Upstream-ID: 7408517b077c892a86b581e19f82a163069bf133 --- ssh-keyscan.1 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'ssh-keyscan.1') diff --git a/ssh-keyscan.1 b/ssh-keyscan.1 index d29d9d906..82bcb5d01 100644 --- a/ssh-keyscan.1 +++ b/ssh-keyscan.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keyscan.1,v 1.38 2015/11/08 23:24:03 jmc Exp $ +.\" $OpenBSD: ssh-keyscan.1,v 1.39 2017/04/30 23:18:44 djm Exp $ .\" .\" Copyright 1995, 1996 by David Mazieres . .\" @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: November 8 2015 $ +.Dd $Mdocdate: April 30 2017 $ .Dt SSH-KEYSCAN 1 .Os .Sh NAME @@ -127,11 +127,6 @@ Input format: 1.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4 .Ed .Pp -Output format for RSA1 keys: -.Bd -literal -host-or-namelist bits exponent modulus -.Ed -.Pp Output format for RSA, DSA, ECDSA, and Ed25519 keys: .Bd -literal host-or-namelist keytype base64-encoded-key -- cgit v1.2.3 From f10c0d32cde2084d2a0b19bc47d80cb93e85a093 Mon Sep 17 00:00:00 2001 From: "jmc@openbsd.org" Date: Tue, 2 May 2017 17:04:09 +0000 Subject: upstream commit rsa1 is no longer valid; Upstream-ID: 9953d09ed9841c44b7dcf7019fa874783a709d89 --- ssh-keygen.1 | 13 +++++-------- ssh-keyscan.1 | 9 +++------ 2 files changed, 8 insertions(+), 14 deletions(-) (limited to 'ssh-keyscan.1') diff --git a/ssh-keygen.1 b/ssh-keygen.1 index ee90e7e3f..624995617 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.138 2017/05/02 09:05:58 jmc Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.139 2017/05/02 17:04:09 jmc Exp $ .\" .\" Author: Tatu Ylonen .\" Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -46,7 +46,7 @@ .Nm ssh-keygen .Op Fl q .Op Fl b Ar bits -.Op Fl t Cm dsa | ecdsa | ed25519 | rsa | rsa1 +.Op Fl t Cm dsa | ecdsa | ed25519 | rsa .Op Fl N Ar new_passphrase .Op Fl C Ar comment .Op Fl f Ar output_keyfile @@ -223,7 +223,7 @@ should be placed to be activated. The options are as follows: .Bl -tag -width Ds .It Fl A -For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519) +For each of the key types (rsa, dsa, ecdsa and ed25519) for which host keys do not exist, generate the host keys with the default key file path, an empty passphrase, default bits for the key type, and default comment. @@ -557,17 +557,14 @@ section for details. Test DH group exchange candidate primes (generated using the .Fl G option) for safety. -.It Fl t Cm dsa | ecdsa | ed25519 | rsa | rsa1 +.It Fl t Cm dsa | ecdsa | ed25519 | rsa Specifies the type of key to create. The possible values are -.Dq rsa1 -for protocol version 1 and .Dq dsa , .Dq ecdsa , .Dq ed25519 , or -.Dq rsa -for protocol version 2. +.Dq rsa . .It Fl u Update a KRL. When specified with diff --git a/ssh-keyscan.1 b/ssh-keyscan.1 index 82bcb5d01..aa4a2ae83 100644 --- a/ssh-keyscan.1 +++ b/ssh-keyscan.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keyscan.1,v 1.39 2017/04/30 23:18:44 djm Exp $ +.\" $OpenBSD: ssh-keyscan.1,v 1.40 2017/05/02 17:04:09 jmc Exp $ .\" .\" Copyright 1995, 1996 by David Mazieres . .\" @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: April 30 2017 $ +.Dd $Mdocdate: May 2 2017 $ .Dt SSH-KEYSCAN 1 .Os .Sh NAME @@ -90,14 +90,11 @@ Default is 5 seconds. .It Fl t Ar type Specifies the type of the key to fetch from the scanned hosts. The possible values are -.Dq rsa1 -for protocol version 1 and .Dq dsa , .Dq ecdsa , .Dq ed25519 , or -.Dq rsa -for protocol version 2. +.Dq rsa . Multiple values may be specified by separating them with commas. The default is to fetch .Dq rsa , -- cgit v1.2.3