diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-07 05:57:27 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-07 05:57:27 +0000 |
commit | 01f8463b15ead597f8ecf0052fd7569240dcaab9 (patch) | |
tree | 73ab1f33ee4c21041c160a93ff30e47c8179512b /cipher.h | |
parent | a14ee47f2eee3030cd784b93985a4de417a4b14c (diff) |
- 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
Diffstat (limited to 'cipher.h')
-rw-r--r-- | cipher.h | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -32,7 +32,7 @@ | |||
32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
33 | */ | 33 | */ |
34 | 34 | ||
35 | /* RCSID("$OpenBSD: cipher.h,v 1.22 2000/10/13 18:59:14 markus Exp $"); */ | 35 | /* RCSID("$OpenBSD: cipher.h,v 1.23 2000/12/06 23:05:42 markus Exp $"); */ |
36 | 36 | ||
37 | #ifndef CIPHER_H | 37 | #ifndef CIPHER_H |
38 | #define CIPHER_H | 38 | #define CIPHER_H |
@@ -41,7 +41,9 @@ | |||
41 | #include <openssl/blowfish.h> | 41 | #include <openssl/blowfish.h> |
42 | #include <openssl/rc4.h> | 42 | #include <openssl/rc4.h> |
43 | #include <openssl/cast.h> | 43 | #include <openssl/cast.h> |
44 | |||
44 | #include "rijndael.h" | 45 | #include "rijndael.h" |
46 | |||
45 | /* | 47 | /* |
46 | * Cipher types for SSH-1. New types can be added, but old types should not | 48 | * Cipher types for SSH-1. New types can be added, but old types should not |
47 | * be removed for compatibility. The maximum allowed value is 31. | 49 | * be removed for compatibility. The maximum allowed value is 31. |
@@ -84,9 +86,9 @@ struct CipherContext { | |||
84 | u_char iv[8]; | 86 | u_char iv[8]; |
85 | } cast; | 87 | } cast; |
86 | struct { | 88 | struct { |
87 | u4byte iv[4]; | 89 | u_char iv[16]; |
88 | rijndael_ctx enc; | 90 | rijndael_key enc; |
89 | rijndael_ctx dec; | 91 | rijndael_key dec; |
90 | } rijndael; | 92 | } rijndael; |
91 | RC4_KEY rc4; | 93 | RC4_KEY rc4; |
92 | } u; | 94 | } u; |