tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-25 23:05:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [cipher.c] encrypt->do_encrypt inside SSH_OLD_EVP to match

Browse Source 
-Wshadow change.
This commit is contained in:
Darren Tucker 2004-06-23 12:28:31 +10:00
parent 3b9c0adaab
commit e5a604fdd4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -13,6 +13,8 @@
- dtucker@cvs.openbsd.org 2004/06/22 22:55:56 - dtucker@cvs.openbsd.org 2004/06/22 22:55:56
[regress/dynamic-forward.sh regress/test-exec.sh] [regress/dynamic-forward.sh regress/test-exec.sh]
Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@ Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@
- (dtucker) [cipher.c] encrypt->do_encrypt inside SSH_OLD_EVP to match
-Wshadow change.
20040622 20040622
- (bal) [auth-passwd.c auth1.c] Clean up unused variables. - (bal) [auth-passwd.c auth1.c] Clean up unused variables.
@ -1385,4 +1387,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3436 2004/06/22 23:28:20 dtucker Exp $ $Id: ChangeLog,v 1.3437 2004/06/23 02:28:31 dtucker Exp $

2
cipher.c
View File

@ -252,7 +252,7 @@ cipher_init(CipherContext *cc, Cipher *cipher,
type->key_len = keylen; type->key_len = keylen;
} }
EVP_CipherInit(&cc->evp, type, (u_char *)key, (u_char *)iv, EVP_CipherInit(&cc->evp, type, (u_char *)key, (u_char *)iv,
(encrypt == CIPHER_ENCRYPT)); (do_encrypt == CIPHER_ENCRYPT));
#else #else
if (EVP_CipherInit(&cc->evp, type, NULL, (u_char *)iv, if (EVP_CipherInit(&cc->evp, type, NULL, (u_char *)iv,
(do_encrypt == CIPHER_ENCRYPT)) == 0) (do_encrypt == CIPHER_ENCRYPT)) == 0)