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

Don't panic when we can just return an error code.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2002-10-14 11:21:05 +00:00
parent af1c9c0e4d
commit 27da100965
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=105099
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,10 @@
#include <crypto/rijndael/rijndael-api-fst.h>
#include <crypto/rijndael/rijndael_local.h>
#ifndef TRUE
#define TRUE 1
#endif
int rijndael_makeKey(keyInstance *key, BYTE direction, int keyLen, char *keyMaterial) {
word8 k[MAXKC][4];
int i;
@ -220,7 +224,7 @@ int rijndael_padEncrypt(cipherInstance *cipher, keyInstance *key,
}
padLen = 16 - (inputOctets - 16*numBlocks);
if (padLen > 0 && padLen <= 16)
panic("rijndael_padEncrypt(ECB)");
return BAD_CIPHER_STATE;
bcopy(input, block, 16 - padLen);
for (cp = block + 16 - padLen; cp < block + 16; cp++)
*cp = padLen;
@ -241,7 +245,7 @@ int rijndael_padEncrypt(cipherInstance *cipher, keyInstance *key,
}
padLen = 16 - (inputOctets - 16*numBlocks);
if (padLen > 0 && padLen <= 16)
panic("rijndael_padEncrypt(CBC)");
return BAD_CIPHER_STATE;
for (i = 0; i < 16 - padLen; i++) {
block[i] = input[i] ^ iv[i];
}