summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2017-11-03 02:29:18 +0000
committerDamien Miller <djm@cvs.openbsd.org>2017-11-03 02:29:18 +0000
commit813e80de6d0a081dcd7aa0c8cd55bdf0cb478da5 (patch)
treedb2a2a9a9e922f6a799ca6ee579839e60a5de5b5 /usr.bin
parentfd203d3f641cb819f7518555674f249e7b649377 (diff)
Private keys in PEM format have been encrypted by AES-128 for a while
(not 3DES). bz#2788 reported by Calum Mackay
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh.16
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index dbe21831cb2..9de2a11bdd3 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/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