summaryrefslogtreecommitdiff
path: root/rijndael.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-24 00:33:48 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-24 00:33:48 +1000
commitede07fb0a07dfcfa15560ff4b7a5764687c35ad5 (patch)
tree6fc5d4c0fc4d0ac8c3ed68f1bc9804c2da0aba97 /rijndael.c
parentca37219d75a49053b909933c9444a32529f4264f (diff)
- mouring@cvs.openbsd.org 2004/06/23 00:39:38
[rijndael.c] -Wshadow fix up s/encrypt/do_encrypt/. OK djm@, markus@
Diffstat (limited to 'rijndael.c')
-rw-r--r--rijndael.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/rijndael.c b/rijndael.c
index 1cd24de1..7432ea2e 100644
--- a/rijndael.c
+++ b/rijndael.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rijndael.c,v 1.15 2003/11/21 11:57:03 djm Exp $ */
+/* $OpenBSD: rijndael.c,v 1.16 2004/06/23 00:39:38 mouring Exp $ */
/**
* rijndael-alg-fst.c
@@ -1218,10 +1218,10 @@ static void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16
}
void
-rijndael_set_key(rijndael_ctx *ctx, u_char *key, int bits, int encrypt)
+rijndael_set_key(rijndael_ctx *ctx, u_char *key, int bits, int do_encrypt)
{
ctx->Nr = rijndaelKeySetupEnc(ctx->ek, key, bits);
- if (encrypt) {
+ if (do_encrypt) {
ctx->decrypt = 0;
memset(ctx->dk, 0, sizeof(ctx->dk));
} else {