From 887d8bea380f0e67498d97c73f700e2b15d2232d Mon Sep 17 00:00:00 2001 From: mouring Date: Thu, 7 Dec 2000 05:57:27 +0000 Subject: - markus@cvs.openbsd.org 2000/12/06 23:10:39 [rijndael.c] unexpand(1) - markus@cvs.openbsd.org 2000/12/06 23:05:43 [cipher.c cipher.h rijndael.c rijndael.h rijndael_boxes.h] new rijndael implementation. fixes endian bugs --- cipher.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'cipher.h') diff --git a/cipher.h b/cipher.h index 97bc8891..0223ace3 100644 --- a/cipher.h +++ b/cipher.h @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: cipher.h,v 1.22 2000/10/13 18:59:14 markus Exp $"); */ +/* RCSID("$OpenBSD: cipher.h,v 1.23 2000/12/06 23:05:42 markus Exp $"); */ #ifndef CIPHER_H #define CIPHER_H @@ -41,7 +41,9 @@ #include #include #include + #include "rijndael.h" + /* * Cipher types for SSH-1. New types can be added, but old types should not * be removed for compatibility. The maximum allowed value is 31. @@ -84,9 +86,9 @@ struct CipherContext { u_char iv[8]; } cast; struct { - u4byte iv[4]; - rijndael_ctx enc; - rijndael_ctx dec; + u_char iv[16]; + rijndael_key enc; + rijndael_key dec; } rijndael; RC4_KEY rc4; } u; -- cgit v1.2.1