From ede07fb0a07dfcfa15560ff4b7a5764687c35ad5 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 24 Jun 2004 00:33:48 +1000 Subject: - mouring@cvs.openbsd.org 2004/06/23 00:39:38 [rijndael.c] -Wshadow fix up s/encrypt/do_encrypt/. OK djm@, markus@ --- ChangeLog | 5 ++++- rijndael.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1e263847..d2358bda9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,9 @@ - dtucker@cvs.openbsd.org 2004/06/22 22:55:56 [regress/dynamic-forward.sh regress/test-exec.sh] Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@ + - mouring@cvs.openbsd.org 2004/06/23 00:39:38 + [rijndael.c] + -Wshadow fix up s/encrypt/do_encrypt/. OK djm@, markus@ - (dtucker) [cipher.c] encrypt->do_encrypt inside SSH_OLD_EVP to match -Wshadow change. - (bal) [Makefile.in] Remove opensshd.init on 'make distclean' @@ -1393,4 +1396,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3441 2004/06/23 04:04:45 mouring Exp $ +$Id: ChangeLog,v 1.3442 2004/06/23 14:33:48 dtucker Exp $ 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 { -- cgit v1.2.3