New Camellia implementation (replacing previous version)

[oweals/openssl.git] / crypto / camellia / camellia.h

diff --git a/crypto/camellia/camellia.h b/crypto/camellia/camellia.h
index 1aa1c3ae8c21600cc12fd931c1517f0efd631697..3c8a35954342dff4040ff9a31dafd7f52c9edf57 100644 (file)
--- a/crypto/camellia/camellia.h
+++ b/crypto/camellia/camellia.h
@@ -74,13 +74,17 @@ extern "C" {
 #define CAMELLIA_TABLE_BYTE_LEN 272
 #define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4)
 
-typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN]; /* to match with WORD */
+ /* to match with WORD */
+typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN];
 
 struct camellia_key_st 
        {
        KEY_TABLE_TYPE rd_key;
        int bitLength;
+       void (*enc)(const unsigned int *subkey, unsigned int *io);
+       void (*dec)(const unsigned int *subkey, unsigned int *io);
        };
+
 typedef struct camellia_key_st CAMELLIA_KEY;
 
 int Camellia_set_key(const unsigned char *userKey, const int bits,
@@ -122,3 +126,4 @@ void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
 #endif
 
 #endif /* !HEADER_Camellia_H */
+