From: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date: Fri, 3 Nov 2017 02:29:17 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_7_P1~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecbf005b8fd80b81d0c61dfc1e96fe3da6099395;p=thirdparty%2Fopenssh-portable.git

upstream commit

Private keys in PEM format have been encrypted by AES-128 for
a while (not 3DES). bz#2788 reported by Calum Mackay

OpenBSD-Commit-ID: bd33da7acbbb3c882f0a0ee56007a35ce0d8a11a
---

diff --git a/ssh.1 b/ssh.1
index dbe21831c..9de2a11bd 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.388 2017/10/25 06:19:46 jmc Exp $
-.Dd $Mdocdate: October 25 2017 $
+.\" $OpenBSD: ssh.1,v 1.389 2017/11/03 02:29:17 djm Exp $
+.Dd $Mdocdate: November 3 2017 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -1482,7 +1482,7 @@ accessible by others (read/write/execute).
 will simply ignore a private key file if it is accessible by others.
 It is possible to specify a passphrase when
 generating the key which will be used to encrypt the
-sensitive part of this file using 3DES.
+sensitive part of this file using AES-128.
 .Pp
 .It Pa ~/.ssh/id_dsa.pub
 .It Pa ~/.ssh/id_ecdsa.pub