crypto: crypto4xx - add aes-gcm support

This patch adds aes-gcm support to crypto4xx.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/amcc/crypto4xx_alg.c b/drivers/crypto/amcc/crypto4xx_alg.c
index b1c4783feab9638043759b78b38b6d000a369561..eeaf27859d80b9458360ed8cec9d1b49c181d11b 100644 (file)
--- a/drivers/crypto/amcc/crypto4xx_alg.c
+++ b/drivers/crypto/amcc/crypto4xx_alg.c
@@ -28,6 +28,7 @@
 #include <crypto/algapi.h>
 #include <crypto/aead.h>
 #include <crypto/aes.h>
+#include <crypto/gcm.h>
 #include <crypto/sha.h>
 #include <crypto/ctr.h>
 #include "crypto4xx_reg_def.h"
@@ -416,6 +417,144 @@ int crypto4xx_setauthsize_aead(struct crypto_aead *cipher,
        return crypto_aead_setauthsize(ctx->sw_cipher.aead, authsize);
 }
 
+/**
+ * AES-GCM Functions
+ */
+
+static int crypto4xx_aes_gcm_validate_keylen(unsigned int keylen)
+{
+       switch (keylen) {
+       case 16:
+       case 24:
+       case 32:
+               return 0;
+       default:
+               return -EINVAL;
+       }
+}
+
+static int crypto4xx_compute_gcm_hash_key_sw(__le32 *hash_start, const u8 *key,
+                                            unsigned int keylen)
+{
+       struct crypto_cipher *aes_tfm = NULL;
+       uint8_t src[16] = { 0 };
+       int rc = 0;
+
+       aes_tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC |
+                                     CRYPTO_ALG_NEED_FALLBACK);
+       if (IS_ERR(aes_tfm)) {
+               rc = PTR_ERR(aes_tfm);
+               pr_warn("could not load aes cipher driver: %d\n", rc);
+               return rc;
+       }
+
+       rc = crypto_cipher_setkey(aes_tfm, key, keylen);
+       if (rc) {
+               pr_err("setkey() failed: %d\n", rc);
+               goto out;
+       }
+
+       crypto_cipher_encrypt_one(aes_tfm, src, src);
+       crypto4xx_memcpy_to_le32(hash_start, src, 16);
+out:
+       crypto_free_cipher(aes_tfm);
+       return rc;
+}
+
+int crypto4xx_setkey_aes_gcm(struct crypto_aead *cipher,
+                            const u8 *key, unsigned int keylen)
+{
+       struct crypto_tfm *tfm = crypto_aead_tfm(cipher);
+       struct crypto4xx_ctx *ctx = crypto_tfm_ctx(tfm);
+       struct dynamic_sa_ctl *sa;
+       int    rc = 0;
+
+       if (crypto4xx_aes_gcm_validate_keylen(keylen) != 0) {
+               crypto_aead_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
+               return -EINVAL;
+       }
+
+       rc = crypto4xx_setup_fallback(ctx, cipher, key, keylen);
+       if (rc)
+               return rc;
+
+       if (ctx->sa_in || ctx->sa_out)
+               crypto4xx_free_sa(ctx);
+
+       rc = crypto4xx_alloc_sa(ctx, SA_AES128_GCM_LEN + (keylen - 16) / 4);
+       if (rc)
+               return rc;
+
+       sa  = (struct dynamic_sa_ctl *) ctx->sa_in;
+
+       sa->sa_contents.w = SA_AES_GCM_CONTENTS | (keylen << 2);
+       set_dynamic_sa_command_0(sa, SA_SAVE_HASH, SA_NOT_SAVE_IV,
+                                SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE,
+                                SA_NO_HEADER_PROC, SA_HASH_ALG_GHASH,
+                                SA_CIPHER_ALG_AES, SA_PAD_TYPE_ZERO,
+                                SA_OP_GROUP_BASIC, SA_OPCODE_HASH_DECRYPT,
+                                DIR_INBOUND);
+       set_dynamic_sa_command_1(sa, CRYPTO_MODE_CTR, SA_HASH_MODE_HASH,
+                                CRYPTO_FEEDBACK_MODE_NO_FB, SA_EXTENDED_SN_OFF,
+                                SA_SEQ_MASK_ON, SA_MC_DISABLE,
+                                SA_NOT_COPY_PAD, SA_COPY_PAYLOAD,
+                                SA_NOT_COPY_HDR);
+
+       sa->sa_command_1.bf.key_len = keylen >> 3;
+
+       crypto4xx_memcpy_to_le32(get_dynamic_sa_key_field(sa),
+                                key, keylen);
+
+       rc = crypto4xx_compute_gcm_hash_key_sw(get_dynamic_sa_inner_digest(sa),
+               key, keylen);
+       if (rc) {
+               pr_err("GCM hash key setting failed = %d\n", rc);
+               goto err;
+       }
+
+       memcpy(ctx->sa_out, ctx->sa_in, ctx->sa_len * 4);
+       sa = (struct dynamic_sa_ctl *) ctx->sa_out;
+       sa->sa_command_0.bf.dir = DIR_OUTBOUND;
+       sa->sa_command_0.bf.opcode = SA_OPCODE_ENCRYPT_HASH;
+
+       return 0;
+err:
+       crypto4xx_free_sa(ctx);
+       return rc;
+}
+
+static inline int crypto4xx_crypt_aes_gcm(struct aead_request *req,
+                                         bool decrypt)
+{
+       struct crypto4xx_ctx *ctx = crypto_tfm_ctx(req->base.tfm);
+       unsigned int len = req->cryptlen;
+       __le32 iv[4];
+
+       if (crypto4xx_aead_need_fallback(req, false, decrypt))
+               return crypto4xx_aead_fallback(req, ctx, decrypt);
+
+       crypto4xx_memcpy_to_le32(iv, req->iv, GCM_AES_IV_SIZE);
+       iv[3] = cpu_to_le32(1);
+
+       if (decrypt)
+               len -= crypto_aead_authsize(crypto_aead_reqtfm(req));
+
+       return crypto4xx_build_pd(&req->base, ctx, req->src, req->dst,
+                                 len, iv, sizeof(iv),
+                                 decrypt ? ctx->sa_in : ctx->sa_out,
+                                 ctx->sa_len, req->assoclen);
+}
+
+int crypto4xx_encrypt_aes_gcm(struct aead_request *req)
+{
+       return crypto4xx_crypt_aes_gcm(req, false);
+}
+
+int crypto4xx_decrypt_aes_gcm(struct aead_request *req)
+{
+       return crypto4xx_crypt_aes_gcm(req, true);
+}
+
 /**
  * HASH SHA1 Functions
  */

diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
index 85c650323c9710678746b5e34b1ec5a960a6fa3e..c44954e274bce7053b844a4b3490eace64d99b3f 100644 (file)
--- a/drivers/crypto/amcc/crypto4xx_core.c
+++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -38,6 +38,7 @@
 #include <crypto/aead.h>
 #include <crypto/aes.h>
 #include <crypto/ctr.h>
+#include <crypto/gcm.h>
 #include <crypto/sha.h>
 #include <crypto/scatterwalk.h>
 #include <crypto/internal/aead.h>
@@ -1233,6 +1234,27 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = {
                        .cra_module     = THIS_MODULE,
                },
        } },
+       { .type = CRYPTO_ALG_TYPE_AEAD, .u.aead = {
+               .setkey         = crypto4xx_setkey_aes_gcm,
+               .setauthsize    = crypto4xx_setauthsize_aead,
+               .encrypt        = crypto4xx_encrypt_aes_gcm,
+               .decrypt        = crypto4xx_decrypt_aes_gcm,
+               .init           = crypto4xx_aead_init,
+               .exit           = crypto4xx_aead_exit,
+               .ivsize         = GCM_AES_IV_SIZE,
+               .maxauthsize    = 16,
+               .base = {
+                       .cra_name       = "gcm(aes)",
+                       .cra_driver_name = "gcm-aes-ppc4xx",
+                       .cra_priority   = CRYPTO4XX_CRYPTO_PRIORITY,
+                       .cra_flags      = CRYPTO_ALG_ASYNC |
+                                         CRYPTO_ALG_NEED_FALLBACK |
+                                         CRYPTO_ALG_KERN_DRIVER_ONLY,
+                       .cra_blocksize  = 1,
+                       .cra_ctxsize    = sizeof(struct crypto4xx_ctx),
+                       .cra_module     = THIS_MODULE,
+               },
+       } },
 };
 
 /**

diff --git a/drivers/crypto/amcc/crypto4xx_core.h b/drivers/crypto/amcc/crypto4xx_core.h
index bdd5954c2388e3bc581bf3acda2f7ab73a2c6161..8ac3bd37203b66b02051b8794af7fad1adc7d298 100644 (file)
--- a/drivers/crypto/amcc/crypto4xx_core.h
+++ b/drivers/crypto/amcc/crypto4xx_core.h
@@ -229,5 +229,9 @@ int crypto4xx_setkey_aes_ccm(struct crypto_aead *cipher,
                             const u8 *key, unsigned int keylen);
 int crypto4xx_encrypt_aes_ccm(struct aead_request *req);
 int crypto4xx_decrypt_aes_ccm(struct aead_request *req);
+int crypto4xx_setkey_aes_gcm(struct crypto_aead *cipher,
+                            const u8 *key, unsigned int keylen);
+int crypto4xx_encrypt_aes_gcm(struct aead_request *req);
+int crypto4xx_decrypt_aes_gcm(struct aead_request *req);
 
 #endif