summaryrefslogtreecommitdiff
path: root/authfile.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-10-24 11:46:43 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-10-24 11:46:43 +1100
commitdfb9b716500f777563a8f6f36072210fea167530 (patch)
tree7bf46a6146d4d361529499b43eb1e0be26b54a17 /authfile.c
parent98c9aec30e75ba890ed36227793e1e5ea6a23d45 (diff)
- djm@cvs.openbsd.org 2009/10/22 22:26:13
[authfile.c] switch from 3DES to AES-128 for encryption of passphrase-protected SSH protocol 2 private keys; ok several
Diffstat (limited to 'authfile.c')
-rw-r--r--authfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/authfile.c b/authfile.c
index 735c64780..22df6c64b 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfile.c,v 1.76 2006/08/03 03:34:41 deraadt Exp $ */ 1/* $OpenBSD: authfile.c,v 1.77 2009/10/22 22:26:13 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -184,7 +184,7 @@ key_save_private_pem(Key *key, const char *filename, const char *_passphrase,
184 int success = 0; 184 int success = 0;
185 int len = strlen(_passphrase); 185 int len = strlen(_passphrase);
186 u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL; 186 u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL;
187 const EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL; 187 const EVP_CIPHER *cipher = (len > 0) ? EVP_aes_128_cbc() : NULL;
188 188
189 if (len > 0 && len <= 4) { 189 if (len > 0 && len <= 4) {
190 error("passphrase too short: have %d bytes, need > 4", len); 190 error("passphrase too short: have %d bytes, need > 4", len);