From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94A0EECDE27 for ; Wed, 11 Sep 2019 08:44:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6740E20863 for ; Wed, 11 Sep 2019 08:44:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HyIjr2nw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727072AbfIKIoB (ORCPT ); Wed, 11 Sep 2019 04:44:01 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:38235 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725924AbfIKIoB (ORCPT ); Wed, 11 Sep 2019 04:44:01 -0400 Received: by mail-ed1-f65.google.com with SMTP id a23so17639503edv.5 for ; Wed, 11 Sep 2019 01:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=huUfVRwYgAso9+dkCSDsJC8gilXdf2NtFmn8Lyx946c=; b=HyIjr2nwImwZz4cM++tk9sypIC3+38jonMzqgQD+U8AwreiQhA9loGz/cDcimMZ+96 qkdTd2i6AWFCWuqDQaVmvW/FAibOfPOkRzibM/7yrwvU28XksO9wRS6uhZxvIHHWKCcr iiCWJx5gluunGkXc9A/Bj04nmG5ctaYMX9p+zU4YxCj8WQxw8vDZegIEqTonOytoWXyh bKXyV9QrnxEUGoE8ax02/PKQv/su2nMJzlKB61FktfzfriPy6ShIf1Xtfr9ueNT1sV0g /JMJdoBttQG+WpmJ5mXvVblB3fKHu1n8V6ZAmsIXCFjH9snMGBrQbeqWdpe93ar70UPW ABUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=huUfVRwYgAso9+dkCSDsJC8gilXdf2NtFmn8Lyx946c=; b=oFgzSS588rq1za8ij76GYRWvlh+PYyv6w3ou4sH27CMYPS1CbKmWFsf5TTF51C2HxS nMJmjNNNqSh288YOuIuYtUUS9yqC40xxINPPX5x2xOJaqtLOVjiEeA2qdmvkGoTXNVsB 6skbsgfKPFLE22xPmu4b8LNDDWa0mmBj1IsDLI/uyVib2felkRqPM7hmsBbAG0g8NJv0 B0cQ0TSu3BxfregvCLkYpZTrgRsnwHa8LDl3hZkk14uBsYXFNJXI0EZK4TbTTod5FOd3 bJVZ4kGv1/UoZula+5ITTBbjD4xiPDsRX4I9XSvblCVp01WkfzcuqQQ9kQKP9PsJ/Ypg SfNg== X-Gm-Message-State: APjAAAUaVn8AOr0cHC0ql6MCiVrO1zB7fb0wLRFQHQk3zju0BonHJsc0 CyPHF4OBmJEJuNMdKwCSic/LGwZz X-Google-Smtp-Source: APXvYqyVtuDyufVMl9q95328Z9WFN4vWdRa3OVoNcz2kZWQif3yBGhnWoX1Ou5lVje1QTiCQ5yow9w== X-Received: by 2002:a50:e40a:: with SMTP id d10mr36354531edm.194.1568191439153; Wed, 11 Sep 2019 01:43:59 -0700 (PDT) Received: from localhost.localdomain.com ([188.204.2.113]) by smtp.gmail.com with ESMTPSA id h38sm207138edh.13.2019.09.11.01.43.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Sep 2019 01:43:58 -0700 (PDT) From: Pascal van Leeuwen X-Google-Original-From: Pascal van Leeuwen To: linux-crypto@vger.kernel.org Cc: antoine.tenart@bootlin.com, herbert@gondor.apana.org.au, davem@davemloft.net, Pascal van Leeuwen Subject: [PATCH 1/3] crypto: inside-secure - Added support for basic SM3 ahash Date: Wed, 11 Sep 2019 09:41:09 +0200 Message-Id: <1568187671-8540-2-git-send-email-pvanleeuwen@verimatrix.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1568187671-8540-1-git-send-email-pvanleeuwen@verimatrix.com> References: <1568187671-8540-1-git-send-email-pvanleeuwen@verimatrix.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Added support for the SM3 ahash algorithm Signed-off-by: Pascal van Leeuwen --- drivers/crypto/inside-secure/safexcel.c | 1 + drivers/crypto/inside-secure/safexcel.h | 2 + drivers/crypto/inside-secure/safexcel_hash.c | 59 ++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c index 5886bcd..826d1fb 100644 --- a/drivers/crypto/inside-secure/safexcel.c +++ b/drivers/crypto/inside-secure/safexcel.c @@ -1176,6 +1176,7 @@ static int safexcel_request_ring_irq(void *pdev, int irqid, &safexcel_alg_chacha20, &safexcel_alg_chachapoly, &safexcel_alg_chachapoly_esp, + &safexcel_alg_sm3, }; static int safexcel_register_algorithms(struct safexcel_crypto_priv *priv) diff --git a/drivers/crypto/inside-secure/safexcel.h b/drivers/crypto/inside-secure/safexcel.h index 282d59e..fc2aba2 100644 --- a/drivers/crypto/inside-secure/safexcel.h +++ b/drivers/crypto/inside-secure/safexcel.h @@ -374,6 +374,7 @@ struct safexcel_context_record { #define CONTEXT_CONTROL_CRYPTO_ALG_XCBC192 (0x2 << 23) #define CONTEXT_CONTROL_CRYPTO_ALG_XCBC256 (0x3 << 23) #define CONTEXT_CONTROL_CRYPTO_ALG_POLY1305 (0xf << 23) +#define CONTEXT_CONTROL_CRYPTO_ALG_SM3 (0x7 << 23) #define CONTEXT_CONTROL_INV_FR (0x5 << 24) #define CONTEXT_CONTROL_INV_TR (0x6 << 24) @@ -869,5 +870,6 @@ int safexcel_hmac_setkey(const char *alg, const u8 *key, unsigned int keylen, extern struct safexcel_alg_template safexcel_alg_chacha20; extern struct safexcel_alg_template safexcel_alg_chachapoly; extern struct safexcel_alg_template safexcel_alg_chachapoly_esp; +extern struct safexcel_alg_template safexcel_alg_sm3; #endif diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c index 0224779..a4107bb 100644 --- a/drivers/crypto/inside-secure/safexcel_hash.c +++ b/drivers/crypto/inside-secure/safexcel_hash.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -776,6 +777,9 @@ static int safexcel_ahash_final(struct ahash_request *areq) else if (ctx->alg == CONTEXT_CONTROL_CRYPTO_ALG_SHA512) memcpy(areq->result, sha512_zero_message_hash, SHA512_DIGEST_SIZE); + else if (ctx->alg == CONTEXT_CONTROL_CRYPTO_ALG_SM3) + memcpy(areq->result, sm3_zero_message_hash, + SM3_DIGEST_SIZE); return 0; } else if (unlikely(req->digest == CONTEXT_CONTROL_DIGEST_XCM && @@ -2221,3 +2225,58 @@ struct safexcel_alg_template safexcel_alg_cmac = { }, }, }; + +static int safexcel_sm3_init(struct ahash_request *areq) +{ + struct safexcel_ahash_ctx *ctx = crypto_ahash_ctx(crypto_ahash_reqtfm(areq)); + struct safexcel_ahash_req *req = ahash_request_ctx(areq); + + memset(req, 0, sizeof(*req)); + + ctx->alg = CONTEXT_CONTROL_CRYPTO_ALG_SM3; + req->digest = CONTEXT_CONTROL_DIGEST_PRECOMPUTED; + req->state_sz = SM3_DIGEST_SIZE; + req->block_sz = SM3_BLOCK_SIZE; + + return 0; +} + +static int safexcel_sm3_digest(struct ahash_request *areq) +{ + int ret = safexcel_sm3_init(areq); + + if (ret) + return ret; + + return safexcel_ahash_finup(areq); +} + +struct safexcel_alg_template safexcel_alg_sm3 = { + .type = SAFEXCEL_ALG_TYPE_AHASH, + .algo_mask = SAFEXCEL_ALG_SM3, + .alg.ahash = { + .init = safexcel_sm3_init, + .update = safexcel_ahash_update, + .final = safexcel_ahash_final, + .finup = safexcel_ahash_finup, + .digest = safexcel_sm3_digest, + .export = safexcel_ahash_export, + .import = safexcel_ahash_import, + .halg = { + .digestsize = SM3_DIGEST_SIZE, + .statesize = sizeof(struct safexcel_ahash_export_state), + .base = { + .cra_name = "sm3", + .cra_driver_name = "safexcel-sm3", + .cra_priority = SAFEXCEL_CRA_PRIORITY, + .cra_flags = CRYPTO_ALG_ASYNC | + CRYPTO_ALG_KERN_DRIVER_ONLY, + .cra_blocksize = SM3_BLOCK_SIZE, + .cra_ctxsize = sizeof(struct safexcel_ahash_ctx), + .cra_init = safexcel_ahash_cra_init, + .cra_exit = safexcel_ahash_cra_exit, + .cra_module = THIS_MODULE, + }, + }, + }, +}; -- 1.8.3.1