From 9da441487e33f9f11568454ea5a3192b5d61362b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Tue, 15 Apr 2008 07:56:34 +0000
Subject: [PATCH] Drop need to camellia-ntt.h by including some more defines.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22966 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hcrypto/camellia.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/hcrypto/camellia.h b/lib/hcrypto/camellia.h
index fda1928cb..f736f88b1 100644
--- a/lib/hcrypto/camellia.h
+++ b/lib/hcrypto/camellia.h
@@ -36,8 +36,6 @@
 #ifndef HEIM_CAMELLIA_H
 #define HEIM_CAMELLIA_H 1
 
-#include "camellia-ntt.h"
-
 /* symbol renaming */
 #define CAMELLIA_set_key hc_CAMELLIA_set_encrypt_key
 #define CAMELLIA_encrypt hc_CAMELLIA_encrypt
@@ -49,13 +47,15 @@
  */
 
 #define CAMELLIA_BLOCK_SIZE 16
+#define CAMELLIA_TABLE_BYTE_LEN 272
+#define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4)
 
 #define CAMELLIA_ENCRYPT 1
 #define CAMELLIA_DECRYPT 0
 
 typedef struct camellia_key {
     unsigned int bits;
-    KEY_TABLE_TYPE key;
+    uint32_t key[CAMELLIA_TABLE_WORD_LEN];
 } CAMELLIA_KEY;
 
 int CAMELLIA_set_key(const unsigned char *, const int, CAMELLIA_KEY *);