Thread (4 messages) 4 messages, 2 authors, 2015-07-23
STALE4013d

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

From: Tadeusz Struk <hidden>
Date: 2015-07-21 00:18:59
Subsystem: asymmetric keys - rsa, crypto api, the rest · Maintainers: Lukas Wunner, Ignat Korchagin, Herbert Xu, "David S. Miller", Linus Torvalds

The condition checking allowed key length was invalid.

Reported-by: Dan Carpenter <redacted>

Signed-off-by: Tadeusz Struk <redacted>
---
 crypto/rsa_helper.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/rsa_helper.c b/crypto/rsa_helper.c
index 3e8e0a9..8d96ce9 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);
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help