From cd1d7f4be7d31388ab79c797acaf6d7730113112 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Aug 2009 11:25:50 +1000
Subject: s4:heimdal: import lorikeet-heimdal-200908050050 (commit
 8714779fa7376fd9f7761587639e68b48afc8c9c)

This also adds a new hdb-glue.c file, to cope with Heimdal's
uncondtional enabling of SQLITE.

(Very reasonable, but not required for Samba4's use).

Andrew Bartlett
---
 source4/heimdal/lib/hcrypto/camellia-ntt.c | 6 ++----
 source4/heimdal/lib/hcrypto/camellia.c     | 8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'source4/heimdal/lib/hcrypto')

diff --git a/source4/heimdal/lib/hcrypto/camellia-ntt.c b/source4/heimdal/lib/hcrypto/camellia-ntt.c
index 358221162f..79c5a884ec 100644
--- a/source4/heimdal/lib/hcrypto/camellia-ntt.c
+++ b/source4/heimdal/lib/hcrypto/camellia-ntt.c
@@ -23,11 +23,7 @@
  *  http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
-#include <roken.h>
 
 #include <string.h>
 #include <stdlib.h>
@@ -35,6 +31,8 @@
 #include <krb5-types.h>
 #include "camellia-ntt.h"
 
+#include <roken.h>
+
 /* key constants */
 
 #define CAMELLIA_SIGMA1L (0xA09E667FL)
diff --git a/source4/heimdal/lib/hcrypto/camellia.c b/source4/heimdal/lib/hcrypto/camellia.c
index d78bbd4c0e..c88822db5c 100644
--- a/source4/heimdal/lib/hcrypto/camellia.c
+++ b/source4/heimdal/lib/hcrypto/camellia.c
@@ -31,14 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 
-RCSID("$Id: aes.c 20466 2007-04-20 08:29:05Z lha $");
-#endif
-
-#include <roken.h>
-
 #ifdef KRB5
 #include <krb5-types.h>
 #endif
@@ -48,6 +42,8 @@ RCSID("$Id: aes.c 20466 2007-04-20 08:29:05Z lha $");
 #include "camellia-ntt.h"
 #include "camellia.h"
 
+#include <roken.h>
+
 int
 CAMELLIA_set_key(const unsigned char *userkey,
 		 const int bits, CAMELLIA_KEY *key)
-- 
cgit