RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- mouring@cvs.openbsd.org 2004/06/23 00:39:38 

[rijndael.c]
     -Wshadow fix up s/encrypt/do_encrypt/.  OK djm@, markus@
This commit is contained in:
Darren Tucker 2004-06-24 00:33:48 +10:00
parent ca37219d75
commit ede07fb0a0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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 $

6
rijndael.c
View File

@ -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 {