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

upstream: mention the new vs. old key formats in the introduction

Browse Source 
and give some hints on how keys may be converted or written in the old
format.

OpenBSD-Commit-ID: 9c90a9f92eddc249e07fad1204d0e15c8aa13823
This commit is contained in:
djm@openbsd.org 2019-01-22 11:00:15 +00:00 committed by Damien Miller
parent fd8eb1383a
commit c45616a199
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ssh-keygen.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keygen.1,v 1.152 2018/12/07 03:33:18 djm Exp $ .\" $OpenBSD: ssh-keygen.1,v 1.153 2019/01/22 11:00:15 djm 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: December 7 2018 $ .Dd $Mdocdate: January 22 2019 $
.Dt SSH-KEYGEN 1 .Dt SSH-KEYGEN 1
.Os .Os
.Sh NAME .Sh NAME
@ -205,16 +205,28 @@ 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 keys stored in the newer OpenSSH format, .Nm
there is also a comment field in the key file that is only for will by default write keys in an OpenSSH-specific format.
convenience to the user to help identify the key. This format is preferred as it offers better protection for
The comment can tell what the key is for, or whatever is useful. keys at rest as well as allowing storage of key comments within
the private key file itself.
The key comment may be useful to help identify the key.
The comment is initialized to The comment is initialized to
.Dq user@host .Dq user@host
when the key is created, but can be changed using the when the key is created, but can be changed using the
.Fl c .Fl c
option. option.
.Pp .Pp
It is still possible for
.Nm
to write the previously-used PEM format private keys using the
.Fl m
flag.
This may be used when generating new keys, and existing new-format
keys may be converted using this option in conjunction with the
.Fl p
(change passphrase) flag.
.Pp
After a key is generated, instructions below detail where the keys After a key is generated, instructions below detail where the keys
should be placed to be activated. should be placed to be activated.
.Pp .Pp