From patchwork Fri Jan 18 05:58:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiongfeng Wang X-Patchwork-Id: 155891 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2870408jaa; Thu, 17 Jan 2019 21:59:15 -0800 (PST) X-Google-Smtp-Source: ALg8bN4UjsihEjKZ9rGHKNFZtSP5KCQdrPSWlUtxNaU+MoCp+Viy1csg2ONRJVTsJQuRyOeoYlAK X-Received: by 2002:a63:e445:: with SMTP id i5mr16286663pgk.307.1547791155731; Thu, 17 Jan 2019 21:59:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547791155; cv=none; d=google.com; s=arc-20160816; b=iQkrKyJ8sHgMTmK4+tBy66IZMdAbGrBltYrq9yKdJ7YCSy0HMV9jHtrPZusbLgZPs/ 9ukZYzazf/VEgss4hC/L07jTrVQ/WWS/me3//k0rR0UlNqo7HWWssIqF+T4ug7kedw15 mzSYl0Na7jViuDxUpEfGql3l9cbT+zs4Qdx5Ta+Y7lJPa34QQiYCNpSAMEVHMeY0NlT5 fK9pDEJJ79iuCW3Hxe/4PA1K1qcg1sXZDlGSpp+v29IrQwRj98be89qpyKtv245nel7Q YG+wDfYvAuxZ02nZLWPPb7YDR0x0D8tumKyPQMM0g4eaU1P0e0Yw2Des1VVfz6tDcmqj DaIg== 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=WmuuJOZuxWTcCGDavo7DP8rlJECjFFQ1VvIIhzPQhIs=; b=xE0GXmz5T22c02+rnrrujxC14BKd8CI27mke4qPgxBKbeP5uXkomPjgFLXvzUGRRHT OxfKQ4UXOsanzm8Je1jFzjyKp0ZQpV0ppw+LHsHvZO1gf1EgOrdEpwvID1/ZPrsR6mFH /k3xUmuNr8XoTliEzw7kEEC5W7rbrg9jaC13W9S4Y09dfv5bekrPo+MchEiKpl2hRRCc 7JbxNyi9LM0Fd7Iqq7vqzZ8apZ4naQoGHQlNme1u1uB0szk3BX6eX6fC4fj1kOcfAWop C7zTy1araKD2eo5ZNFZQNb1cC7fp/NuNro9N0X5aD4e/fz2+fy6k7C4nEQlYi/C/KQ03 Cf4A== 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 f7si3834426pga.87.2019.01.17.21.59.15; Thu, 17 Jan 2019 21:59:15 -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 S1727334AbfARF7N (ORCPT + 15 others); Fri, 18 Jan 2019 00:59:13 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2197 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727142AbfARF7C (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 E250B42F33078F77ADB7; 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:49 +0800 From: Xiongfeng Wang To: , , CC: , , , , , Subject: [PATCH V3 2/5] crypto: ccm - use template array registering API to simplify the code Date: Fri, 18 Jan 2019 13:58:12 +0800 Message-ID: <1547791095-48339-3-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/ccm.c | 78 ++++++++++++++++++------------------------------------------ 1 file changed, 23 insertions(+), 55 deletions(-) -- 1.7.12.4 diff --git a/crypto/ccm.c b/crypto/ccm.c index b242fd0..50df8f0 100644 --- a/crypto/ccm.c +++ b/crypto/ccm.c @@ -589,12 +589,6 @@ static int crypto_ccm_create(struct crypto_template *tmpl, struct rtattr **tb) mac_name); } -static struct crypto_template crypto_ccm_tmpl = { - .name = "ccm", - .create = crypto_ccm_create, - .module = THIS_MODULE, -}; - static int crypto_ccm_base_create(struct crypto_template *tmpl, struct rtattr **tb) { @@ -618,12 +612,6 @@ static int crypto_ccm_base_create(struct crypto_template *tmpl, cipher_name); } -static struct crypto_template crypto_ccm_base_tmpl = { - .name = "ccm_base", - .create = crypto_ccm_base_create, - .module = THIS_MODULE, -}; - static int crypto_rfc4309_setkey(struct crypto_aead *parent, const u8 *key, unsigned int keylen) { @@ -854,12 +842,6 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl, goto out; } -static struct crypto_template crypto_rfc4309_tmpl = { - .name = "rfc4309", - .create = crypto_rfc4309_create, - .module = THIS_MODULE, -}; - static int crypto_cbcmac_digest_setkey(struct crypto_shash *parent, const u8 *inkey, unsigned int keylen) { @@ -999,51 +981,37 @@ static int cbcmac_create(struct crypto_template *tmpl, struct rtattr **tb) return err; } -static struct crypto_template crypto_cbcmac_tmpl = { - .name = "cbcmac", - .create = cbcmac_create, - .free = shash_free_instance, - .module = THIS_MODULE, +static struct crypto_template crypto_ccm_tmpls[] = { + { + .name = "cbcmac", + .create = cbcmac_create, + .free = shash_free_instance, + .module = THIS_MODULE, + }, { + .name = "ccm_base", + .create = crypto_ccm_base_create, + .module = THIS_MODULE, + }, { + .name = "ccm", + .create = crypto_ccm_create, + .module = THIS_MODULE, + }, { + .name = "rfc4309", + .create = crypto_rfc4309_create, + .module = THIS_MODULE, + }, }; static int __init crypto_ccm_module_init(void) { - int err; - - err = crypto_register_template(&crypto_cbcmac_tmpl); - if (err) - goto out; - - err = crypto_register_template(&crypto_ccm_base_tmpl); - if (err) - goto out_undo_cbcmac; - - err = crypto_register_template(&crypto_ccm_tmpl); - if (err) - goto out_undo_base; - - err = crypto_register_template(&crypto_rfc4309_tmpl); - if (err) - goto out_undo_ccm; - -out: - return err; - -out_undo_ccm: - crypto_unregister_template(&crypto_ccm_tmpl); -out_undo_base: - crypto_unregister_template(&crypto_ccm_base_tmpl); -out_undo_cbcmac: - crypto_register_template(&crypto_cbcmac_tmpl); - goto out; + return crypto_register_templates(crypto_ccm_tmpls, + ARRAY_SIZE(crypto_ccm_tmpls)); } static void __exit crypto_ccm_module_exit(void) { - crypto_unregister_template(&crypto_rfc4309_tmpl); - crypto_unregister_template(&crypto_ccm_tmpl); - crypto_unregister_template(&crypto_ccm_base_tmpl); - crypto_unregister_template(&crypto_cbcmac_tmpl); + crypto_unregister_templates(crypto_ccm_tmpls, + ARRAY_SIZE(crypto_ccm_tmpls)); } module_init(crypto_ccm_module_init);