diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-08-12 08:42:52 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-08-12 08:47:10 +0200 |
| commit | 0f3455356bc284d7c6f4d3c1614d31161bd5dcc2 (patch) | |
| tree | 2e7585dab537a126a6284aa9aa1166c197c42fa1 /sshkey.c | |
| parent | upstream commit (diff) | |
| download | openssh-0f3455356bc284d7c6f4d3c1614d31161bd5dcc2.tar.xz openssh-0f3455356bc284d7c6f4d3c1614d31161bd5dcc2.zip | |
upstream commit
Switch from aes256-cbc to aes256-ctr for encrypting
new-style private keys. The latter having the advantage of being supported
for no-OpenSSL builds; bz#2754 ok markus@
Upstream-ID: 54179a2afd28f93470471030567ac40431e56909
Diffstat (limited to 'sshkey.c')
| -rw-r--r-- | sshkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.55 2017/07/19 08:30:41 markus Exp $ */ +/* $OpenBSD: sshkey.c,v 1.56 2017/08/12 06:42:52 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -65,7 +65,7 @@ #define KDFNAME "bcrypt" #define AUTH_MAGIC "openssh-key-v1" #define SALT_LEN 16 -#define DEFAULT_CIPHERNAME "aes256-cbc" +#define DEFAULT_CIPHERNAME "aes256-ctr" #define DEFAULT_ROUNDS 16 /* Version identification string for SSH v1 identity files. */ |