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

   -Wshadow change.

diff --git a/ChangeLog b/ChangeLog
index 8b3de2289776a5ca5aa5fc84f9a5bc451b3e49ea..95d9ff7d21e09b4e0dad05157fae85d0e3c09b6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/cipher.c b/cipher.c
index 255f840a39df050d07d3e000a1b9e9a438985e2d..64bd744b86b205446071a2b6cd12c01c7f2c7adb 100644 (file)
--- a/cipher.c
+++ b/cipher.c
@@ -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)