summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-07-11 04:01:29 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-07-11 04:01:29 +0000
commit6f893880ccc7b489e15493ae9e2d18507f6bd78a (patch)
tree961cbcd6b74337a5307edad052e6affa53188bf4
parenta6cd75c49ed90186bb400c08b8878c2c711b9f58 (diff)
- deraadt@cvs.openbsd.org 2002/07/10 17:53:54
[rijndael.c] use right sizeof in memcpy; markus ok
-rw-r--r--ChangeLog5
-rw-r--r--rijndael.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b869756c..c15f7331 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
- itojun@cvs.openbsd.org 2002/07/10 10:28:15
[sshconnect.c]
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
- (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms
@@ -1342,4 +1345,4 @@
- (stevesk) entropy.c: typo in debug message
- (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 $
diff --git a/rijndael.c b/rijndael.c
index 448048ea..6965ca3b 100644
--- a/rijndael.c
+++ b/rijndael.c
@@ -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
@@ -1226,7 +1226,7 @@ rijndael_set_key(rijndael_ctx *ctx, u_char *key, int bits, int encrypt)
memset(ctx->dk, 0, sizeof(ctx->dk));
} else {
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);
}
}