summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authormouring <mouring@cvs.openbsd.org>2004-06-23 00:39:39 +0000
committermouring <mouring@cvs.openbsd.org>2004-06-23 00:39:39 +0000
commit87fc02bc5e43d48b9245798414d662c046e41709 (patch)
tree6886158a0a5e33cebe0f7c18ad6361deb2c846d4 /usr.bin
parentd465477dff4677f6065ce89628a3d6462625df7f (diff)
-Wshadow fix up s/encrypt/do_encrypt/. OK djm@, markus@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/rijndael.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/rijndael.c b/usr.bin/ssh/rijndael.c
index ed90bc2a1ac..c3795f3a72f 100644
--- a/usr.bin/ssh/rijndael.c
+++ b/usr.bin/ssh/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
@@ -1216,10 +1216,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 {