diff options
| author | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
| commit | 279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a (patch) | |
| tree | 404fa392fc6f2560e3c459fa20228c7031d0289d /crypto/openssh/rijndael.c | |
| parent | ce26c10eda4d687d476e9bbac51ccd26564af8da (diff) | |
| download | FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.zip FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/rijndael.c')
| -rw-r--r-- | crypto/openssh/rijndael.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssh/rijndael.c b/crypto/openssh/rijndael.c index 448048e..5786025 100644 --- a/crypto/openssh/rijndael.c +++ b/crypto/openssh/rijndael.c @@ -1,4 +1,5 @@ -/* $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 $ */ +/* $FreeBSD$ */ /** * rijndael-alg-fst.c @@ -1226,7 +1227,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); } } |
