summaryrefslogtreecommitdiff
path: root/cipher.h
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2000-12-07 05:57:27 +0000
committerBen Lindstrom <mouring@eviladmin.org>2000-12-07 05:57:27 +0000
commit01f8463b15ead597f8ecf0052fd7569240dcaab9 (patch)
tree73ab1f33ee4c21041c160a93ff30e47c8179512b /cipher.h
parenta14ee47f2eee3030cd784b93985a4de417a4b14c (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.h10
1 files changed, 6 insertions, 4 deletions
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 <openssl/blowfish.h>
#include <openssl/rc4.h>
#include <openssl/cast.h>
+
#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;