svn commit: lorikeet r793 - in trunk/heimdal/lib/hcrypto: .

[lha at samba.org]

Author: lha
Date: 2008-03-19 16:36:40 +0000 (Wed, 19 Mar 2008)
New Revision: 793

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=793

Log:
revert part of to 972, the change to include/symbol mess. keep do not export all symbols part
Modified:
   trunk/heimdal/lib/hcrypto/camellia-ntt.c
   trunk/heimdal/lib/hcrypto/camellia.h


Changeset:
Modified: trunk/heimdal/lib/hcrypto/camellia-ntt.c
===================================================================
--- trunk/heimdal/lib/hcrypto/camellia-ntt.c	2008-03-19 16:01:40 UTC (rev 792)
+++ trunk/heimdal/lib/hcrypto/camellia-ntt.c	2008-03-19 16:36:40 UTC (rev 793)
@@ -26,11 +26,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <krb5-types.h>
-#include "camellia-ntt.h"
+#include "camellia.h"
 
 /* u32 must be 32bit word */
-typedef uint32_t u32;
+typedef unsigned int u32;
 typedef unsigned char u8;
 
 /* key constants */

Modified: trunk/heimdal/lib/hcrypto/camellia.h
===================================================================
--- trunk/heimdal/lib/hcrypto/camellia.h	2008-03-19 16:01:40 UTC (rev 792)
+++ trunk/heimdal/lib/hcrypto/camellia.h	2008-03-19 16:36:40 UTC (rev 793)
@@ -36,6 +36,9 @@
 #ifndef HEIM_CAMELLIA_H
 #define HEIM_CAMELLIA_H 1
 
+#include <krb5-types.h>
+#include "camellia-ntt.h"
+
 /* symbol renaming */
 #define CAMELLIA_set_key hc_CAMELLIA_set_encrypt_key
 #define CAMELLIA_encrypt hc_CAMELLIA_encrypt
@@ -47,6 +50,7 @@
  */
 
 #define CAMELLIA_BLOCK_SIZE 16
+#define CAMELLIA_MAXNR 14
 
 #define CAMELLIA_ENCRYPT 1
 #define CAMELLIA_DECRYPT 0