svn commit: lorikeet r792 - in trunk/heimdal/lib/hcrypto: .
lha at samba.org
lha at samba.org
Wed Mar 19 16:01:41 GMT 2008
Author: lha
Date: 2008-03-19 16:01:40 +0000 (Wed, 19 Mar 2008)
New Revision: 792
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=792
Log:
merge in changes to only leave license change
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 01:21:06 UTC (rev 791)
+++ trunk/heimdal/lib/hcrypto/camellia-ntt.c 2008-03-19 16:01:40 UTC (rev 792)
@@ -26,10 +26,11 @@
#include <string.h>
#include <stdlib.h>
-#include "camellia.h"
+#include <krb5-types.h>
+#include "camellia-ntt.h"
/* u32 must be 32bit word */
-typedef unsigned int u32;
+typedef uint32_t u32;
typedef unsigned char u8;
/* key constants */
@@ -444,7 +445,7 @@
#define subl(x) subL[(x)]
#define subr(x) subR[(x)]
-void camellia_setup128(const unsigned char *key, u32 *subkey)
+static void camellia_setup128(const unsigned char *key, u32 *subkey)
{
u32 kll, klr, krl, krr;
u32 il, ir, t0, t1, w0, w1;
@@ -655,7 +656,7 @@
return;
}
-void camellia_setup256(const unsigned char *key, u32 *subkey)
+static void camellia_setup256(const unsigned char *key, u32 *subkey)
{
u32 kll,klr,krl,krr; /* left half of key */
u32 krll,krlr,krrl,krrr; /* right half of key */
@@ -941,7 +942,7 @@
return;
}
-void camellia_setup192(const unsigned char *key, u32 *subkey)
+static void camellia_setup192(const unsigned char *key, u32 *subkey)
{
unsigned char kk[32];
u32 krll, krlr, krrl,krrr;
@@ -963,7 +964,7 @@
*
* "io" must be 4byte aligned and big-endian data.
*/
-void camellia_encrypt128(const u32 *subkey, u32 *io)
+static void camellia_encrypt128(const u32 *subkey, u32 *io)
{
u32 il, ir, t0, t1;
@@ -1053,7 +1054,7 @@
return;
}
-void camellia_decrypt128(const u32 *subkey, u32 *io)
+static void camellia_decrypt128(const u32 *subkey, u32 *io)
{
u32 il,ir,t0,t1; /* temporary valiables */
@@ -1146,7 +1147,7 @@
/**
* stuff for 192 and 256bit encryption/decryption
*/
-void camellia_encrypt256(const u32 *subkey, u32 *io)
+static void camellia_encrypt256(const u32 *subkey, u32 *io)
{
u32 il,ir,t0,t1; /* temporary valiables */
@@ -1260,7 +1261,7 @@
return;
}
-void camellia_decrypt256(const u32 *subkey, u32 *io)
+static void camellia_decrypt256(const u32 *subkey, u32 *io)
{
u32 il,ir,t0,t1; /* temporary valiables */
Modified: trunk/heimdal/lib/hcrypto/camellia.h
===================================================================
--- trunk/heimdal/lib/hcrypto/camellia.h 2008-03-19 01:21:06 UTC (rev 791)
+++ trunk/heimdal/lib/hcrypto/camellia.h 2008-03-19 16:01:40 UTC (rev 792)
@@ -36,9 +36,6 @@
#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
@@ -50,7 +47,6 @@
*/
#define CAMELLIA_BLOCK_SIZE 16
-#define CAMELLIA_MAXNR 14
#define CAMELLIA_ENCRYPT 1
#define CAMELLIA_DECRYPT 0
More information about the samba-cvs
mailing list