diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-08-05 11:25:50 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-08-05 12:18:17 +1000 |
| commit | cd1d7f4be7d31388ab79c797acaf6d7730113112 (patch) | |
| tree | 3d25e28089d1cffa5d7dadca529e29b936681607 /source4/heimdal/lib/hcrypto | |
| parent | 8bba340e65e84ee09a7da4d97bc7838d3eefbb15 (diff) | |
| download | samba-cd1d7f4be7d31388ab79c797acaf6d7730113112.tar.gz samba-cd1d7f4be7d31388ab79c797acaf6d7730113112.tar.bz2 samba-cd1d7f4be7d31388ab79c797acaf6d7730113112.zip | |
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
Diffstat (limited to 'source4/heimdal/lib/hcrypto')
| -rw-r--r-- | source4/heimdal/lib/hcrypto/camellia-ntt.c | 6 | ||||
| -rw-r--r-- | source4/heimdal/lib/hcrypto/camellia.c | 8 |
2 files changed, 4 insertions, 10 deletions
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) |