diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-08-12 06:42:52 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-08-12 16:47:10 +1000 |
commit | 0f3455356bc284d7c6f4d3c1614d31161bd5dcc2 (patch) | |
tree | 2e7585dab537a126a6284aa9aa1166c197c42fa1 | |
parent | c4972d0a9bd6f898462906b4827e09b7caea2d9b (diff) |
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
-rw-r--r-- | sshkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.55 2017/07/19 08:30:41 markus Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.56 2017/08/12 06:42:52 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. | 4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. |
@@ -65,7 +65,7 @@ | |||
65 | #define KDFNAME "bcrypt" | 65 | #define KDFNAME "bcrypt" |
66 | #define AUTH_MAGIC "openssh-key-v1" | 66 | #define AUTH_MAGIC "openssh-key-v1" |
67 | #define SALT_LEN 16 | 67 | #define SALT_LEN 16 |
68 | #define DEFAULT_CIPHERNAME "aes256-cbc" | 68 | #define DEFAULT_CIPHERNAME "aes256-ctr" |
69 | #define DEFAULT_ROUNDS 16 | 69 | #define DEFAULT_ROUNDS 16 |
70 | 70 | ||
71 | /* Version identification string for SSH v1 identity files. */ | 71 | /* Version identification string for SSH v1 identity files. */ |