=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/cipher.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- src/usr.bin/ssh/cipher.h 2000/12/06 23:05:42 1.23 +++ src/usr.bin/ssh/cipher.h 2000/12/09 13:41:52 1.24 @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: cipher.h,v 1.23 2000/12/06 23:05:42 markus Exp $"); */ +/* RCSID("$OpenBSD: cipher.h,v 1.24 2000/12/09 13:41:52 markus Exp $"); */ #ifndef CIPHER_H #define CIPHER_H @@ -41,9 +41,7 @@ #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. @@ -86,9 +84,9 @@ u_char iv[8]; } cast; struct { - u_char iv[16]; - rijndael_key enc; - rijndael_key dec; + u4byte iv[4]; + rijndael_ctx enc; + rijndael_ctx dec; } rijndael; RC4_KEY rc4; } u;