summaryrefslogtreecommitdiff
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2020-01-14 15:07:30 +0000
committerDamien Miller <djm@mindrot.org>2020-01-21 18:09:09 +1100
commit0d005d6372a067b59123dec8fc6dc905f2c09e1e (patch)
treec013e8ecf861ae5eb6682e90a6de568df449ecce /ssh-keygen.1
parentb8a4ca2ebfddab862f7eb1ea2a07fb9f70330429 (diff)
downloadopenssh-git-0d005d6372a067b59123dec8fc6dc905f2c09e1e.tar.gz
upstream: sync ssh-keygen.1 and ssh-keygen's usage() with each
other and reality ok markus@ OpenBSD-Commit-ID: cdf64454f2c3604c25977c944e5b6262a3bcce92
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.112
1 files changed, 6 insertions, 6 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 2e989428..125add8f 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.190 2020/01/06 07:43:28 jmc Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.191 2020/01/14 15:07:30 naddy Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: January 6 2020 $
+.Dd $Mdocdate: January 14 2020 $
.Dt SSH-KEYGEN 1
.Os
.Sh NAME
@@ -48,9 +48,9 @@
.Op Fl C Ar comment
.Op Fl f Ar output_keyfile
.Op Fl m Ar format
-.Op Fl O Ar option
.Op Fl t Cm dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa
.Op Fl N Ar new_passphrase
+.Op Fl O Ar option
.Op Fl w Ar provider
.Nm ssh-keygen
.Fl p
@@ -104,12 +104,12 @@
.Nm ssh-keygen
.Fl M Cm generate
.Op Fl O Ar option
-.Ar
+.Ar output_file
.Nm ssh-keygen
.Fl M Cm screen
-.Fl f Ar input_file
+.Op Fl f Ar input_file
.Op Fl O Ar option
-.Ar
+.Ar output_file
.Nm ssh-keygen
.Fl I Ar certificate_identity
.Fl s Ar ca_key