Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Browse files Browse the repository at this point in the history
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] geode: Fix not inplace encryption
  • Loading branch information
Linus Torvalds committed Nov 15, 2007
2 parents 4e396db + 2e21630 commit 99fee6d
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/crypto/geode-aes.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ geode_aes_crypt(struct geode_aes_op *op)
* we don't need to worry
*/

if (op->src == op->dst)
flags |= (AES_CTRL_DCA | AES_CTRL_SCA);
flags |= (AES_CTRL_DCA | AES_CTRL_SCA);

if (op->dir == AES_DIR_ENCRYPT)
flags |= AES_CTRL_ENCRYPT;
Expand Down

0 comments on commit 99fee6d

Please sign in to comment.