* [PATCH] crypto: rsa - fix invalid check for keylen in fips mode
@ 2015-07-21 0:18 Tadeusz Struk
2015-07-21 12:25 ` Herbert Xu
0 siblings, 1 reply; 4+ messages in thread
From: Tadeusz Struk @ 2015-07-21 0:18 UTC (permalink / raw)
To: herbert; +Cc: linux-crypto, dan.carpenter, tadeusz.struk
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>
---
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);
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] crypto: rsa - fix invalid check for keylen in fips mode
2015-07-21 0:18 [PATCH] crypto: rsa - fix invalid check for keylen in fips mode Tadeusz Struk
@ 2015-07-21 12:25 ` Herbert Xu
2015-07-22 13:38 ` Tadeusz Struk
0 siblings, 1 reply; 4+ messages in thread
From: Herbert Xu @ 2015-07-21 12:25 UTC (permalink / raw)
To: Tadeusz Struk; +Cc: linux-crypto, dan.carpenter
On Mon, Jul 20, 2015 at 05:18:26PM -0700, Tadeusz Struk wrote:
> 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>
Applied.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: rsa - fix invalid check for keylen in fips mode
2015-07-21 12:25 ` Herbert Xu
@ 2015-07-22 13:38 ` Tadeusz Struk
2015-07-23 1:54 ` Herbert Xu
0 siblings, 1 reply; 4+ messages in thread
From: Tadeusz Struk @ 2015-07-22 13:38 UTC (permalink / raw)
To: Herbert Xu; +Cc: linux-crypto, dan.carpenter
On 07/21/2015 05:25 AM, Herbert Xu wrote:
> On Mon, Jul 20, 2015 at 05:18:26PM -0700, Tadeusz Struk wrote:
>> 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>
>
> Applied.
>
Herbert, Shouldn't this one go to 4.2?
Thanks,
T
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: rsa - fix invalid check for keylen in fips mode
2015-07-22 13:38 ` Tadeusz Struk
@ 2015-07-23 1:54 ` Herbert Xu
0 siblings, 0 replies; 4+ messages in thread
From: Herbert Xu @ 2015-07-23 1:54 UTC (permalink / raw)
To: Tadeusz Struk; +Cc: linux-crypto, dan.carpenter
On Wed, Jul 22, 2015 at 06:38:45AM -0700, Tadeusz Struk wrote:
> On 07/21/2015 05:25 AM, Herbert Xu wrote:
> > On Mon, Jul 20, 2015 at 05:18:26PM -0700, Tadeusz Struk wrote:
> >> 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>
> >
> > Applied.
> >
> Herbert, Shouldn't this one go to 4.2?
No because we don't have any RSA users in 4.2.
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-23 1:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-21 0:18 [PATCH] crypto: rsa - fix invalid check for keylen in fips mode Tadeusz Struk
2015-07-21 12:25 ` Herbert Xu
2015-07-22 13:38 ` Tadeusz Struk
2015-07-23 1:54 ` Herbert Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.