From patchwork Mon Oct 23 01:03:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 116636 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4101868qgn; Sun, 22 Oct 2017 18:04:36 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SWsOhjvYtA5WwtIJ7YXZTPH5l9Bt61vrePjzNNtvK7OBbfUJUcPmBq6Ia4iWBmnK4j68Z8 X-Received: by 10.80.189.139 with SMTP id y11mr14355897edh.2.1508720676748; Sun, 22 Oct 2017 18:04:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508720676; cv=none; d=google.com; s=arc-20160816; b=UGIOXJilzE//yAs34REVyr88eBFlvtDBjP5W3uTj0ySva60mN4+/fQGBuHQE7KdW/p muysZqpYX1m0qVhNiYmKiJmYvUhjYQ42zpqY8Ee8BM5KVKbfEbodG0UkmuUoUcFZLE++ orNQMijo2gR1yEe10K6ph7i/z1iz6eJ+AlKK8Z23XXhKwblkwPWDgzUDEtvgj/uL0/HS fZe8QgPts3zlWEu7WtqidPH0X+xZ1YLDOTqMcCL8tq4QOS3V2pFZa1aa0eKfhjBmOLaR 1X2JBewTDmoeADW2MvB03VWNgaO0/Gxt81Yf/EIQPQ1rRBfV5hfOO+Dq3FTlhXFnV5K5 QvbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :dkim-filter:arc-authentication-results; bh=lA/fx4mzarTZs+v0vXgSIlclZuW+Y8Ltm25qJG+h828=; b=shWs4SjigNIA/9Ol9Xj+VwqFk23FQsjCfDBSQz/JDzbqPYhYBgbxy55btfYhSULlNa QhzcDFtHJJ0t4iAPSvKZcg/yKKqU5VXbnMHqKbSX4MPpcGIOvU9wL8whop0I3SjfsU/6 xK+DoubllP7YMMTYsz8KsykNM1kMonsldfcBDTHK/RTsVb+u9m9IUuqNPpfsVTzqAL8/ 5OhLYImpL/tj6ILgsPK5VarTHr5RkPwhCnBd1M58p2mwOvZelfnwdIYjZleN9j2f5HQI xzGxUoQT17SveETY4b7/bYFWZzFExT2ugYm74qeFAfYS+6rDheVewiq9S0UyjM7JS3l2 6VDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=p2wIFfV+; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id 90si4273616edp.321.2017.10.22.18.04.36; Sun, 22 Oct 2017 18:04:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=p2wIFfV+; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id DD382C2202F; Mon, 23 Oct 2017 01:04:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D011BC21C40; Mon, 23 Oct 2017 01:04:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D1F9BC21C40; Mon, 23 Oct 2017 01:04:28 +0000 (UTC) Received: from conuserg-07.nifty.com (conuserg-07.nifty.com [210.131.2.74]) by lists.denx.de (Postfix) with ESMTPS id B55CFC21C29 for ; Mon, 23 Oct 2017 01:04:27 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-07.nifty.com with ESMTP id v9N13nde005004; Mon, 23 Oct 2017 10:03:50 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v9N13nde005004 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1508720630; bh=xbKvgLwHrtrrfLikZbKXoQg0uZGPGN1+9ePbJCaGSeA=; h=From:To:Cc:Subject:Date:From; b=p2wIFfV+sebZMbHsspGWCnAzHhZIPXmhzu3K/K71nXOvFfe7CEOYi6Wjr/zg3enPF XBbKj/ftNvjDpZmyGUsiuWJYbZ154GJ9j/nRWoOuoGg2nGtYAcC9DrJ0RxXLQWm8xQ 6lsv5Ve8bRpU0g5a9txGVXqvYpAQ4LFdA2gXL5acwtk6/BkCF1YPaTU4N3QZboR1yI gd3lXoW9Elqia07loyT+w4oWwytCGlss6fp+1fS4RDBscyx2V8yTn7Ajt11aBMjNGn pineEQCft+JHpgKEo1XzJ+yB8qQ9LmfYZXpyiFiISzjlGcOEhEJRiimao0ONFKxUP2 VaZRIZKisd6lQ== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 23 Oct 2017 10:03:40 +0900 Message-Id: <1508720620-8437-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCH] image-sig: use designated initializers for algorithm X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Designated initializers are more readable because we do not have to check the order in the struct definitions. Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass --- common/image-sig.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/common/image-sig.c b/common/image-sig.c index 455f2b9..bf824fe 100644 --- a/common/image-sig.c +++ b/common/image-sig.c @@ -32,42 +32,42 @@ void *image_get_host_blob(void) struct checksum_algo checksum_algos[] = { { - "sha1", - SHA1_SUM_LEN, - SHA1_DER_LEN, - sha1_der_prefix, + .name = "sha1", + .checksum_len = SHA1_SUM_LEN, + .der_len = SHA1_DER_LEN, + .der_prefix = sha1_der_prefix, #if IMAGE_ENABLE_SIGN - EVP_sha1, + .calculate_sign = EVP_sha1, #endif - hash_calculate, + .calculate = hash_calculate, }, { - "sha256", - SHA256_SUM_LEN, - SHA256_DER_LEN, - sha256_der_prefix, + .name = "sha256", + .checksum_len = SHA256_SUM_LEN, + .der_len = SHA256_DER_LEN, + .der_prefix = sha256_der_prefix, #if IMAGE_ENABLE_SIGN - EVP_sha256, + .calculate_sign = EVP_sha256, #endif - hash_calculate, + .calculate = hash_calculate, } }; struct crypto_algo crypto_algos[] = { { - "rsa2048", - RSA2048_BYTES, - rsa_sign, - rsa_add_verify_data, - rsa_verify, + .name = "rsa2048", + .key_len = RSA2048_BYTES, + .sign = rsa_sign, + .add_verify_data = rsa_add_verify_data, + .verify = rsa_verify, }, { - "rsa4096", - RSA4096_BYTES, - rsa_sign, - rsa_add_verify_data, - rsa_verify, + .name = "rsa4096", + .key_len = RSA4096_BYTES, + .sign = rsa_sign, + .add_verify_data = rsa_add_verify_data, + .verify = rsa_verify, } };