Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / drivers / crypto / geode-aes.c

diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index 0ca92d414667b27da1e03110935ad2f4cd5f72c1..4801162919d9db389ac9acc9b19b8d56c94cf752 100644 (file)
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -190,7 +190,7 @@ static int fallback_blk_dec(struct blkcipher_desc *desc,
        tfm = desc->tfm;
        desc->tfm = op->fallback.blk;
 
-       ret = crypto_blkcipher_decrypt(desc, dst, src, nbytes);
+       ret = crypto_blkcipher_decrypt_iv(desc, dst, src, nbytes);
 
        desc->tfm = tfm;
        return ret;
@@ -206,7 +206,7 @@ static int fallback_blk_enc(struct blkcipher_desc *desc,
        tfm = desc->tfm;
        desc->tfm = op->fallback.blk;
 
-       ret = crypto_blkcipher_encrypt(desc, dst, src, nbytes);
+       ret = crypto_blkcipher_encrypt_iv(desc, dst, src, nbytes);
 
        desc->tfm = tfm;
        return ret;
@@ -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,
@@ -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;
 }
 
@@ -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,
@@ -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;
 }
 
@@ -501,7 +499,7 @@ static struct crypto_alg geode_ecb_alg = {
        }
 };
 
-static void
+static void __devexit
 geode_aes_remove(struct pci_dev *dev)
 {
        crypto_unregister_alg(&geode_alg);
@@ -516,7 +514,7 @@ geode_aes_remove(struct pci_dev *dev)
 }
 
 
-static int
+static int __devinit
 geode_aes_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
        int ret;