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
This commit is contained in:
Love Hörnquist Åstrand
2008-04-15 07:56:34 +00:00
parent 58c3cf6733
commit 9da441487e

View File

@@ -36,8 +36,6 @@
#ifndef HEIM_CAMELLIA_H #ifndef HEIM_CAMELLIA_H
#define HEIM_CAMELLIA_H 1 #define HEIM_CAMELLIA_H 1
#include "camellia-ntt.h"
/* symbol renaming */ /* symbol renaming */
#define CAMELLIA_set_key hc_CAMELLIA_set_encrypt_key #define CAMELLIA_set_key hc_CAMELLIA_set_encrypt_key
#define CAMELLIA_encrypt hc_CAMELLIA_encrypt #define CAMELLIA_encrypt hc_CAMELLIA_encrypt
@@ -49,13 +47,15 @@
*/ */
#define CAMELLIA_BLOCK_SIZE 16 #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_ENCRYPT 1
#define CAMELLIA_DECRYPT 0 #define CAMELLIA_DECRYPT 0
typedef struct camellia_key { typedef struct camellia_key {
unsigned int bits; unsigned int bits;
KEY_TABLE_TYPE key; uint32_t key[CAMELLIA_TABLE_WORD_LEN];
} CAMELLIA_KEY; } CAMELLIA_KEY;
int CAMELLIA_set_key(const unsigned char *, const int, CAMELLIA_KEY *); int CAMELLIA_set_key(const unsigned char *, const int, CAMELLIA_KEY *);