diff options
Diffstat (limited to 'sys/crypto/rijndael/rijndael-api-fst.h')
| -rw-r--r-- | sys/crypto/rijndael/rijndael-api-fst.h | 71 |
1 files changed, 21 insertions, 50 deletions
diff --git a/sys/crypto/rijndael/rijndael-api-fst.h b/sys/crypto/rijndael/rijndael-api-fst.h index f153b69..155a212 100644 --- a/sys/crypto/rijndael/rijndael-api-fst.h +++ b/sys/crypto/rijndael/rijndael-api-fst.h @@ -6,7 +6,6 @@ * * Optimised ANSI C code * - * #define INTERMEDIATE_VALUE_KAT to generate the Intermediate Value Known Answer Test. */ #ifndef __RIJNDAEL_API_FST_H @@ -14,10 +13,7 @@ #include <crypto/rijndael/rijndael-alg-fst.h> -/* Defines: - Add any additional defines you need -*/ - +/* Generic Defines */ #define DIR_ENCRYPT 0 /* Are we encrpyting? */ #define DIR_DECRYPT 1 /* Are we decrpyting? */ #define MODE_ECB 1 /* Are we ciphering in ECB mode? */ @@ -25,7 +21,7 @@ #define MODE_CFB1 3 /* Are we ciphering in 1-bit CFB mode? */ #define BITSPERBLOCK 128 /* Default number of bits in a cipher block */ -/* Error Codes - CHANGE POSSIBLE: inclusion of additional error codes */ +/* Error Codes */ #define BAD_KEY_DIR -1 /* Key direction is invalid, e.g., unknown value */ #define BAD_KEY_MAT -2 /* Key material not of correct length */ #define BAD_KEY_INSTANCE -3 /* Key passed is not valid */ @@ -36,67 +32,42 @@ #define BAD_DATA -8 /* Data contents are invalid, e.g., invalid padding */ #define BAD_OTHER -9 /* Unknown error */ -/* CHANGE POSSIBLE: inclusion of algorithm specific defines */ -#define MAX_KEY_SIZE 64 /* # of ASCII char's needed to represent a key */ -#define MAX_IV_SIZE 16 /* # bytes needed to represent an IV */ - -/* Typedefs: +/* Algorithm-specific Defines */ +#define RIJNDAEL_MAX_KEY_SIZE 64 /* # of ASCII char's needed to represent a key */ +#define RIJNDAEL_MAX_IV_SIZE 16 /* # bytes needed to represent an IV */ - Typedef'ed data storage elements. Add any algorithm specific -parameters at the bottom of the structs as appropriate. -*/ +/* Typedefs */ /* The structure for key information */ typedef struct { u_int8_t direction; /* Key used for encrypting or decrypting? */ int keyLen; /* Length of the key */ - char keyMaterial[MAX_KEY_SIZE+1]; /* Raw key data in ASCII, e.g., user input or KAT values */ - /* The following parameters are algorithm dependent, replace or add as necessary */ - int ROUNDS; /* key-length-dependent number of rounds */ - int blockLen; /* block length */ - union { - u_int8_t xkS8[RIJNDAEL_MAXROUNDS+1][4][4]; /* key schedule */ - u_int32_t xkS32[RIJNDAEL_MAXROUNDS+1][4]; /* key schedule */ - } xKeySched; -#define keySched xKeySched.xkS8 + char keyMaterial[RIJNDAEL_MAX_KEY_SIZE+1]; /* Raw key data in ASCII, e.g., user input or KAT values */ + int Nr; /* key-length-dependent number of rounds */ + u_int32_t rk[4*(RIJNDAEL_MAXNR + 1)]; /* key schedule */ + u_int32_t ek[4*(RIJNDAEL_MAXNR + 1)]; /* CFB1 key schedule (encryption only) */ } keyInstance; /* The structure for cipher information */ typedef struct { /* changed order of the components */ u_int8_t mode; /* MODE_ECB, MODE_CBC, or MODE_CFB1 */ - u_int8_t IV[MAX_IV_SIZE]; /* A possible Initialization Vector for ciphering */ - /* Add any algorithm specific parameters needed here */ - int blockLen; /* Sample: Handles non-128 bit block sizes (if available) */ + u_int8_t IV[RIJNDAEL_MAX_IV_SIZE]; /* A possible Initialization Vector for ciphering */ } cipherInstance; /* Function prototypes */ -/* CHANGED: nothing - TODO: implement the following extensions to setup 192-bit and 256-bit block lengths: - makeKeyEx(): parameter blockLen added - -- this parameter is absolutely necessary if you want to - setup the round keys in a variable block length setting - cipherInitEx(): parameter blockLen added (for obvious reasons) - */ - -int rijndael_makeKey(keyInstance *key, u_int8_t direction, int keyLen, char *keyMaterial); - -int rijndael_cipherInit(cipherInstance *cipher, u_int8_t mode, char *IV); - -int rijndael_blockEncrypt(cipherInstance *cipher, keyInstance *key, - u_int8_t *input, int inputLen, u_int8_t *outBuffer); -int rijndael_padEncrypt(cipherInstance *cipher, keyInstance *key, - u_int8_t *input, int inputOctets, u_int8_t *outBuffer); +int rijndael_makeKey(keyInstance *, u_int8_t, int, char *); -int rijndael_blockDecrypt(cipherInstance *cipher, keyInstance *key, - u_int8_t *input, int inputLen, u_int8_t *outBuffer); +int rijndael_cipherInit(cipherInstance *, u_int8_t, char *); -int rijndael_padDecrypt(cipherInstance *cipher, keyInstance *key, - u_int8_t *input, int inputOctets, u_int8_t *outBuffer); +int rijndael_blockEncrypt(cipherInstance *, keyInstance *, u_int8_t *, int, + u_int8_t *); +int rijndael_padEncrypt(cipherInstance *, keyInstance *, u_int8_t *, int, + u_int8_t *); -#ifdef INTERMEDIATE_VALUE_KAT -int rijndael_cipherUpdateRounds(cipherInstance *cipher, keyInstance *key, - u_int8_t *input, int inputLen, u_int8_t *outBuffer, int Rounds); -#endif /* INTERMEDIATE_VALUE_KAT */ +int rijndael_blockDecrypt(cipherInstance *, keyInstance *, u_int8_t *, int, + u_int8_t *); +int rijndael_padDecrypt(cipherInstance *, keyInstance *, u_int8_t *, int, + u_int8_t *); #endif /* __RIJNDAEL_API_FST_H */ |
