s4:heimdal: import lorikeet-heimdal-200908050050 (commit 8714779fa7376fd9f7761587639e...

[samba.git] / source4 / heimdal / lib / hcrypto / camellia.c

diff --git a/source4/heimdal/lib/hcrypto/camellia.c b/source4/heimdal/lib/hcrypto/camellia.c
index d78bbd4c0e6567a8457e9a8087f805b954bb7ded..c88822db5c7d8820557c3ef25cf39e38976d8466 100644 (file)
--- 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)