crypto: rsa - allow keys >= 2048 bits in FIPS mode

With a public notification, NIST now allows the use of RSA keys with a
modulus >= 2048 bits. The new rule allows any modulus size >= 2048 bits
provided that either 2048 or 3072 bits are supported at least so that
the entire RSA implementation can be CAVS tested.

This patch fixes the inability to boot the kernel in FIPS mode, because
certs/x509.genkey defines a 4096 bit RSA key per default. This key causes
the RSA signature verification to fail in FIPS mode without the patch
below.

Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/rsa_helper.c b/crypto/rsa_helper.c
index 4df6451e7543670f7836c2507e77d7329d65b10f..0b66dc8246068aa084dd0b44210b04dee5f2bccb 100644 (file)
--- a/crypto/rsa_helper.c
+++ b/crypto/rsa_helper.c
@@ -35,8 +35,8 @@ int rsa_get_n(void *context, size_t hdrlen, unsigned char tag,
                        n_sz--;
                }
 
-               /* In FIPS mode only allow key size 2K & 3K */
-               if (n_sz != 256 && n_sz != 384) {
+               /* In FIPS mode only allow key size 2K and higher */
+               if (n_sz < 256) {
                        pr_err("RSA: key size not allowed in FIPS mode\n");
                        return -EINVAL;
                }