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
This commit is contained in:
djm@openbsd.org@openbsd.org 2017-11-03 02:29:17 +00:00 committed by Damien Miller
parent 81c9ccdbf6
commit ecbf005b8f

6
ssh.1
View File

@ -33,8 +33,8 @@
.\" (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.
.\" .\"
.\" $OpenBSD: ssh.1,v 1.388 2017/10/25 06:19:46 jmc Exp $ .\" $OpenBSD: ssh.1,v 1.389 2017/11/03 02:29:17 djm Exp $
.Dd $Mdocdate: October 25 2017 $ .Dd $Mdocdate: November 3 2017 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .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. will simply ignore a private key file if it is accessible by others.
It is possible to specify a passphrase when It is possible to specify a passphrase when
generating the key which will be used to encrypt the 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 .Pp
.It Pa ~/.ssh/id_dsa.pub .It Pa ~/.ssh/id_dsa.pub
.It Pa ~/.ssh/id_ecdsa.pub .It Pa ~/.ssh/id_ecdsa.pub