This commit is contained in:
ian.mcgreer%sun.com 2002-09-08 16:47:58 +00:00
Родитель 150ac1a5dc
Коммит 2a3150fa01
2 изменённых файлов: 9 добавлений и 9 удалений

Просмотреть файл

@ -30,7 +30,7 @@
* may use your version of this file under either the MPL or the * may use your version of this file under either the MPL or the
* GPL. * GPL.
* *
* $Id: rijndael.c,v 1.10 2001-12-12 04:14:48 jpierre%netscape.com Exp $ * $Id: rijndael.c,v 1.11 2002-09-08 16:47:57 ian.mcgreer%sun.com Exp $
*/ */
#include "prinit.h" #include "prinit.h"
@ -839,7 +839,7 @@ static SECStatus
rijndael_encryptECB(AESContext *cx, unsigned char *output, rijndael_encryptECB(AESContext *cx, unsigned char *output,
unsigned int *outputLen, unsigned int maxOutputLen, unsigned int *outputLen, unsigned int maxOutputLen,
const unsigned char *input, unsigned int inputLen, const unsigned char *input, unsigned int inputLen,
int blocksize) unsigned int blocksize)
{ {
SECStatus rv; SECStatus rv;
AESBlockFunc *encryptor; AESBlockFunc *encryptor;
@ -861,9 +861,9 @@ static SECStatus
rijndael_encryptCBC(AESContext *cx, unsigned char *output, rijndael_encryptCBC(AESContext *cx, unsigned char *output,
unsigned int *outputLen, unsigned int maxOutputLen, unsigned int *outputLen, unsigned int maxOutputLen,
const unsigned char *input, unsigned int inputLen, const unsigned char *input, unsigned int inputLen,
int blocksize) unsigned int blocksize)
{ {
int j; unsigned int j;
SECStatus rv; SECStatus rv;
AESBlockFunc *encryptor; AESBlockFunc *encryptor;
unsigned char *lastblock; unsigned char *lastblock;
@ -897,7 +897,7 @@ static SECStatus
rijndael_decryptECB(AESContext *cx, unsigned char *output, rijndael_decryptECB(AESContext *cx, unsigned char *output,
unsigned int *outputLen, unsigned int maxOutputLen, unsigned int *outputLen, unsigned int maxOutputLen,
const unsigned char *input, unsigned int inputLen, const unsigned char *input, unsigned int inputLen,
int blocksize) unsigned int blocksize)
{ {
SECStatus rv; SECStatus rv;
AESBlockFunc *decryptor; AESBlockFunc *decryptor;
@ -919,13 +919,13 @@ static SECStatus
rijndael_decryptCBC(AESContext *cx, unsigned char *output, rijndael_decryptCBC(AESContext *cx, unsigned char *output,
unsigned int *outputLen, unsigned int maxOutputLen, unsigned int *outputLen, unsigned int maxOutputLen,
const unsigned char *input, unsigned int inputLen, const unsigned char *input, unsigned int inputLen,
int blocksize) unsigned int blocksize)
{ {
SECStatus rv; SECStatus rv;
AESBlockFunc *decryptor; AESBlockFunc *decryptor;
const unsigned char *in; const unsigned char *in;
unsigned char *out; unsigned char *out;
int j; unsigned int j;
unsigned char newIV[RIJNDAEL_MAX_BLOCKSIZE]; unsigned char newIV[RIJNDAEL_MAX_BLOCKSIZE];
if (!inputLen) if (!inputLen)

Просмотреть файл

@ -30,7 +30,7 @@
* may use your version of this file under either the MPL or the * may use your version of this file under either the MPL or the
* GPL. * GPL.
* *
* $Id: rijndael.h,v 1.3 2001-06-20 03:17:01 nelsonb%netscape.com Exp $ * $Id: rijndael.h,v 1.4 2002-09-08 16:47:58 ian.mcgreer%sun.com Exp $
*/ */
#ifndef _RIJNDAEL_H_ #ifndef _RIJNDAEL_H_
@ -42,7 +42,7 @@
typedef SECStatus AESFunc(AESContext *cx, unsigned char *output, typedef SECStatus AESFunc(AESContext *cx, unsigned char *output,
unsigned int *outputLen, unsigned int maxOutputLen, unsigned int *outputLen, unsigned int maxOutputLen,
const unsigned char *input, unsigned int inputLen, const unsigned char *input, unsigned int inputLen,
int blocksize); unsigned int blocksize);
typedef SECStatus AESBlockFunc(AESContext *cx, typedef SECStatus AESBlockFunc(AESContext *cx,
unsigned char *output, unsigned char *output,