diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2004-06-23 16:33:48 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2004-06-23 16:33:48 +0200 |
| commit | ede07fb0a07dfcfa15560ff4b7a5764687c35ad5 (patch) | |
| tree | 6fc5d4c0fc4d0ac8c3ed68f1bc9804c2da0aba97 /rijndael.c | |
| parent | - (bal) [contrib/README] Removed "mdoc2man.pl" reference and added (diff) | |
| download | openssh-ede07fb0a07dfcfa15560ff4b7a5764687c35ad5.tar.xz openssh-ede07fb0a07dfcfa15560ff4b7a5764687c35ad5.zip | |
- 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 '')
| -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 @@ -/* $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 { |