Update DTLS code to match CBC decoding in TLS.

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

diff --git a/crypto/camellia/camellia.h b/crypto/camellia/camellia.h
index 1aa1c3ae8c21600cc12fd931c1517f0efd631697..b8a8b6e10b9e094d72d1be88fa622d8f8587d84f 100644 (file)
--- a/crypto/camellia/camellia.h
+++ b/crypto/camellia/camellia.h
@@ -74,15 +74,24 @@ 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;
 
+#ifdef OPENSSL_FIPS
+int private_Camellia_set_key(const unsigned char *userKey, const int bits,
+       CAMELLIA_KEY *key);
+#endif
+
 int Camellia_set_key(const unsigned char *userKey, const int bits,
        CAMELLIA_KEY *key);
 
@@ -122,3 +131,4 @@ void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
 #endif
 
 #endif /* !HEADER_Camellia_H */
+