crypto: inside-secure - authenc(hmac(sha224), cbc(aes)) support

This patch adds the authenc(hmac(sha224),cbc(aes)) AEAD algorithm
support to the Inside Secure SafeXcel driver.

Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index 8c963ef0953a0bbf42ddeea973470741b3d9873a..0f061c3757e95166102c510479f446f73eef87e7 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -793,6 +793,7 @@ static struct safexcel_alg_template *safexcel_algs[] = {
        &safexcel_alg_hmac_sha1,
        &safexcel_alg_hmac_sha224,
        &safexcel_alg_hmac_sha256,
+       &safexcel_alg_authenc_hmac_sha224_cbc_aes,
        &safexcel_alg_authenc_hmac_sha256_cbc_aes,
 };
 

diff --git a/drivers/crypto/inside-secure/safexcel.h b/drivers/crypto/inside-secure/safexcel.h
index ae113c14caeaec7fc3babc39e35d4310015eeda5..c2e953f60447751ba91723f02ed180907feb49d9 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel.h
+++ b/drivers/crypto/inside-secure/safexcel.h
@@ -668,6 +668,7 @@ extern struct safexcel_alg_template safexcel_alg_sha256;
 extern struct safexcel_alg_template safexcel_alg_hmac_sha1;
 extern struct safexcel_alg_template safexcel_alg_hmac_sha224;
 extern struct safexcel_alg_template safexcel_alg_hmac_sha256;
+extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_cbc_aes;
 extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_cbc_aes;
 
 #endif

diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c
index 51ab448f664e34fa5e721561f52d1eeb8efbfa80..9250fb205cf2b88ddf668b0d458aa14170cff0da 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel_cipher.c
+++ b/drivers/crypto/inside-secure/safexcel_cipher.c
@@ -184,9 +184,21 @@ static int safexcel_aead_aes_setkey(struct crypto_aead *ctfm, const u8 *key,
                ctx->base.needs_inv = true;
 
        /* Auth key */
-       if (safexcel_hmac_setkey("safexcel-sha256", keys.authkey,
-                                keys.authkeylen, &istate, &ostate))
+       switch (ctx->alg) {
+       case CONTEXT_CONTROL_CRYPTO_ALG_SHA224:
+               if (safexcel_hmac_setkey("safexcel-sha224", keys.authkey,
+                                        keys.authkeylen, &istate, &ostate))
+                       goto badkey;
+               break;
+       case CONTEXT_CONTROL_CRYPTO_ALG_SHA256:
+               if (safexcel_hmac_setkey("safexcel-sha256", keys.authkey,
+                                        keys.authkeylen, &istate, &ostate))
+                       goto badkey;
+               break;
+       default:
+               dev_err(priv->dev, "aead: unsupported hash algorithm\n");
                goto badkey;
+       }
 
        crypto_aead_set_flags(ctfm, crypto_aead_get_flags(ctfm) &
                                    CRYPTO_TFM_RES_MASK);
@@ -937,3 +949,37 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_cbc_aes = {
                },
        },
 };
+
+static int safexcel_aead_sha224_cra_init(struct crypto_tfm *tfm)
+{
+       struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);
+
+       safexcel_aead_cra_init(tfm);
+       ctx->alg = CONTEXT_CONTROL_CRYPTO_ALG_SHA224;
+       ctx->state_sz = SHA256_DIGEST_SIZE;
+       return 0;
+}
+
+struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_cbc_aes = {
+       .type = SAFEXCEL_ALG_TYPE_AEAD,
+       .alg.aead = {
+               .setkey = safexcel_aead_aes_setkey,
+               .encrypt = safexcel_aead_encrypt,
+               .decrypt = safexcel_aead_decrypt,
+               .ivsize = AES_BLOCK_SIZE,
+               .maxauthsize = SHA224_DIGEST_SIZE,
+               .base = {
+                       .cra_name = "authenc(hmac(sha224),cbc(aes))",
+                       .cra_driver_name = "safexcel-authenc-hmac-sha224-cbc-aes",
+                       .cra_priority = 300,
+                       .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC |
+                                    CRYPTO_ALG_KERN_DRIVER_ONLY,
+                       .cra_blocksize = AES_BLOCK_SIZE,
+                       .cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
+                       .cra_alignmask = 0,
+                       .cra_init = safexcel_aead_sha224_cra_init,
+                       .cra_exit = safexcel_aead_cra_exit,
+                       .cra_module = THIS_MODULE,
+               },
+       },
+};