diff options
| author | Tadeusz Struk <tadeusz.struk@intel.com> | 2015-07-20 17:18:26 -0700 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-07-21 20:19:36 +0800 |
| commit | 4adaf25e9ae3322f8d185181c36b561231d71e96 (patch) | |
| tree | be92d7dc03f2a4eae670ddcb33ea6a52d72d2fcf | |
| parent | 2626885a1dad658b652381f4e6da084796295893 (diff) | |
| download | linux-crypto-4adaf25e9ae3322f8d185181c36b561231d71e96.tar.gz linux-crypto-4adaf25e9ae3322f8d185181c36b561231d71e96.zip | |
crypto: rsa - fix invalid check for 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>
| -rw-r--r-- | crypto/rsa_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/rsa_helper.c b/crypto/rsa_helper.c index 3e8e0a9e..8d96ce96 100644 --- a/crypto/rsa_helper.c +++ b/crypto/rsa_helper.c @@ -28,7 +28,7 @@ int rsa_get_n(void *context, size_t hdrlen, unsigned char tag, return -ENOMEM; /* 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)) { pr_err("RSA: key size not allowed in FIPS mode\n"); mpi_free(key->n); @@ -62,7 +62,7 @@ int rsa_get_d(void *context, size_t hdrlen, unsigned char tag, return -ENOMEM; /* 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)) { pr_err("RSA: key size not allowed in FIPS mode\n"); mpi_free(key->d); |