diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-15 19:52:49 +0200 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-15 19:52:49 +0200 |
commit | c491b0def1ac7b468bc6ce3ceffc3493b102ca1d (patch) | |
tree | 42d3315ef11b4e66f455df12d1eb1cd37ac947c1 | |
parent | - itojun@cvs.openbsd.org 2002/07/12 13:29:09 (diff) | |
download | openssh-c491b0def1ac7b468bc6ce3ceffc3493b102ca1d.tar.xz openssh-c491b0def1ac7b468bc6ce3ceffc3493b102ca1d.zip |
- markus@cvs.openbsd.org 2002/07/12 15:50:17
[cipher.c]
EVP_CIPH_CUSTOM_IV for our own rijndael
Diffstat (limited to '')
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | cipher.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -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 $ @@ -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); } |