From ab7f45635732a8e996bfe4082080f3bd002325bf Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Mon, 14 Oct 2002 11:21:05 +0000
Subject: Don't panic when we can just return an error code.
---
sys/crypto/rijndael/rijndael-api-fst.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'sys/crypto')
diff --git a/sys/crypto/rijndael/rijndael-api-fst.c b/sys/crypto/rijndael/rijndael-api-fst.c
index 2ffcc44..d2fdd67 100644
--- a/sys/crypto/rijndael/rijndael-api-fst.c
+++ b/sys/crypto/rijndael/rijndael-api-fst.c
@@ -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];
}
--
cgit v1.1