diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 11:19:47 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 11:19:47 +0800 |
commit | c3afafa47898e34eb49828ec4ac92bcdc81c8f0c (patch) | |
tree | 055f603e131de9c4d36dafb1856fe69c737152de /drivers/crypto/qat | |
parent | f97581cfa6e7db9818520597b8a44f8268d75013 (diff) | |
parent | 80da44c29d997e28c4442825f35f4ac339813877 (diff) | |
download | op-kernel-dev-c3afafa47898e34eb49828ec4ac92bcdc81c8f0c.zip op-kernel-dev-c3afafa47898e34eb49828ec4ac92bcdc81c8f0c.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in vmx ghash fix.
Diffstat (limited to 'drivers/crypto/qat')
-rw-r--r-- | drivers/crypto/qat/qat_common/qat_algs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c index 769148d..20f35df 100644 --- a/drivers/crypto/qat/qat_common/qat_algs.c +++ b/drivers/crypto/qat/qat_common/qat_algs.c @@ -1260,8 +1260,8 @@ static struct crypto_alg qat_algs[] = { { .setkey = qat_alg_ablkcipher_xts_setkey, .decrypt = qat_alg_ablkcipher_decrypt, .encrypt = qat_alg_ablkcipher_encrypt, - .min_keysize = AES_MIN_KEY_SIZE, - .max_keysize = AES_MAX_KEY_SIZE, + .min_keysize = 2 * AES_MIN_KEY_SIZE, + .max_keysize = 2 * AES_MAX_KEY_SIZE, .ivsize = AES_BLOCK_SIZE, }, }, |