From 8a8b13dab521eb055409de3f19ffda4fa762b85a Mon Sep 17 00:00:00 2001 From: ume Date: Fri, 11 Mar 2005 16:26:10 +0000 Subject: integrate rijndael-alg-fst.h into rijndael.h. --- sys/crypto/rijndael/rijndael-alg-fst.c | 2 +- sys/crypto/rijndael/rijndael-alg-fst.h | 40 ---------------------------------- sys/crypto/rijndael/rijndael-api-fst.c | 1 - sys/crypto/rijndael/rijndael-api-fst.h | 2 +- sys/crypto/rijndael/rijndael.h | 13 ++++++++++- 5 files changed, 14 insertions(+), 44 deletions(-) delete mode 100644 sys/crypto/rijndael/rijndael-alg-fst.h (limited to 'sys/crypto') diff --git a/sys/crypto/rijndael/rijndael-alg-fst.c b/sys/crypto/rijndael/rijndael-alg-fst.c index 522b8e1..4f2164f 100644 --- a/sys/crypto/rijndael/rijndael-alg-fst.c +++ b/sys/crypto/rijndael/rijndael-alg-fst.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include #endif -#include +#include #include /* diff --git a/sys/crypto/rijndael/rijndael-alg-fst.h b/sys/crypto/rijndael/rijndael-alg-fst.h deleted file mode 100644 index 0c27b46..0000000 --- a/sys/crypto/rijndael/rijndael-alg-fst.h +++ /dev/null @@ -1,40 +0,0 @@ -/* $FreeBSD$ */ -/* $KAME: rijndael-alg-fst.h,v 1.5 2003/07/15 10:47:16 itojun Exp $ */ -/** - * rijndael-alg-fst.h - * - * @version 3.0 (December 2000) - * - * Optimised ANSI C code for the Rijndael cipher (now AES) - * - * @author Vincent Rijmen - * @author Antoon Bosselaers - * @author Paulo Barreto - * - * This code is hereby placed in the public domain. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -#ifndef __RIJNDAEL_ALG_FST_H -#define __RIJNDAEL_ALG_FST_H - -#define RIJNDAEL_MAXKC (256/32) -#define RIJNDAEL_MAXKB (256/8) -#define RIJNDAEL_MAXNR 14 - -int rijndaelKeySetupEnc(u_int32_t rk[/*4*(Nr + 1)*/], const u_int8_t cipherKey[], int keyBits); -int rijndaelKeySetupDec(u_int32_t rk[/*4*(Nr + 1)*/], const u_int8_t cipherKey[], int keyBits); -void rijndaelEncrypt(const u_int32_t rk[/*4*(Nr + 1)*/], int Nr, const u_int8_t pt[16], u_int8_t ct[16]); -void rijndaelDecrypt(const u_int32_t rk[/*4*(Nr + 1)*/], int Nr, const u_int8_t ct[16], u_int8_t pt[16]); - -#endif /* __RIJNDAEL_ALG_FST_H */ diff --git a/sys/crypto/rijndael/rijndael-api-fst.c b/sys/crypto/rijndael/rijndael-api-fst.c index 28b7f7c..187177b 100644 --- a/sys/crypto/rijndael/rijndael-api-fst.c +++ b/sys/crypto/rijndael/rijndael-api-fst.c @@ -26,7 +26,6 @@ __FBSDID("$FreeBSD$"); #endif #include -#include #include #ifndef TRUE diff --git a/sys/crypto/rijndael/rijndael-api-fst.h b/sys/crypto/rijndael/rijndael-api-fst.h index 155a212..122bf52 100644 --- a/sys/crypto/rijndael/rijndael-api-fst.h +++ b/sys/crypto/rijndael/rijndael-api-fst.h @@ -11,7 +11,7 @@ #ifndef __RIJNDAEL_API_FST_H #define __RIJNDAEL_API_FST_H -#include +#include /* Generic Defines */ #define DIR_ENCRYPT 0 /* Are we encrpyting? */ diff --git a/sys/crypto/rijndael/rijndael.h b/sys/crypto/rijndael/rijndael.h index a443592..2e133e2 100644 --- a/sys/crypto/rijndael/rijndael.h +++ b/sys/crypto/rijndael/rijndael.h @@ -30,7 +30,9 @@ #ifndef __RIJNDAEL_H #define __RIJNDAEL_H -#include +#define RIJNDAEL_MAXKC (256/32) +#define RIJNDAEL_MAXKB (256/8) +#define RIJNDAEL_MAXNR 14 /* XXX: avoid conflicts with opencrypto */ #define rijndael_set_key _rijndael_set_key @@ -48,4 +50,13 @@ void rijndael_set_key(rijndael_ctx *, const u_char *, int); void rijndael_decrypt(const rijndael_ctx *, const u_char *, u_char *); void rijndael_encrypt(const rijndael_ctx *, const u_char *, u_char *); +#ifdef _KERNEL +int rijndaelKeySetupEnc(u_int32_t [/*4*(Nr+1)*/], const u_int8_t [], int); +int rijndaelKeySetupDec(u_int32_t [/*4*(Nr+1)*/], const u_int8_t [], int); +void rijndaelEncrypt(const u_int32_t [/*4*(Nr+1)*/], int, + const u_int8_t[16], u_int8_t [16]); +void rijndaelDecrypt(const u_int32_t [/*4*(Nr+1)*/], int, + const u_int8_t [16], u_int8_t [16]); +#endif + #endif /* __RIJNDAEL_H */ -- cgit v1.1