tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-23 13:55:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
keys stored in openssh format can have comments too; diff
from yonas yanfa, tweaked a bit;

ok djm

Upstream-ID: 03d48536da6e51510d73ade6fcd44ace731ceb27
This commit is contained in:
jmc@openbsd.org 2016-06-16 06:10:45 +00:00 committed by Damien Miller
parent aa37768f17
commit b6cf84b51b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssh-keygen.1
View File

@ -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> .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland .\" 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 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dt SSH-KEYGEN 1
.Os .Os
.Sh NAME .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 If the passphrase is lost or forgotten, a new key must be generated
and the corresponding public key copied to other machines. and the corresponding public key copied to other machines.
.Pp .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 there is also a comment field in the key file that is only for
convenience to the user to help identify the key. convenience to the user to help identify the key.
The comment can tell what the key is for, or whatever is useful. 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. Provides a new comment.
.It Fl c .It Fl c
Requests changing the comment in the private and public key files. 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 program will prompt for the file containing the private keys, for
the passphrase if the key has one, and for the new comment. the passphrase if the key has one, and for the new comment.
.It Fl D Ar pkcs11 .It Fl D Ar pkcs11