diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | rijndael.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -19,6 +19,9 @@ | |||
19 | - itojun@cvs.openbsd.org 2002/07/10 10:28:15 | 19 | - itojun@cvs.openbsd.org 2002/07/10 10:28:15 |
20 | [sshconnect.c] | 20 | [sshconnect.c] |
21 | bark if all connection attempt fails. | 21 | bark if all connection attempt fails. |
22 | - deraadt@cvs.openbsd.org 2002/07/10 17:53:54 | ||
23 | [rijndael.c] | ||
24 | use right sizeof in memcpy; markus ok | ||
22 | 25 | ||
23 | 20020709 | 26 | 20020709 |
24 | - (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms | 27 | - (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms |
@@ -1342,4 +1345,4 @@ | |||
1342 | - (stevesk) entropy.c: typo in debug message | 1345 | - (stevesk) entropy.c: typo in debug message |
1343 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1346 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1344 | 1347 | ||
1345 | $Id: ChangeLog,v 1.2358 2002/07/11 04:00:19 mouring Exp $ | 1348 | $Id: ChangeLog,v 1.2359 2002/07/11 04:01:29 mouring Exp $ |
diff --git a/rijndael.c b/rijndael.c index 448048ea6..6965ca3b0 100644 --- a/rijndael.c +++ b/rijndael.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rijndael.c,v 1.13 2001/12/19 07:18:56 deraadt Exp $ */ | 1 | /* $OpenBSD: rijndael.c,v 1.14 2002/07/10 17:53:54 deraadt Exp $ */ |
2 | 2 | ||
3 | /** | 3 | /** |
4 | * rijndael-alg-fst.c | 4 | * rijndael-alg-fst.c |
@@ -1226,7 +1226,7 @@ rijndael_set_key(rijndael_ctx *ctx, u_char *key, int bits, int encrypt) | |||
1226 | memset(ctx->dk, 0, sizeof(ctx->dk)); | 1226 | memset(ctx->dk, 0, sizeof(ctx->dk)); |
1227 | } else { | 1227 | } else { |
1228 | ctx->decrypt = 1; | 1228 | ctx->decrypt = 1; |
1229 | memcpy(ctx->dk, ctx->ek, sizeof(ctx->ek)); | 1229 | memcpy(ctx->dk, ctx->ek, sizeof(ctx->dk)); |
1230 | rijndaelKeySetupDec(ctx->dk, key, bits, ctx->Nr); | 1230 | rijndaelKeySetupDec(ctx->dk, key, bits, ctx->Nr); |
1231 | } | 1231 | } |
1232 | } | 1232 | } |