X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fcamellia%2Fcmll_misc.c;h=f44689124b4a64e0d682c2d27125a4c177e92043;hp=8edead8db8456bd9559061345d53e9f40587dddb;hb=702e7425150a2dcee7308af034984d21edb717f5;hpb=67912e0032f5131f9959533c82dac997cb7e2e43

diff --git a/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c
index 8edead8db8..f44689124b 100644
--- a/crypto/camellia/cmll_misc.c
+++ b/crypto/camellia/cmll_misc.c
@@ -53,7 +53,7 @@
 #include <openssl/camellia.h>
 #include "cmll_locl.h"
 
- const char *CAMELLIA_version="CAMELLIA" OPENSSL_VERSION_PTEXT;
+const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT;
 
 int Camellia_set_key(const unsigned char *userKey, const int bits,
 	CAMELLIA_KEY *key)
@@ -62,20 +62,18 @@ int Camellia_set_key(const unsigned char *userKey, const int bits,
 		return -1;
 	if(bits != 128 && bits != 192 && bits != 256)
 		return -2;
-	Camellia_Ekeygen(bits , userKey, key->rd_key);
-	key->bitLength = bits;
+	key->grand_rounds = Camellia_Ekeygen(bits , userKey, key->u.rd_key);
 	return 0;
 	}
 
 void Camellia_encrypt(const unsigned char *in, unsigned char *out,
 	const CAMELLIA_KEY *key)
 	{
-	Camellia_EncryptBlock(key->bitLength, in , key->rd_key , out);
+	Camellia_EncryptBlock_Rounds(key->grand_rounds, in , key->u.rd_key , out);
 	}
 
 void Camellia_decrypt(const unsigned char *in, unsigned char *out,
 	const CAMELLIA_KEY *key)
 	{
-	Camellia_DecryptBlock(key->bitLength, in , key->rd_key , out);
+	Camellia_DecryptBlock_Rounds(key->grand_rounds, in , key->u.rd_key , out);
 	}
-