[openssh-commits] [openssh] 01/06: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit ecbf005b8fd80b81d0c61dfc1e96fe3da6099395
Author: djm at openbsd.org@openbsd.org <djm at openbsd.org@openbsd.org>
Date:   Fri Nov 3 02:29:17 2017 +0000

    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
---
 ssh.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssh.1 b/ssh.1
index dbe21831..9de2a11b 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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.