diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-06-23 12:28:31 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-06-23 12:28:31 +1000 |
commit | e5a604fdd4410e18bbb148e39c00551f6b4c3d73 (patch) | |
tree | 0206659a86c120a907ba169d254a632e5a43b0fc | |
parent | 3b9c0adaab5736a1b9f5d69a3bf471ff46b8b88f (diff) |
- (dtucker) [cipher.c] encrypt->do_encrypt inside SSH_OLD_EVP to match
-Wshadow change.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | cipher.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -13,6 +13,8 @@ | |||
13 | - dtucker@cvs.openbsd.org 2004/06/22 22:55:56 | 13 | - dtucker@cvs.openbsd.org 2004/06/22 22:55:56 |
14 | [regress/dynamic-forward.sh regress/test-exec.sh] | 14 | [regress/dynamic-forward.sh regress/test-exec.sh] |
15 | Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@ | 15 | Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@ |
16 | - (dtucker) [cipher.c] encrypt->do_encrypt inside SSH_OLD_EVP to match | ||
17 | -Wshadow change. | ||
16 | 18 | ||
17 | 20040622 | 19 | 20040622 |
18 | - (bal) [auth-passwd.c auth1.c] Clean up unused variables. | 20 | - (bal) [auth-passwd.c auth1.c] Clean up unused variables. |
@@ -1385,4 +1387,4 @@ | |||
1385 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1387 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1386 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1388 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1387 | 1389 | ||
1388 | $Id: ChangeLog,v 1.3436 2004/06/22 23:28:20 dtucker Exp $ | 1390 | $Id: ChangeLog,v 1.3437 2004/06/23 02:28:31 dtucker Exp $ |
@@ -252,7 +252,7 @@ cipher_init(CipherContext *cc, Cipher *cipher, | |||
252 | type->key_len = keylen; | 252 | type->key_len = keylen; |
253 | } | 253 | } |
254 | EVP_CipherInit(&cc->evp, type, (u_char *)key, (u_char *)iv, | 254 | EVP_CipherInit(&cc->evp, type, (u_char *)key, (u_char *)iv, |
255 | (encrypt == CIPHER_ENCRYPT)); | 255 | (do_encrypt == CIPHER_ENCRYPT)); |
256 | #else | 256 | #else |
257 | if (EVP_CipherInit(&cc->evp, type, NULL, (u_char *)iv, | 257 | if (EVP_CipherInit(&cc->evp, type, NULL, (u_char *)iv, |
258 | (do_encrypt == CIPHER_ENCRYPT)) == 0) | 258 | (do_encrypt == CIPHER_ENCRYPT)) == 0) |