Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 75934
b: refs/heads/master
c: d2456c6
h: refs/heads/master
v: v3
  • Loading branch information
Sebastian Siewior authored and Herbert Xu committed Jan 10, 2008
1 parent 9f2717a commit 8cdb0f5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9617d6ef6278edd04070ae404c871f65a466c6d2
refs/heads/master: d2456c66236c15d6462f1ac751cdbd48a34e9704
6 changes: 2 additions & 4 deletions trunk/drivers/crypto/geode-aes.c
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ geode_cbc_decrypt(struct blkcipher_desc *desc,

blkcipher_walk_init(&walk, dst, src, nbytes);
err = blkcipher_walk_virt(desc, &walk);
memcpy(op->iv, walk.iv, AES_IV_LENGTH);
op->iv = walk.iv;

while((nbytes = walk.nbytes)) {
op->src = walk.src.virt.addr,
Expand All @@ -330,7 +330,6 @@ geode_cbc_decrypt(struct blkcipher_desc *desc,
err = blkcipher_walk_done(desc, &walk, nbytes);
}

memcpy(walk.iv, op->iv, AES_IV_LENGTH);
return err;
}

Expand All @@ -348,7 +347,7 @@ geode_cbc_encrypt(struct blkcipher_desc *desc,

blkcipher_walk_init(&walk, dst, src, nbytes);
err = blkcipher_walk_virt(desc, &walk);
memcpy(op->iv, walk.iv, AES_IV_LENGTH);
op->iv = walk.iv;

while((nbytes = walk.nbytes)) {
op->src = walk.src.virt.addr,
Expand All @@ -362,7 +361,6 @@ geode_cbc_encrypt(struct blkcipher_desc *desc,
err = blkcipher_walk_done(desc, &walk, nbytes);
}

memcpy(walk.iv, op->iv, AES_IV_LENGTH);
return err;
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/crypto/geode-aes.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct geode_aes_op {
int len;

u8 key[AES_KEY_LENGTH];
u8 iv[AES_IV_LENGTH];
u8 *iv;

union {
struct crypto_blkcipher *blk;
Expand Down

0 comments on commit 8cdb0f5

Please sign in to comment.