diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | cipher.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -13,6 +13,8 @@ - dtucker@cvs.openbsd.org 2004/06/22 22:55:56 [regress/dynamic-forward.sh regress/test-exec.sh] 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 - (bal) [auth-passwd.c auth1.c] Clean up unused variables. @@ -1385,4 +1387,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (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 $ @@ -252,7 +252,7 @@ cipher_init(CipherContext *cc, Cipher *cipher, type->key_len = keylen; } EVP_CipherInit(&cc->evp, type, (u_char *)key, (u_char *)iv, - (encrypt == CIPHER_ENCRYPT)); + (do_encrypt == CIPHER_ENCRYPT)); #else if (EVP_CipherInit(&cc->evp, type, NULL, (u_char *)iv, (do_encrypt == CIPHER_ENCRYPT)) == 0) |