summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2017-05-02 17:04:09 +0000
committerDamien Miller <djm@mindrot.org>2017-05-08 09:18:05 +1000
commitf10c0d32cde2084d2a0b19bc47d80cb93e85a093 (patch)
treeca5056b4dab3e41f0cfca0055cce3de930ae7b7e
parent42b690b4fd0faef78c4d68225948b6e5c46c5163 (diff)
upstream commit
rsa1 is no longer valid; Upstream-ID: 9953d09ed9841c44b7dcf7019fa874783a709d89
-rw-r--r--ssh-keygen.113
-rw-r--r--ssh-keyscan.19
2 files changed, 8 insertions, 14 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index ee90e7e3..62499561 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 <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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 82bcb5d0..aa4a2ae8 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 <dm@lcs.mit.edu>.
.\"
@@ -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 ,