diff options
| author |   djm <djm@openbsd.org> | 2017-08-12 06:42:52 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2017-08-12 06:42:52 +0000 |
| commit | 03bf114a0921aad3b23d355236ae6b29d6df62f3 (patch) | |
| tree | 7ad49e56d5baaa3a86adb383ae3572921f210901 /usr.bin/ssh/sshkey.c | |
| parent | Hookup ifstated and snmpd regress. Discussed with benno@ and bluhm@. (diff) | |
| download | wireguard-openbsd-03bf114a0921aad3b23d355236ae6b29d6df62f3.tar.xz wireguard-openbsd-03bf114a0921aad3b23d355236ae6b29d6df62f3.zip | |
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@
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index 8c6de18419f..2e8f36f7edd 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -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. @@ -61,7 +61,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. */ |