summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2016-06-16 06:10:46 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2016-06-16 06:10:46 +0000
commit070e1fdca8a173aaa6edd18f8d702fbfa59a39b9 (patch)
tree46f116ef9ad237ac7d07edc6b8516c61e75c1082
parent9ed98d7d27ac011aeed4236c8aa9ed2897342216 (diff)
keys stored in openssh format can have comments too;
diff from yonas yanfa, tweaked a bit; ok djm
-rw-r--r--usr.bin/ssh/ssh-keygen.19
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh-keygen.1 b/usr.bin/ssh/ssh-keygen.1
index 9835539d70a..ce2213c7802 100644
--- a/usr.bin/ssh/ssh-keygen.1
+++ b/usr.bin/ssh/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.132 2016/05/03 18:38:12 jmc Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.133 2016/06/16 06:10:45 jmc 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: May 3 2016 $
+.Dd $Mdocdate: June 16 2016 $
.Dt SSH-KEYGEN 1
.Os
.Sh NAME
@@ -207,7 +207,7 @@ There is no way to recover a lost passphrase.
If the passphrase is lost or forgotten, a new key must be generated
and the corresponding public key copied to other machines.
.Pp
-For RSA1 keys,
+For RSA1 keys and keys stored in the newer OpenSSH format,
there is also a comment field in the key file that is only for
convenience to the user to help identify the key.
The comment can tell what the key is for, or whatever is useful.
@@ -264,7 +264,8 @@ flag will be ignored.
Provides a new comment.
.It Fl c
Requests changing the comment in the private and public key files.
-This operation is only supported for RSA1 keys.
+This operation is only supported for RSA1 keys and keys stored in the
+newer OpenSSH format.
The program will prompt for the file containing the private keys, for
the passphrase if the key has one, and for the new comment.
.It Fl D Ar pkcs11