diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | cipher.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -3,6 +3,9 @@ | |||
3 | - itojun@cvs.openbsd.org 2002/07/12 13:29:09 | 3 | - itojun@cvs.openbsd.org 2002/07/12 13:29:09 |
4 | [sshconnect.c] | 4 | [sshconnect.c] |
5 | print connect failure during debugging mode. | 5 | print connect failure during debugging mode. |
6 | - markus@cvs.openbsd.org 2002/07/12 15:50:17 | ||
7 | [cipher.c] | ||
8 | EVP_CIPH_CUSTOM_IV for our own rijndael | ||
6 | 9 | ||
7 | 20020714 | 10 | 20020714 |
8 | - (tim) [Makefile.in] replace "id sshd" with "sshd -t" | 11 | - (tim) [Makefile.in] replace "id sshd" with "sshd -t" |
@@ -1367,4 +1370,4 @@ | |||
1367 | - (stevesk) entropy.c: typo in debug message | 1370 | - (stevesk) entropy.c: typo in debug message |
1368 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1371 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1369 | 1372 | ||
1370 | $Id: ChangeLog,v 1.2367 2002/07/15 17:48:11 mouring Exp $ | 1373 | $Id: ChangeLog,v 1.2368 2002/07/15 17:52:49 mouring Exp $ |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: cipher.c,v 1.60 2002/06/23 03:26:52 deraadt Exp $"); | 38 | RCSID("$OpenBSD: cipher.c,v 1.61 2002/07/12 15:50:17 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "log.h" | 41 | #include "log.h" |
@@ -567,7 +567,7 @@ evp_rijndael(void) | |||
567 | rijndal_cbc.do_cipher = ssh_rijndael_cbc; | 567 | rijndal_cbc.do_cipher = ssh_rijndael_cbc; |
568 | #ifndef SSH_OLD_EVP | 568 | #ifndef SSH_OLD_EVP |
569 | rijndal_cbc.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | | 569 | rijndal_cbc.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | |
570 | EVP_CIPH_ALWAYS_CALL_INIT; | 570 | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV; |
571 | #endif | 571 | #endif |
572 | return (&rijndal_cbc); | 572 | return (&rijndal_cbc); |
573 | } | 573 | } |