tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Darren Tucker 2009-10-24 11:46:43 +11:00
parent 98c9aec30e
commit dfb9b71650
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -16,6 +16,10 @@
few remaining ".Tn UNIX" macros with ".Ux" ones. few remaining ".Tn UNIX" macros with ".Ux" ones.
pointed out by ratchov@, thanks! pointed out by ratchov@, thanks!
ok jmc@ ok jmc@
- 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
20091011 20091011
- (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for - (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for

4
authfile.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfile.c,v 1.76 2006/08/03 03:34:41 deraadt Exp $ */ /* $OpenBSD: authfile.c,v 1.77 2009/10/22 22:26:13 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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,
int success = 0; int success = 0;
int len = strlen(_passphrase); int len = strlen(_passphrase);
u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL; u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL;
const EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL; const EVP_CIPHER *cipher = (len > 0) ? EVP_aes_128_cbc() : NULL;
if (len > 0 && len <= 4) { if (len > 0 && len <= 4) {
error("passphrase too short: have %d bytes, need > 4", len); error("passphrase too short: have %d bytes, need > 4", len);