UBUNTU: [Config] CONFIG_W1_SLAVE_DS2438=m

[mirror_ubuntu-artful-kernel.git] / crypto / ccm.c

diff --git a/crypto/ccm.c b/crypto/ccm.c
index 1ce37ae0ce565a130962f50244f331117fe965d8..0a083342ec8cf3b17c4da15c515c8c3d7a519a0f 100644 (file)
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -363,7 +363,7 @@ static int crypto_ccm_decrypt(struct aead_request *req)
        unsigned int cryptlen = req->cryptlen;
        u8 *authtag = pctx->auth_tag;
        u8 *odata = pctx->odata;
-       u8 *iv = req->iv;
+       u8 *iv = pctx->idata;
        int err;
 
        cryptlen -= authsize;
@@ -379,6 +379,8 @@ static int crypto_ccm_decrypt(struct aead_request *req)
        if (req->src != req->dst)
                dst = pctx->dst;
 
+       memcpy(iv, req->iv, 16);
+
        skcipher_request_set_tfm(skreq, ctx->ctr);
        skcipher_request_set_callback(skreq, pctx->flags,
                                      crypto_ccm_decrypt_done, req);