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

- deraadt@cvs.openbsd.org 2002/07/10 17:53:54 

[rijndael.c]
     use right sizeof in memcpy; markus ok
This commit is contained in:
Ben Lindstrom 2002-07-11 04:01:29 +00:00
parent a6cd75c49e
commit 6f893880cc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -19,6 +19,9 @@
- itojun@cvs.openbsd.org 2002/07/10 10:28:15 - itojun@cvs.openbsd.org 2002/07/10 10:28:15
[sshconnect.c] [sshconnect.c]
bark if all connection attempt fails. bark if all connection attempt fails.
- deraadt@cvs.openbsd.org 2002/07/10 17:53:54
[rijndael.c]
use right sizeof in memcpy; markus ok
20020709 20020709
- (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms - (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms
@ -1342,4 +1345,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2358 2002/07/11 04:00:19 mouring Exp $ $Id: ChangeLog,v 1.2359 2002/07/11 04:01:29 mouring Exp $

4
rijndael.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: rijndael.c,v 1.13 2001/12/19 07:18:56 deraadt Exp $ */ /* $OpenBSD: rijndael.c,v 1.14 2002/07/10 17:53:54 deraadt Exp $ */
/** /**
* rijndael-alg-fst.c * rijndael-alg-fst.c
@ -1226,7 +1226,7 @@ rijndael_set_key(rijndael_ctx *ctx, u_char *key, int bits, int encrypt)
memset(ctx->dk, 0, sizeof(ctx->dk)); memset(ctx->dk, 0, sizeof(ctx->dk));
} else { } else {
ctx->decrypt = 1; ctx->decrypt = 1;
memcpy(ctx->dk, ctx->ek, sizeof(ctx->ek)); memcpy(ctx->dk, ctx->ek, sizeof(ctx->dk));
rijndaelKeySetupDec(ctx->dk, key, bits, ctx->Nr); rijndaelKeySetupDec(ctx->dk, key, bits, ctx->Nr);
} }
} }