linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 0/2] crypto: validate inputs for gcm and aes
@ 2019-07-31 13:05 Iuliana Prodan
  2019-07-31 13:05 ` [PATCH v3 1/2] crypto: gcm - helper functions for assoclen/authsize check Iuliana Prodan
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Iuliana Prodan @ 2019-07-31 13:05 UTC (permalink / raw)
  To: Herbert Xu, David S. Miller; +Cc: linux-crypto, linux-kernel, linux-imx

Added inline helper functions to check authsize and assoclen for
gcm, rfc4106 and rfc4543.  
Added, also, inline helper function to check key length for AES algorithms.
These are used in the generic implementation of gcm/rfc4106/rfc4543
and aes.

Changes since v2:
- rename aes helper functions without crypto_ prefix;
- change include for gcm.h.

Iuliana Prodan (2):
  crypto: gcm - helper functions for assoclen/authsize check
  crypto: aes - helper function to validate key length for AES
    algorithms

 crypto/gcm.c         | 41 ++++++++++++++-------------------------
 include/crypto/aes.h | 17 ++++++++++++++++
 include/crypto/gcm.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/crypto/aes.c     |  8 ++++----
 4 files changed, 91 insertions(+), 30 deletions(-)

-- 
2.1.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v3 1/2] crypto: gcm - helper functions for assoclen/authsize check
  2019-07-31 13:05 [PATCH v3 0/2] crypto: validate inputs for gcm and aes Iuliana Prodan
@ 2019-07-31 13:05 ` Iuliana Prodan
  2019-07-31 13:05 ` [PATCH v3 2/2] crypto: aes - helper function to validate key length for AES algorithms Iuliana Prodan
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Iuliana Prodan @ 2019-07-31 13:05 UTC (permalink / raw)
  To: Herbert Xu, David S. Miller; +Cc: linux-crypto, linux-kernel, linux-imx

Added inline helper functions to check authsize and assoclen for
gcm, rfc4106 and rfc4543.
These are used in the generic implementation of gcm, rfc4106 and
rfc4543.

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
---
 crypto/gcm.c         | 41 ++++++++++++++-------------------------
 include/crypto/gcm.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/crypto/gcm.c b/crypto/gcm.c
index f254e2d..2f3b50f 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -152,20 +152,7 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key,
 static int crypto_gcm_setauthsize(struct crypto_aead *tfm,
 				  unsigned int authsize)
 {
-	switch (authsize) {
-	case 4:
-	case 8:
-	case 12:
-	case 13:
-	case 14:
-	case 15:
-	case 16:
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
+	return crypto_gcm_check_authsize(authsize);
 }
 
 static void crypto_gcm_init_common(struct aead_request *req)
@@ -762,15 +749,11 @@ static int crypto_rfc4106_setauthsize(struct crypto_aead *parent,
 				      unsigned int authsize)
 {
 	struct crypto_rfc4106_ctx *ctx = crypto_aead_ctx(parent);
+	int err;
 
-	switch (authsize) {
-	case 8:
-	case 12:
-	case 16:
-		break;
-	default:
-		return -EINVAL;
-	}
+	err = crypto_rfc4106_check_authsize(authsize);
+	if (err)
+		return err;
 
 	return crypto_aead_setauthsize(ctx->child, authsize);
 }
@@ -818,8 +801,11 @@ static struct aead_request *crypto_rfc4106_crypt(struct aead_request *req)
 
 static int crypto_rfc4106_encrypt(struct aead_request *req)
 {
-	if (req->assoclen != 16 && req->assoclen != 20)
-		return -EINVAL;
+	int err;
+
+	err = crypto_ipsec_check_assoclen(req->assoclen);
+	if (err)
+		return err;
 
 	req = crypto_rfc4106_crypt(req);
 
@@ -828,8 +814,11 @@ static int crypto_rfc4106_encrypt(struct aead_request *req)
 
 static int crypto_rfc4106_decrypt(struct aead_request *req)
 {
-	if (req->assoclen != 16 && req->assoclen != 20)
-		return -EINVAL;
+	int err;
+
+	err = crypto_ipsec_check_assoclen(req->assoclen);
+	if (err)
+		return err;
 
 	req = crypto_rfc4106_crypt(req);
 
diff --git a/include/crypto/gcm.h b/include/crypto/gcm.h
index c50e057..9d7eff0 100644
--- a/include/crypto/gcm.h
+++ b/include/crypto/gcm.h
@@ -1,8 +1,63 @@
 #ifndef _CRYPTO_GCM_H
 #define _CRYPTO_GCM_H
 
+#include <linux/errno.h>
+
 #define GCM_AES_IV_SIZE 12
 #define GCM_RFC4106_IV_SIZE 8
 #define GCM_RFC4543_IV_SIZE 8
 
+/*
+ * validate authentication tag for GCM
+ */
+static inline int crypto_gcm_check_authsize(unsigned int authsize)
+{
+	switch (authsize) {
+	case 4:
+	case 8:
+	case 12:
+	case 13:
+	case 14:
+	case 15:
+	case 16:
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+/*
+ * validate authentication tag for RFC4106
+ */
+static inline int crypto_rfc4106_check_authsize(unsigned int authsize)
+{
+	switch (authsize) {
+	case 8:
+	case 12:
+	case 16:
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+/*
+ * validate assoclen for RFC4106/RFC4543
+ */
+static inline int crypto_ipsec_check_assoclen(unsigned int assoclen)
+{
+	switch (assoclen) {
+	case 16:
+	case 20:
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
 #endif
-- 
2.1.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v3 2/2] crypto: aes - helper function to validate key length for AES algorithms
  2019-07-31 13:05 [PATCH v3 0/2] crypto: validate inputs for gcm and aes Iuliana Prodan
  2019-07-31 13:05 ` [PATCH v3 1/2] crypto: gcm - helper functions for assoclen/authsize check Iuliana Prodan
@ 2019-07-31 13:05 ` Iuliana Prodan
  2019-07-31 13:35 ` [PATCH v3 0/2] crypto: validate inputs for gcm and aes Horia Geanta
  2019-08-09  6:18 ` Herbert Xu
  3 siblings, 0 replies; 6+ messages in thread
From: Iuliana Prodan @ 2019-07-31 13:05 UTC (permalink / raw)
  To: Herbert Xu, David S. Miller; +Cc: linux-crypto, linux-kernel, linux-imx

Add inline helper function to check key length for AES algorithms.
The key can be 128, 192 or 256 bits size.
This function is used in the generic aes implementation.

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
---
 include/crypto/aes.h | 17 +++++++++++++++++
 lib/crypto/aes.c     |  8 ++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/include/crypto/aes.h b/include/crypto/aes.h
index 8e0f4cf..2090729 100644
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -31,6 +31,23 @@ struct crypto_aes_ctx {
 extern const u32 crypto_ft_tab[4][256] ____cacheline_aligned;
 extern const u32 crypto_it_tab[4][256] ____cacheline_aligned;
 
+/*
+ * validate key length for AES algorithms
+ */
+static inline int aes_check_keylen(unsigned int keylen)
+{
+	switch (keylen) {
+	case AES_KEYSIZE_128:
+	case AES_KEYSIZE_192:
+	case AES_KEYSIZE_256:
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
 int crypto_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
 		unsigned int key_len);
 
diff --git a/lib/crypto/aes.c b/lib/crypto/aes.c
index 4e100af..827fe89 100644
--- a/lib/crypto/aes.c
+++ b/lib/crypto/aes.c
@@ -187,11 +187,11 @@ int aes_expandkey(struct crypto_aes_ctx *ctx, const u8 *in_key,
 {
 	u32 kwords = key_len / sizeof(u32);
 	u32 rc, i, j;
+	int err;
 
-	if (key_len != AES_KEYSIZE_128 &&
-	    key_len != AES_KEYSIZE_192 &&
-	    key_len != AES_KEYSIZE_256)
-		return -EINVAL;
+	err = aes_check_keylen(key_len);
+	if (err)
+		return err;
 
 	ctx->key_length = key_len;
 
-- 
2.1.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v3 0/2] crypto: validate inputs for gcm and aes
  2019-07-31 13:05 [PATCH v3 0/2] crypto: validate inputs for gcm and aes Iuliana Prodan
  2019-07-31 13:05 ` [PATCH v3 1/2] crypto: gcm - helper functions for assoclen/authsize check Iuliana Prodan
  2019-07-31 13:05 ` [PATCH v3 2/2] crypto: aes - helper function to validate key length for AES algorithms Iuliana Prodan
@ 2019-07-31 13:35 ` Horia Geanta
  2019-08-01  7:14   ` Ard Biesheuvel
  2019-08-09  6:18 ` Herbert Xu
  3 siblings, 1 reply; 6+ messages in thread
From: Horia Geanta @ 2019-07-31 13:35 UTC (permalink / raw)
  To: Iuliana Prodan, Herbert Xu, David S. Miller
  Cc: linux-crypto, linux-kernel, dl-linux-imx

On 7/31/2019 4:06 PM, Iuliana Prodan wrote:
> Added inline helper functions to check authsize and assoclen for
> gcm, rfc4106 and rfc4543.  
> Added, also, inline helper function to check key length for AES algorithms.
> These are used in the generic implementation of gcm/rfc4106/rfc4543
> and aes.
> 
For the series:
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>

Thanks,
Horia

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v3 0/2] crypto: validate inputs for gcm and aes
  2019-07-31 13:35 ` [PATCH v3 0/2] crypto: validate inputs for gcm and aes Horia Geanta
@ 2019-08-01  7:14   ` Ard Biesheuvel
  0 siblings, 0 replies; 6+ messages in thread
From: Ard Biesheuvel @ 2019-08-01  7:14 UTC (permalink / raw)
  To: Horia Geanta
  Cc: Iuliana Prodan, Herbert Xu, David S. Miller, linux-crypto,
	linux-kernel, dl-linux-imx

On Wed, 31 Jul 2019 at 16:35, Horia Geanta <horia.geanta@nxp.com> wrote:
>
> On 7/31/2019 4:06 PM, Iuliana Prodan wrote:
> > Added inline helper functions to check authsize and assoclen for
> > gcm, rfc4106 and rfc4543.
> > Added, also, inline helper function to check key length for AES algorithms.
> > These are used in the generic implementation of gcm/rfc4106/rfc4543
> > and aes.
> >
> For the series:
> Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
>

Likewise,

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v3 0/2] crypto: validate inputs for gcm and aes
  2019-07-31 13:05 [PATCH v3 0/2] crypto: validate inputs for gcm and aes Iuliana Prodan
                   ` (2 preceding siblings ...)
  2019-07-31 13:35 ` [PATCH v3 0/2] crypto: validate inputs for gcm and aes Horia Geanta
@ 2019-08-09  6:18 ` Herbert Xu
  3 siblings, 0 replies; 6+ messages in thread
From: Herbert Xu @ 2019-08-09  6:18 UTC (permalink / raw)
  To: Iuliana Prodan; +Cc: David S. Miller, linux-crypto, linux-kernel, linux-imx

On Wed, Jul 31, 2019 at 04:05:53PM +0300, Iuliana Prodan wrote:
> Added inline helper functions to check authsize and assoclen for
> gcm, rfc4106 and rfc4543.  
> Added, also, inline helper function to check key length for AES algorithms.
> These are used in the generic implementation of gcm/rfc4106/rfc4543
> and aes.
> 
> Changes since v2:
> - rename aes helper functions without crypto_ prefix;
> - change include for gcm.h.
> 
> Iuliana Prodan (2):
>   crypto: gcm - helper functions for assoclen/authsize check
>   crypto: aes - helper function to validate key length for AES
>     algorithms
> 
>  crypto/gcm.c         | 41 ++++++++++++++-------------------------
>  include/crypto/aes.h | 17 ++++++++++++++++
>  include/crypto/gcm.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>  lib/crypto/aes.c     |  8 ++++----
>  4 files changed, 91 insertions(+), 30 deletions(-)

All applied.  Thanks.
-- 
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] 6+ messages in thread

end of thread, other threads:[~2019-08-09  6:18 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-31 13:05 [PATCH v3 0/2] crypto: validate inputs for gcm and aes Iuliana Prodan
2019-07-31 13:05 ` [PATCH v3 1/2] crypto: gcm - helper functions for assoclen/authsize check Iuliana Prodan
2019-07-31 13:05 ` [PATCH v3 2/2] crypto: aes - helper function to validate key length for AES algorithms Iuliana Prodan
2019-07-31 13:35 ` [PATCH v3 0/2] crypto: validate inputs for gcm and aes Horia Geanta
2019-08-01  7:14   ` Ard Biesheuvel
2019-08-09  6:18 ` Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).