aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto/qat
diff options
context:
space:
mode:
authorTadeusz Struk <tadeusz.struk@intel.com>2015-07-20 20:18:27 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2015-07-21 08:19:40 -0400
commit3cf080a7b747d800efc231d29bd3a07659c6aeb6 (patch)
tree51d05da31d3197d1792f5317364224cdf063f33e /drivers/crypto/qat
parenta9d4f82ff9de004fc4630d3f3fbc234b8cfe07b3 (diff)
crypto: qat - fix invalid check for RSA keylen in fips mode
The condition checking allowed key length was invalid. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/qat')
-rw-r--r--drivers/crypto/qat/qat_common/qat_asym_algs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/qat/qat_common/qat_asym_algs.c b/drivers/crypto/qat/qat_common/qat_asym_algs.c
index 13a76a0325ed..557a7408710d 100644
--- a/drivers/crypto/qat/qat_common/qat_asym_algs.c
+++ b/drivers/crypto/qat/qat_common/qat_asym_algs.c
@@ -443,7 +443,7 @@ int qat_rsa_get_n(void *context, size_t hdrlen, unsigned char tag,
443 ctx->key_sz = vlen; 443 ctx->key_sz = vlen;
444 ret = -EINVAL; 444 ret = -EINVAL;
445 /* In FIPS mode only allow key size 2K & 3K */ 445 /* In FIPS mode only allow key size 2K & 3K */
446 if (fips_enabled && (ctx->key_sz != 256 || ctx->key_sz != 384)) { 446 if (fips_enabled && (ctx->key_sz != 256 && ctx->key_sz != 384)) {
447 pr_err("QAT: RSA: key size not allowed in FIPS mode\n"); 447 pr_err("QAT: RSA: key size not allowed in FIPS mode\n");
448 goto err; 448 goto err;
449 } 449 }
@@ -510,7 +510,7 @@ int qat_rsa_get_d(void *context, size_t hdrlen, unsigned char tag,
510 goto err; 510 goto err;
511 511
512 /* In FIPS mode only allow key size 2K & 3K */ 512 /* In FIPS mode only allow key size 2K & 3K */
513 if (fips_enabled && (vlen != 256 || vlen != 384)) { 513 if (fips_enabled && (vlen != 256 && vlen != 384)) {
514 pr_err("QAT: RSA: key size not allowed in FIPS mode\n"); 514 pr_err("QAT: RSA: key size not allowed in FIPS mode\n");
515 goto err; 515 goto err;
516 } 516 }