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

diff --git a/sshkey.c b/sshkey.c
index d987bf5a31dded90c201ff33def30d68a14212aa..e91c54f53bbd03554aca00919018c6459421be4e 100644 (file)
--- a/sshkey.c
+++ b/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.
@@ -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. */