- markus@cvs.openbsd.org 2002/07/12 15:50:17
[cipher.c] EVP_CIPH_CUSTOM_IV for our own rijndael
This commit is contained in:
parent
728aa7e18c
commit
c491b0def1
|
@ -3,6 +3,9 @@
|
||||||
- itojun@cvs.openbsd.org 2002/07/12 13:29:09
|
- itojun@cvs.openbsd.org 2002/07/12 13:29:09
|
||||||
[sshconnect.c]
|
[sshconnect.c]
|
||||||
print connect failure during debugging mode.
|
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
|
20020714
|
||||||
- (tim) [Makefile.in] replace "id sshd" with "sshd -t"
|
- (tim) [Makefile.in] replace "id sshd" with "sshd -t"
|
||||||
|
@ -1367,4 +1370,4 @@
|
||||||
- (stevesk) entropy.c: typo in debug message
|
- (stevesk) entropy.c: typo in debug message
|
||||||
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
|
- (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 $
|
||||||
|
|
4
cipher.c
4
cipher.c
|
@ -35,7 +35,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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 "xmalloc.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
@ -567,7 +567,7 @@ evp_rijndael(void)
|
||||||
rijndal_cbc.do_cipher = ssh_rijndael_cbc;
|
rijndal_cbc.do_cipher = ssh_rijndael_cbc;
|
||||||
#ifndef SSH_OLD_EVP
|
#ifndef SSH_OLD_EVP
|
||||||
rijndal_cbc.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH |
|
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
|
#endif
|
||||||
return (&rijndal_cbc);
|
return (&rijndal_cbc);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue