- markus@cvs.openbsd.org 2002/07/12 15:50:17

     [cipher.c]
     EVP_CIPH_CUSTOM_IV for our own rijndael

diff --git a/ChangeLog b/ChangeLog
index 2c765c7e59f6972d896421cf14ab096c4d1c79ac..bd2370263f84ecefce1d691451fae0148d1326b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - itojun@cvs.openbsd.org 2002/07/12 13:29:09
      [sshconnect.c]
      print connect failure during debugging mode.
+   - markus@cvs.openbsd.org 2002/07/12 15:50:17
+     [cipher.c]
+     EVP_CIPH_CUSTOM_IV for our own rijndael
 
 20020714
  - (tim) [Makefile.in] replace "id sshd" with "sshd -t"
@@ -1367,4 +1370,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2367 2002/07/15 17:48:11 mouring Exp $
+$Id: ChangeLog,v 1.2368 2002/07/15 17:52:49 mouring Exp $

diff --git a/cipher.c b/cipher.c
index 6db340d7a991c46ad477c4184aa2d50b036b1723..9e8ef999b8212a042b07bdedf5c0be319fd91fb4 100644 (file)
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.60 2002/06/23 03:26:52 deraadt Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.61 2002/07/12 15:50:17 markus Exp $");
 
 #include "xmalloc.h"
 #include "log.h"
@@ -567,7 +567,7 @@ evp_rijndael(void)
        rijndal_cbc.do_cipher = ssh_rijndael_cbc;
 #ifndef SSH_OLD_EVP
        rijndal_cbc.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH |
-           EVP_CIPH_ALWAYS_CALL_INIT;
+           EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
 #endif
        return (&rijndal_cbc);
 }