d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

integrate rijndael-alg-fst.h into rijndael.h.

Browse Source
This commit is contained in:
Hajimu UMEMOTO 2005-03-11 16:26:10 +00:00
parent 4e860beeb1
commit 2dc7d840b7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=143420
5 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/crypto/rijndael/rijndael-alg-fst.c
View File

@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#endif
#include <crypto/rijndael/rijndael-alg-fst.h>
#include <crypto/rijndael/rijndael.h>
#include <crypto/rijndael/rijndael_local.h>
/*

40
sys/crypto/rijndael/rijndael-alg-fst.h
View File

@ -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 <vincent.rijmen@esat.kuleuven.ac.be>
* @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
* @author Paulo Barreto <paulo.barreto@terra.com.br>
*
* 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 */

1
sys/crypto/rijndael/rijndael-api-fst.c
View File

@ -26,7 +26,6 @@ __FBSDID("$FreeBSD$");
#endif
#include <crypto/rijndael/rijndael_local.h>
#include <crypto/rijndael/rijndael-alg-fst.h>
#include <crypto/rijndael/rijndael-api-fst.h>
#ifndef TRUE

2
sys/crypto/rijndael/rijndael-api-fst.h
View File

@ -11,7 +11,7 @@
#ifndef __RIJNDAEL_API_FST_H
#define __RIJNDAEL_API_FST_H
#include <crypto/rijndael/rijndael-alg-fst.h>
#include <crypto/rijndael/rijndael.h>
/* Generic Defines */
#define DIR_ENCRYPT 0 /* Are we encrpyting? */

13
sys/crypto/rijndael/rijndael.h
View File

@ -30,7 +30,9 @@
#ifndef __RIJNDAEL_H
#define __RIJNDAEL_H
#include <crypto/rijndael/rijndael-alg-fst.h>
#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 */