[PATCH 0/2] crypto: inside-secure - Cosmetic fixes for readability

[PATCH 0/2] crypto: inside-secure - Cosmetic fixes for readability

[Pascal van Leeuwen]

This patch set replaces some hard constants with appropriate defines from
the crypto header files and fixes a comment mistake.

Pascal van Leeuwen (2):
  crypto: inside-secure - Use defines instead of some constants
    (cosmetic)
  crypto: inside-secure: This fixes a mistake in a comment for XTS

 drivers/crypto/inside-secure/safexcel_cipher.c | 37 ++++++++++++++------------
 1 file changed, 20 insertions(+), 17 deletions(-)

-- 
1.8.3.1

[PATCH 1/2] crypto: inside-secure - Use defines instead of some constants (cosmetic)

[Pascal van Leeuwen]

This patch replaces some hard constants regarding key, IV and nonce sizes
with appropriate defines from the crypto header files.

Signed-off-by: Pascal van Leeuwen <pvanleeuwen@verimatrix.com>
---
 drivers/crypto/inside-secure/safexcel_cipher.c | 35 ++++++++++++++------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c
index d65e5f7..a30fdd5 100644
--- a/drivers/crypto/inside-secure/safexcel_cipher.c
+++ b/drivers/crypto/inside-secure/safexcel_cipher.c
@@ -12,6 +12,7 @@
 #include <crypto/aead.h>
 #include <crypto/aes.h>
 #include <crypto/authenc.h>
+#include <crypto/ctr.h>
 #include <crypto/des.h>
 #include <crypto/sha.h>
 #include <crypto/skcipher.h>
@@ -237,19 +238,21 @@ static int safexcel_aead_setkey(struct crypto_aead *ctfm, const u8 *key,
 		goto badkey;
 
 	if (ctx->mode == CONTEXT_CONTROL_CRYPTO_MODE_CTR_LOAD) {
-		/* 20 is minimum AES key: 16 bytes + 4 bytes nonce */
-		if (keys.enckeylen < 20)
+		/* Minimum keysize is minimum AES key size + nonce size */
+		if (keys.enckeylen < (AES_MIN_KEY_SIZE +
+				      CTR_RFC3686_NONCE_SIZE))
 			goto badkey;
 		/* last 4 bytes of key are the nonce! */
-		ctx->nonce = *(u32 *)(keys.enckey + keys.enckeylen - 4);
+		ctx->nonce = *(u32 *)(keys.enckey + keys.enckeylen -
+				      CTR_RFC3686_NONCE_SIZE);
 		/* exclude the nonce here */
-		keys.enckeylen -= 4;
+		keys.enckeylen -= CONTEXT_CONTROL_CRYPTO_MODE_CTR_LOAD;
 	}
 
 	/* Encryption key */
 	switch (ctx->alg) {
 	case SAFEXCEL_3DES:
-		if (keys.enckeylen != 24)
+		if (keys.enckeylen != DES3_EDE_KEY_SIZE)
 			goto badkey;
 		flags = crypto_aead_get_flags(ctfm);
 		err = __des3_verify_key(&flags, keys.enckey);
@@ -1114,9 +1117,9 @@ static int safexcel_skcipher_aesctr_setkey(struct crypto_skcipher *ctfm,
 	unsigned int keylen;
 
 	/* last 4 bytes of key are the nonce! */
-	ctx->nonce = *(u32 *)(key + len - 4);
+	ctx->nonce = *(u32 *)(key + len - CTR_RFC3686_NONCE_SIZE);
 	/* exclude the nonce here */
-	keylen = len - 4;
+	keylen = len - CTR_RFC3686_NONCE_SIZE;
 	ret = crypto_aes_expand_key(&aes, key, keylen);
 	if (ret) {
 		crypto_skcipher_set_flags(ctfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
@@ -1157,10 +1160,10 @@ struct safexcel_alg_template safexcel_alg_ctr_aes = {
 		.setkey = safexcel_skcipher_aesctr_setkey,
 		.encrypt = safexcel_encrypt,
 		.decrypt = safexcel_decrypt,
-		/* Add 4 to include the 4 byte nonce! */
-		.min_keysize = AES_MIN_KEY_SIZE + 4,
-		.max_keysize = AES_MAX_KEY_SIZE + 4,
-		.ivsize = 8,
+		/* Add nonce size */
+		.min_keysize = AES_MIN_KEY_SIZE + CTR_RFC3686_NONCE_SIZE,
+		.max_keysize = AES_MAX_KEY_SIZE + CTR_RFC3686_NONCE_SIZE,
+		.ivsize = CTR_RFC3686_IV_SIZE,
 		.base = {
 			.cra_name = "rfc3686(ctr(aes))",
 			.cra_driver_name = "safexcel-ctr-aes",
@@ -1620,7 +1623,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_ctr_aes = {
 		.setkey = safexcel_aead_setkey,
 		.encrypt = safexcel_aead_encrypt,
 		.decrypt = safexcel_aead_decrypt,
-		.ivsize = 8,
+		.ivsize = CTR_RFC3686_IV_SIZE,
 		.maxauthsize = SHA1_DIGEST_SIZE,
 		.base = {
 			.cra_name = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
@@ -1653,7 +1656,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_ctr_aes = {
 		.setkey = safexcel_aead_setkey,
 		.encrypt = safexcel_aead_encrypt,
 		.decrypt = safexcel_aead_decrypt,
-		.ivsize = 8,
+		.ivsize = CTR_RFC3686_IV_SIZE,
 		.maxauthsize = SHA256_DIGEST_SIZE,
 		.base = {
 			.cra_name = "authenc(hmac(sha256),rfc3686(ctr(aes)))",
@@ -1686,7 +1689,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_ctr_aes = {
 		.setkey = safexcel_aead_setkey,
 		.encrypt = safexcel_aead_encrypt,
 		.decrypt = safexcel_aead_decrypt,
-		.ivsize = 8,
+		.ivsize = CTR_RFC3686_IV_SIZE,
 		.maxauthsize = SHA224_DIGEST_SIZE,
 		.base = {
 			.cra_name = "authenc(hmac(sha224),rfc3686(ctr(aes)))",
@@ -1719,7 +1722,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha512_ctr_aes = {
 		.setkey = safexcel_aead_setkey,
 		.encrypt = safexcel_aead_encrypt,
 		.decrypt = safexcel_aead_decrypt,
-		.ivsize = 8,
+		.ivsize = CTR_RFC3686_IV_SIZE,
 		.maxauthsize = SHA512_DIGEST_SIZE,
 		.base = {
 			.cra_name = "authenc(hmac(sha512),rfc3686(ctr(aes)))",
@@ -1752,7 +1755,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha384_ctr_aes = {
 		.setkey = safexcel_aead_setkey,
 		.encrypt = safexcel_aead_encrypt,
 		.decrypt = safexcel_aead_decrypt,
-		.ivsize = 8,
+		.ivsize = CTR_RFC3686_IV_SIZE,
 		.maxauthsize = SHA384_DIGEST_SIZE,
 		.base = {
 			.cra_name = "authenc(hmac(sha384),rfc3686(ctr(aes)))",
-- 
1.8.3.1

[PATCH 2/2] crypto: inside-secure: This fixes a mistake in a comment for XTS

[Pascal van Leeuwen]

This fixes a copy-paste (and forgot to edit) mistake in a comment
for XTS regarding the key length specification.

Signed-off-by: Pascal van Leeuwen <pvanleeuwen@verimatrix.com>
---
 drivers/crypto/inside-secure/safexcel_cipher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c
index a30fdd5..56dc8f9 100644
--- a/drivers/crypto/inside-secure/safexcel_cipher.c
+++ b/drivers/crypto/inside-secure/safexcel_cipher.c
@@ -1847,7 +1847,7 @@ struct safexcel_alg_template safexcel_alg_xts_aes = {
 		.setkey = safexcel_skcipher_aesxts_setkey,
 		.encrypt = safexcel_encrypt,
 		.decrypt = safexcel_decrypt,
-		/* Add 4 to include the 4 byte nonce! */
+		/* XTS actually uses 2 AES keys glued together */
 		.min_keysize = AES_MIN_KEY_SIZE * 2,
 		.max_keysize = AES_MAX_KEY_SIZE * 2,
 		.ivsize = 16,
-- 
1.8.3.1

Re: [PATCH 1/2] crypto: inside-secure - Use defines instead of some constants (cosmetic)

[Antoine Tenart]

Hi Pascal,

On Tue, Jul 30, 2019 at 03:27:11PM +0200, Pascal van Leeuwen wrote:
> This patch replaces some hard constants regarding key, IV and nonce sizes
> with appropriate defines from the crypto header files.
> 
> Signed-off-by: Pascal van Leeuwen <pvanleeuwen@verimatrix.com>

Acked-by: Antoine Tenart <antoine.tenart@bootlin.com>

Thanks!
Antoine

> ---
>  drivers/crypto/inside-secure/safexcel_cipher.c | 35 ++++++++++++++------------
>  1 file changed, 19 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c
> index d65e5f7..a30fdd5 100644
> --- a/drivers/crypto/inside-secure/safexcel_cipher.c
> +++ b/drivers/crypto/inside-secure/safexcel_cipher.c
> @@ -12,6 +12,7 @@
>  #include <crypto/aead.h>
>  #include <crypto/aes.h>
>  #include <crypto/authenc.h>
> +#include <crypto/ctr.h>
>  #include <crypto/des.h>
>  #include <crypto/sha.h>
>  #include <crypto/skcipher.h>
> @@ -237,19 +238,21 @@ static int safexcel_aead_setkey(struct crypto_aead *ctfm, const u8 *key,
>  		goto badkey;
>  
>  	if (ctx->mode == CONTEXT_CONTROL_CRYPTO_MODE_CTR_LOAD) {
> -		/* 20 is minimum AES key: 16 bytes + 4 bytes nonce */
> -		if (keys.enckeylen < 20)
> +		/* Minimum keysize is minimum AES key size + nonce size */
> +		if (keys.enckeylen < (AES_MIN_KEY_SIZE +
> +				      CTR_RFC3686_NONCE_SIZE))
>  			goto badkey;
>  		/* last 4 bytes of key are the nonce! */
> -		ctx->nonce = *(u32 *)(keys.enckey + keys.enckeylen - 4);
> +		ctx->nonce = *(u32 *)(keys.enckey + keys.enckeylen -
> +				      CTR_RFC3686_NONCE_SIZE);
>  		/* exclude the nonce here */
> -		keys.enckeylen -= 4;
> +		keys.enckeylen -= CONTEXT_CONTROL_CRYPTO_MODE_CTR_LOAD;
>  	}
>  
>  	/* Encryption key */
>  	switch (ctx->alg) {
>  	case SAFEXCEL_3DES:
> -		if (keys.enckeylen != 24)
> +		if (keys.enckeylen != DES3_EDE_KEY_SIZE)
>  			goto badkey;
>  		flags = crypto_aead_get_flags(ctfm);
>  		err = __des3_verify_key(&flags, keys.enckey);
> @@ -1114,9 +1117,9 @@ static int safexcel_skcipher_aesctr_setkey(struct crypto_skcipher *ctfm,
>  	unsigned int keylen;
>  
>  	/* last 4 bytes of key are the nonce! */
> -	ctx->nonce = *(u32 *)(key + len - 4);
> +	ctx->nonce = *(u32 *)(key + len - CTR_RFC3686_NONCE_SIZE);
>  	/* exclude the nonce here */
> -	keylen = len - 4;
> +	keylen = len - CTR_RFC3686_NONCE_SIZE;
>  	ret = crypto_aes_expand_key(&aes, key, keylen);
>  	if (ret) {
>  		crypto_skcipher_set_flags(ctfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
> @@ -1157,10 +1160,10 @@ struct safexcel_alg_template safexcel_alg_ctr_aes = {
>  		.setkey = safexcel_skcipher_aesctr_setkey,
>  		.encrypt = safexcel_encrypt,
>  		.decrypt = safexcel_decrypt,
> -		/* Add 4 to include the 4 byte nonce! */
> -		.min_keysize = AES_MIN_KEY_SIZE + 4,
> -		.max_keysize = AES_MAX_KEY_SIZE + 4,
> -		.ivsize = 8,
> +		/* Add nonce size */
> +		.min_keysize = AES_MIN_KEY_SIZE + CTR_RFC3686_NONCE_SIZE,
> +		.max_keysize = AES_MAX_KEY_SIZE + CTR_RFC3686_NONCE_SIZE,
> +		.ivsize = CTR_RFC3686_IV_SIZE,
>  		.base = {
>  			.cra_name = "rfc3686(ctr(aes))",
>  			.cra_driver_name = "safexcel-ctr-aes",
> @@ -1620,7 +1623,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_ctr_aes = {
>  		.setkey = safexcel_aead_setkey,
>  		.encrypt = safexcel_aead_encrypt,
>  		.decrypt = safexcel_aead_decrypt,
> -		.ivsize = 8,
> +		.ivsize = CTR_RFC3686_IV_SIZE,
>  		.maxauthsize = SHA1_DIGEST_SIZE,
>  		.base = {
>  			.cra_name = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
> @@ -1653,7 +1656,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_ctr_aes = {
>  		.setkey = safexcel_aead_setkey,
>  		.encrypt = safexcel_aead_encrypt,
>  		.decrypt = safexcel_aead_decrypt,
> -		.ivsize = 8,
> +		.ivsize = CTR_RFC3686_IV_SIZE,
>  		.maxauthsize = SHA256_DIGEST_SIZE,
>  		.base = {
>  			.cra_name = "authenc(hmac(sha256),rfc3686(ctr(aes)))",
> @@ -1686,7 +1689,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_ctr_aes = {
>  		.setkey = safexcel_aead_setkey,
>  		.encrypt = safexcel_aead_encrypt,
>  		.decrypt = safexcel_aead_decrypt,
> -		.ivsize = 8,
> +		.ivsize = CTR_RFC3686_IV_SIZE,
>  		.maxauthsize = SHA224_DIGEST_SIZE,
>  		.base = {
>  			.cra_name = "authenc(hmac(sha224),rfc3686(ctr(aes)))",
> @@ -1719,7 +1722,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha512_ctr_aes = {
>  		.setkey = safexcel_aead_setkey,
>  		.encrypt = safexcel_aead_encrypt,
>  		.decrypt = safexcel_aead_decrypt,
> -		.ivsize = 8,
> +		.ivsize = CTR_RFC3686_IV_SIZE,
>  		.maxauthsize = SHA512_DIGEST_SIZE,
>  		.base = {
>  			.cra_name = "authenc(hmac(sha512),rfc3686(ctr(aes)))",
> @@ -1752,7 +1755,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha384_ctr_aes = {
>  		.setkey = safexcel_aead_setkey,
>  		.encrypt = safexcel_aead_encrypt,
>  		.decrypt = safexcel_aead_decrypt,
> -		.ivsize = 8,
> +		.ivsize = CTR_RFC3686_IV_SIZE,
>  		.maxauthsize = SHA384_DIGEST_SIZE,
>  		.base = {
>  			.cra_name = "authenc(hmac(sha384),rfc3686(ctr(aes)))",
> -- 
> 1.8.3.1
> 

-- 
Antoine Ténart, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH 2/2] crypto: inside-secure: This fixes a mistake in a comment for XTS

[Antoine Tenart]

Hi Pascal,

On Tue, Jul 30, 2019 at 03:27:12PM +0200, Pascal van Leeuwen wrote:
> This fixes a copy-paste (and forgot to edit) mistake in a comment
> for XTS regarding the key length specification.
> 
> Signed-off-by: Pascal van Leeuwen <pvanleeuwen@verimatrix.com>

Acked-by: Antoine Tenart <antoine.tenart@bootlin.com>

Thanks!
Antoine

> ---
>  drivers/crypto/inside-secure/safexcel_cipher.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c
> index a30fdd5..56dc8f9 100644
> --- a/drivers/crypto/inside-secure/safexcel_cipher.c
> +++ b/drivers/crypto/inside-secure/safexcel_cipher.c
> @@ -1847,7 +1847,7 @@ struct safexcel_alg_template safexcel_alg_xts_aes = {
>  		.setkey = safexcel_skcipher_aesxts_setkey,
>  		.encrypt = safexcel_encrypt,
>  		.decrypt = safexcel_decrypt,
> -		/* Add 4 to include the 4 byte nonce! */
> +		/* XTS actually uses 2 AES keys glued together */
>  		.min_keysize = AES_MIN_KEY_SIZE * 2,
>  		.max_keysize = AES_MAX_KEY_SIZE * 2,
>  		.ivsize = 16,
> -- 
> 1.8.3.1
> 

-- 
Antoine Ténart, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH 2/2] crypto: inside-secure: This fixes a mistake in a comment for XTS

[Herbert Xu]

On Tue, Jul 30, 2019 at 03:27:12PM +0200, Pascal van Leeuwen wrote:
> This fixes a copy-paste (and forgot to edit) mistake in a comment
> for XTS regarding the key length specification.
> 
> Signed-off-by: Pascal van Leeuwen <pvanleeuwen@verimatrix.com>
> ---
>  drivers/crypto/inside-secure/safexcel_cipher.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

This patch does not apply against cryptodev.  Please fold this
into your XTS patch instead.

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

Re: [PATCH 1/2] crypto: inside-secure - Use defines instead of some constants (cosmetic)

[Herbert Xu]

On Tue, Jul 30, 2019 at 03:27:11PM +0200, Pascal van Leeuwen wrote:
> This patch replaces some hard constants regarding key, IV and nonce sizes
> with appropriate defines from the crypto header files.
> 
> Signed-off-by: Pascal van Leeuwen <pvanleeuwen@verimatrix.com>
> ---
>  drivers/crypto/inside-secure/safexcel_cipher.c | 35 ++++++++++++++------------
>  1 file changed, 19 insertions(+), 16 deletions(-)

Patch 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

RE: [PATCH 2/2] crypto: inside-secure: This fixes a mistake in a comment for XTS

[Pascal Van Leeuwen]

> -----Original Message-----
> From: linux-crypto-owner@vger.kernel.org <linux-crypto-owner@vger.kernel.org> On Behalf Of
> Herbert Xu
> Sent: Friday, August 9, 2019 7:11 AM
> To: Pascal van Leeuwen <pascalvanl@gmail.com>
> Cc: linux-crypto@vger.kernel.org; antoine.tenart@bootlin.com; davem@davemloft.net; Pascal
> Van Leeuwen <pvanleeuwen@verimatrix.com>
> Subject: Re: [PATCH 2/2] crypto: inside-secure: This fixes a mistake in a comment for XTS
> 
> On Tue, Jul 30, 2019 at 03:27:12PM +0200, Pascal van Leeuwen wrote:
> > This fixes a copy-paste (and forgot to edit) mistake in a comment
> > for XTS regarding the key length specification.
> >
> > Signed-off-by: Pascal van Leeuwen <pvanleeuwen@verimatrix.com>
> > ---
> >  drivers/crypto/inside-secure/safexcel_cipher.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> This patch does not apply against cryptodev.  Please fold this
> into your XTS patch instead.
> 
I already saw this coming ;-) And yes, I will fold it into the XTS patch.
But I'm waiting for some earlier patches to be applied so the patch will 
actually apply without conflicts.

> 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


Regards,
Pascal van Leeuwen
Silicon IP Architect, Multi-Protocol Engines @ Verimatrix
www.insidesecure.com