diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-06-24 00:33:48 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-06-24 00:33:48 +1000 |
commit | ede07fb0a07dfcfa15560ff4b7a5764687c35ad5 (patch) | |
tree | 6fc5d4c0fc4d0ac8c3ed68f1bc9804c2da0aba97 /rijndael.c | |
parent | ca37219d75a49053b909933c9444a32529f4264f (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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rijndael.c b/rijndael.c index 1cd24de14..7432ea2e4 100644 --- a/rijndael.c +++ b/rijndael.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rijndael.c,v 1.15 2003/11/21 11:57:03 djm Exp $ */ | 1 | /* $OpenBSD: rijndael.c,v 1.16 2004/06/23 00:39:38 mouring Exp $ */ |
2 | 2 | ||
3 | /** | 3 | /** |
4 | * rijndael-alg-fst.c | 4 | * rijndael-alg-fst.c |
@@ -1218,10 +1218,10 @@ static void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16 | |||
1218 | } | 1218 | } |
1219 | 1219 | ||
1220 | void | 1220 | void |
1221 | rijndael_set_key(rijndael_ctx *ctx, u_char *key, int bits, int encrypt) | 1221 | rijndael_set_key(rijndael_ctx *ctx, u_char *key, int bits, int do_encrypt) |
1222 | { | 1222 | { |
1223 | ctx->Nr = rijndaelKeySetupEnc(ctx->ek, key, bits); | 1223 | ctx->Nr = rijndaelKeySetupEnc(ctx->ek, key, bits); |
1224 | if (encrypt) { | 1224 | if (do_encrypt) { |
1225 | ctx->decrypt = 0; | 1225 | ctx->decrypt = 0; |
1226 | memset(ctx->dk, 0, sizeof(ctx->dk)); | 1226 | memset(ctx->dk, 0, sizeof(ctx->dk)); |
1227 | } else { | 1227 | } else { |