Import openssh_7.8p1.orig.tar.gz

1 files changed, 9 insertions, 15 deletions

diff --git a/ssh-keygen.0 b/ssh-keygen.0
index 417e8382b..f8cc3c3e2 100644
--- a/ssh-keygen.0
+++ b/ssh-keygen.0
@@ -88,9 +88,8 @@ DESCRIPTION
              new host keys.
 
      -a rounds
-             When saving a new-format private key (i.e. an ed25519 key or when
-             the -o flag is set), this option specifies the number of KDF (key
-             derivation function) rounds used.  Higher numbers result in
+             When saving a private key this option specifies the number of KDF
+             (key derivation function) rounds used.  Higher numbers result in
              slower passphrase verification and increased resistance to brute-
              force password cracking (should the keys be stolen).
 
@@ -115,10 +114,9 @@ DESCRIPTION
              Provides a new comment.
 
      -c      Requests changing the comment in the private and public key
-             files.  This operation is only supported for 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.
+             files.  The program will prompt for the file containing the
+             private keys, for the passphrase if the key has one, and for the
+             new comment.
 
      -D pkcs11
              Download the RSA public keys provided by the PKCS#11 shared
@@ -212,7 +210,9 @@ DESCRIPTION
              conversion options.  The supported key formats are: M-bM-^@M-^\RFC4716M-bM-^@M-^]
              (RFC 4716/SSH2 public or private key), M-bM-^@M-^\PKCS8M-bM-^@M-^] (PEM PKCS8 public
              key) or M-bM-^@M-^\PEMM-bM-^@M-^] (PEM public key).  The default conversion format is
-             M-bM-^@M-^\RFC4716M-bM-^@M-^].
+             M-bM-^@M-^\RFC4716M-bM-^@M-^].  Setting a format of M-bM-^@M-^\PEMM-bM-^@M-^] when generating or updating
+             a supported private key type will cause the key to be stored in
+             the legacy PEM private key format.
 
      -N new_passphrase
              Provides the new passphrase.
@@ -289,12 +289,6 @@ DESCRIPTION
                      separated list of one or more address/netmask pairs in
                      CIDR format.
 
-     -o      Causes ssh-keygen to save private keys using the new OpenSSH
-             format rather than the more compatible PEM format.  The new
-             format has increased resistance to brute-force password cracking
-             but is not supported by versions of OpenSSH prior to 6.5.
-             Ed25519 keys always use the new private key format.
-
      -P passphrase
              Provides the (old) passphrase.
 
@@ -577,4 +571,4 @@ AUTHORS
      created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 6.2                     March 12, 2018                     OpenBSD 6.2
+OpenBSD 6.4                     August 8, 2018                     OpenBSD 6.4