diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-18 04:08:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-18 04:08:28 +0100 |
| commit | b3e0d3d7bab14f2544a3314bec53a23dc7dd2206 (patch) | |
| tree | 2bd3c1c1d128e0c362655fa70a6eea02fc856f62 /drivers/crypto/nx/nx-aes-ccm.c | |
| parent | team: Advertise tunneling offload features (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-b3e0d3d7bab14f2544a3314bec53a23dc7dd2206.tar.xz linux-b3e0d3d7bab14f2544a3314bec53a23dc7dd2206.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/geneve.c
Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/crypto/nx/nx-aes-ccm.c')
| -rw-r--r-- | drivers/crypto/nx/nx-aes-ccm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/nx/nx-aes-ccm.c b/drivers/crypto/nx/nx-aes-ccm.c index 73ef49922788..7038f364acb5 100644 --- a/drivers/crypto/nx/nx-aes-ccm.c +++ b/drivers/crypto/nx/nx-aes-ccm.c @@ -409,7 +409,7 @@ static int ccm_nx_decrypt(struct aead_request *req, processed += to_process; } while (processed < nbytes); - rc = memcmp(csbcpb->cpb.aes_ccm.out_pat_or_mac, priv->oauth_tag, + rc = crypto_memneq(csbcpb->cpb.aes_ccm.out_pat_or_mac, priv->oauth_tag, authsize) ? -EBADMSG : 0; out: spin_unlock_irqrestore(&nx_ctx->lock, irq_flags); |