Commit a9d4f82f authored by Tadeusz Struk's avatar Tadeusz Struk Committed by Herbert Xu

crypto: rsa - fix invalid check for keylen in fips mode

The condition checking allowed key length was invalid.
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarTadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent bc368798
...@@ -28,7 +28,7 @@ int rsa_get_n(void *context, size_t hdrlen, unsigned char tag, ...@@ -28,7 +28,7 @@ int rsa_get_n(void *context, size_t hdrlen, unsigned char tag,
return -ENOMEM; return -ENOMEM;
/* In FIPS mode only allow key size 2K & 3K */ /* In FIPS mode only allow key size 2K & 3K */
if (fips_enabled && (mpi_get_size(key->n) != 256 || if (fips_enabled && (mpi_get_size(key->n) != 256 &&
mpi_get_size(key->n) != 384)) { mpi_get_size(key->n) != 384)) {
pr_err("RSA: key size not allowed in FIPS mode\n"); pr_err("RSA: key size not allowed in FIPS mode\n");
mpi_free(key->n); mpi_free(key->n);
...@@ -62,7 +62,7 @@ int rsa_get_d(void *context, size_t hdrlen, unsigned char tag, ...@@ -62,7 +62,7 @@ int rsa_get_d(void *context, size_t hdrlen, unsigned char tag,
return -ENOMEM; return -ENOMEM;
/* In FIPS mode only allow key size 2K & 3K */ /* In FIPS mode only allow key size 2K & 3K */
if (fips_enabled && (mpi_get_size(key->d) != 256 || if (fips_enabled && (mpi_get_size(key->d) != 256 &&
mpi_get_size(key->d) != 384)) { mpi_get_size(key->d) != 384)) {
pr_err("RSA: key size not allowed in FIPS mode\n"); pr_err("RSA: key size not allowed in FIPS mode\n");
mpi_free(key->d); mpi_free(key->d);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment