From patchwork Fri Jan 18 05:58:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiongfeng Wang X-Patchwork-Id: 155892 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2870507jaa; Thu, 17 Jan 2019 21:59:23 -0800 (PST) X-Google-Smtp-Source: ALg8bN70Zlry26w8zUCqUlQkNBX6atMK3xR9PWrmBaFitXF0HAzLvVXkF++KVMfauFFYtplqYhXm X-Received: by 2002:a17:902:28c1:: with SMTP id f59mr17960168plb.37.1547791163334; Thu, 17 Jan 2019 21:59:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547791163; cv=none; d=google.com; s=arc-20160816; b=H7r+Jx3mOzVYMbikL5109RiOJQZIVpG5DNEmFOJKuGdSOvoy/1R7rsE54UY1Ka343r /OxYj102z5PrqcTJYe2lH8ZWUqR5knGnjbeXDwCJxJODVgyDXAhdcG3pEgMqegXenBe/ EtF8l7eNgxcHsGbmLpS3aydrqmhpvOWTYS9sC5so5cC7X8vECP13UJ9FWZYlG78u5j2J 2hZg6DaoJEp6K0TYQwteB6BltxUiZXtZ7/1TjTLq4pvLav5ZJN/FLdLGoLjCCgPcZrtE GcVfy42I8r1Vq3VQ3nO1K0KRj1NIiSaMkfEpAvCCdf1LMjsriJX0HuqIG90M/4UCg73x BTqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=0wueGePRR7tAbK8/HjqihMZBlpl5vQy+xLJ/EXtqGd0=; b=SUPAmfCXxlZH6dj2vFJ5xuMprWKHMhCUjG6QjpnErdB1Ce2NujnQCNHcOmE2OMk4ej Pd1dt3Qv8VesW7kwlFL/hifjqUOlNJzvW0xuIb+wNK/yn+Eg6AJK2f6w7uNYegXPHOjk Q+WyRo3yF+DaXDUs1jjUFp42ljioTr4V/j35nJRy/eI2/s0STxUmAMFZ3coYIFnCJ1hr 6C25xTGy+ZL+moRqIzNH3KsJYWgoilJ8bzKbpAZHlyVxNfV7OnUbzOHmCn4kCaCaBbkw cdbLfgGRclp61plEQ11Jazo7BqHTes3J9CBwFYuSe5xuGFH7GIbIos48oP+qMsA/uSgV xUAg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k33si3841290pld.374.2019.01.17.21.59.22; Thu, 17 Jan 2019 21:59:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727357AbfARF7U (ORCPT + 15 others); Fri, 18 Jan 2019 00:59:20 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2196 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727084AbfARF7C (ORCPT ); Fri, 18 Jan 2019 00:59:02 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id DC9FB45E15388DB10ECF; Fri, 18 Jan 2019 13:58:59 +0800 (CST) Received: from linux-ibm.site (10.175.102.37) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.408.0; Fri, 18 Jan 2019 13:58:51 +0800 From: Xiongfeng Wang To: , , CC: , , , , , Subject: [PATCH V3 5/5] crypto: chacha20poly1305 - use template array registering API to simplify the code Date: Fri, 18 Jan 2019 13:58:15 +0800 Message-ID: <1547791095-48339-6-git-send-email-wangxiongfeng2@huawei.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1547791095-48339-1-git-send-email-wangxiongfeng2@huawei.com> References: <1547791095-48339-1-git-send-email-wangxiongfeng2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiongfeng Wang Use crypto template array registering API to simplify the code. Signed-off-by: Xiongfeng Wang Reviewed-by: Eric Biggers --- crypto/chacha20poly1305.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) -- 1.7.12.4 diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c index fef1144..ed2e12e 100644 --- a/crypto/chacha20poly1305.c +++ b/crypto/chacha20poly1305.c @@ -701,37 +701,28 @@ static int rfc7539esp_create(struct crypto_template *tmpl, struct rtattr **tb) return chachapoly_create(tmpl, tb, "rfc7539esp", 8); } -static struct crypto_template rfc7539_tmpl = { - .name = "rfc7539", - .create = rfc7539_create, - .module = THIS_MODULE, -}; - -static struct crypto_template rfc7539esp_tmpl = { - .name = "rfc7539esp", - .create = rfc7539esp_create, - .module = THIS_MODULE, +static struct crypto_template rfc7539_tmpls[] = { + { + .name = "rfc7539", + .create = rfc7539_create, + .module = THIS_MODULE, + }, { + .name = "rfc7539esp", + .create = rfc7539esp_create, + .module = THIS_MODULE, + }, }; static int __init chacha20poly1305_module_init(void) { - int err; - - err = crypto_register_template(&rfc7539_tmpl); - if (err) - return err; - - err = crypto_register_template(&rfc7539esp_tmpl); - if (err) - crypto_unregister_template(&rfc7539_tmpl); - - return err; + return crypto_register_templates(rfc7539_tmpls, + ARRAY_SIZE(rfc7539_tmpls)); } static void __exit chacha20poly1305_module_exit(void) { - crypto_unregister_template(&rfc7539esp_tmpl); - crypto_unregister_template(&rfc7539_tmpl); + crypto_unregister_templates(rfc7539_tmpls, + ARRAY_SIZE(rfc7539_tmpls)); } module_init(chacha20poly1305_module_init);