From 87fc02bc5e43d48b9245798414d662c046e41709 Mon Sep 17 00:00:00 2001
From: mouring <mouring@cvs.openbsd.org>
Date: Wed, 23 Jun 2004 00:39:39 +0000
Subject: -Wshadow fix up s/encrypt/do_encrypt/.  OK djm@, markus@

---
 usr.bin/ssh/rijndael.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr.bin')

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 {
-- 
cgit v1.2.3