| Index: nss/mozilla/security/nss/lib/freebl/rijndael.h
|
| ===================================================================
|
| --- nss/mozilla/security/nss/lib/freebl/rijndael.h (revision 155503)
|
| +++ nss/mozilla/security/nss/lib/freebl/rijndael.h (working copy)
|
| @@ -38,14 +38,11 @@
|
| #ifndef _RIJNDAEL_H_
|
| #define _RIJNDAEL_H_ 1
|
|
|
| +#include "blapii.h"
|
| +
|
| #define RIJNDAEL_MIN_BLOCKSIZE 16 /* bytes */
|
| #define RIJNDAEL_MAX_BLOCKSIZE 32 /* bytes */
|
|
|
| -typedef SECStatus AESFunc(AESContext *cx, unsigned char *output,
|
| - unsigned int *outputLen, unsigned int maxOutputLen,
|
| - const unsigned char *input, unsigned int inputLen,
|
| - unsigned int blocksize);
|
| -
|
| typedef SECStatus AESBlockFunc(AESContext *cx,
|
| unsigned char *output,
|
| const unsigned char *input);
|
| @@ -87,9 +84,12 @@
|
| {
|
| unsigned int Nb;
|
| unsigned int Nr;
|
| - AESFunc *worker;
|
| + freeblCipherFunc worker;
|
| unsigned char iv[RIJNDAEL_MAX_BLOCKSIZE];
|
| PRUint32 expandedKey[RIJNDAEL_MAX_EXP_KEY_SIZE];
|
| + freeblDestroyFunc destroy;
|
| + void *worker_cx;
|
| + PRBool isBlock;
|
| };
|
|
|
| #endif /* _RIJNDAEL_H_ */
|
|
|