diff options
author | djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> | 2017-11-03 02:29:17 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-11-03 16:20:41 +1100 |
commit | ecbf005b8fd80b81d0c61dfc1e96fe3da6099395 (patch) | |
tree | 095daa53a74f158d75315a79e85888d9439b2fd4 /ssh.1 | |
parent | 81c9ccdbf6ddbf9bfbd6f1f775a5a7c13e47e185 (diff) |
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
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh.1,v 1.388 2017/10/25 06:19:46 jmc Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.389 2017/11/03 02:29:17 djm Exp $ |
37 | .Dd $Mdocdate: October 25 2017 $ | 37 | .Dd $Mdocdate: November 3 2017 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1482,7 +1482,7 @@ accessible by others (read/write/execute). | |||
1482 | will simply ignore a private key file if it is accessible by others. | 1482 | will simply ignore a private key file if it is accessible by others. |
1483 | It is possible to specify a passphrase when | 1483 | It is possible to specify a passphrase when |
1484 | generating the key which will be used to encrypt the | 1484 | generating the key which will be used to encrypt the |
1485 | sensitive part of this file using 3DES. | 1485 | sensitive part of this file using AES-128. |
1486 | .Pp | 1486 | .Pp |
1487 | .It Pa ~/.ssh/id_dsa.pub | 1487 | .It Pa ~/.ssh/id_dsa.pub |
1488 | .It Pa ~/.ssh/id_ecdsa.pub | 1488 | .It Pa ~/.ssh/id_ecdsa.pub |