diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 22:17:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 22:17:07 -0500 |
| commit | 99fee6d7e5748d96884667a4628118f7fc130ea0 (patch) | |
| tree | 93ab9c3eae9e4f8b03deb88e7c3a3db39f435fdf /drivers | |
| parent | 4e396db8034cd5566a6b77716c15954b533090a6 (diff) | |
| parent | 2e21630ddc3fb717dc645356b75771c6a52dc627 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] geode: Fix not inplace encryption
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/geode-aes.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c index f9a34abbf4fa..711e246e1ef0 100644 --- a/drivers/crypto/geode-aes.c +++ b/drivers/crypto/geode-aes.c | |||
| @@ -110,8 +110,7 @@ geode_aes_crypt(struct geode_aes_op *op) | |||
| 110 | * we don't need to worry | 110 | * we don't need to worry |
| 111 | */ | 111 | */ |
| 112 | 112 | ||
| 113 | if (op->src == op->dst) | 113 | flags |= (AES_CTRL_DCA | AES_CTRL_SCA); |
| 114 | flags |= (AES_CTRL_DCA | AES_CTRL_SCA); | ||
| 115 | 114 | ||
| 116 | if (op->dir == AES_DIR_ENCRYPT) | 115 | if (op->dir == AES_DIR_ENCRYPT) |
| 117 | flags |= AES_CTRL_ENCRYPT; | 116 | flags |= AES_CTRL_ENCRYPT; |