svn rev #24297: trunk/src/lib/crypto/builtin/camellia/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24297
Commit By: ghudson
Log Message:
Don't build the built-in Camellia block cipher code if Camellia-CCM
enctypes aren't enabled.



Changed Files:
U   trunk/src/lib/crypto/builtin/camellia/camellia-gen.c
U   trunk/src/lib/crypto/builtin/camellia/camellia.c
Modified: trunk/src/lib/crypto/builtin/camellia/camellia-gen.c
===================================================================
--- trunk/src/lib/crypto/builtin/camellia/camellia-gen.c	2010-09-08 03:15:49 UTC (rev 24296)
+++ trunk/src/lib/crypto/builtin/camellia/camellia-gen.c	2010-09-08 03:48:05 UTC (rev 24297)
@@ -8,6 +8,8 @@
 #include <unistd.h>
 #include "camellia.h"
 
+#ifdef CAMELLIA_CCM
+
 #define B 16U
 unsigned char key[16];
 unsigned char test_case_len[] = { B+1, 2*B-1, 2*B, 2*B+1, 3*B-1, 3*B, 4*B, };
@@ -314,14 +316,18 @@
     printf ("\n");
 }
 
+#endif /* CAMELLIA_CCM */
+
 int main ()
 {
+#ifdef CAMELLIA_CCM
     init ();
     fips_test ();
 
     ecb_test();
     cbc_test();
     cts_test();
+#endif
 
     return 0;
 }

Modified: trunk/src/lib/crypto/builtin/camellia/camellia.c
===================================================================
--- trunk/src/lib/crypto/builtin/camellia/camellia.c	2010-09-08 03:15:49 UTC (rev 24296)
+++ trunk/src/lib/crypto/builtin/camellia/camellia.c	2010-09-08 03:48:05 UTC (rev 24297)
@@ -36,6 +36,8 @@
 
 #include "camellia.h"
 
+#ifdef CAMELLIA_CCM
+
 /* key constants */
 
 #define CAMELLIA_SIGMA1L (0xA09E667FL)
@@ -1537,3 +1539,5 @@
     Camellia_DecryptBlock(cx->keybitlen, in_blk, cx->k_sch, out_blk);
     return camellia_good;
 }
+
+#endif /* CAMELLIA_CCM */