From patchwork Wed Dec 17 10:05:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 422220 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3252C140081 for ; Wed, 17 Dec 2014 21:07:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A86A84B708; Wed, 17 Dec 2014 11:07:46 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HxzhluFAV6Ev; Wed, 17 Dec 2014 11:07:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 49A764B6E3; Wed, 17 Dec 2014 11:07:46 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A51424B6E2 for ; Wed, 17 Dec 2014 11:07:41 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RKkUcbhmGI-u for ; Wed, 17 Dec 2014 11:07:41 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0106.outbound.protection.outlook.com [65.55.169.106]) by theia.denx.de (Postfix) with ESMTPS id B3EA84B6DF for ; Wed, 17 Dec 2014 11:07:33 +0100 (CET) Received: from CO2PR03CA0014.namprd03.prod.outlook.com (10.141.194.141) by CY1PR0301MB1291.namprd03.prod.outlook.com (25.161.213.153) with Microsoft SMTP Server (TLS) id 15.1.36.23; Wed, 17 Dec 2014 10:07:31 +0000 Received: from BY2FFO11FD005.protection.gbl (2a01:111:f400:7c0c::196) by CO2PR03CA0014.outlook.office365.com (2a01:111:e400:1414::13) with Microsoft SMTP Server (TLS) id 15.1.36.22 via Frontend Transport; Wed, 17 Dec 2014 10:07:30 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD005.mail.protection.outlook.com (10.1.14.126) with Microsoft SMTP Server (TLS) id 15.1.26.17 via Frontend Transport; Wed, 17 Dec 2014 10:07:30 +0000 Received: from perf-idc04.ap.freescale.net (perf-idc04.ap.freescale.net [10.232.14.49]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id sBHA6wU5028359; Wed, 17 Dec 2014 03:07:28 -0700 From: Ruchika Gupta To: , Date: Wed, 17 Dec 2014 15:35:52 +0530 Message-ID: <1418810752-2364-5-git-send-email-ruchika.gupta@freescale.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1418810752-2364-1-git-send-email-ruchika.gupta@freescale.com> References: <1418810752-2364-1-git-send-email-ruchika.gupta@freescale.com> X-EOPAttributedMessage: 0 Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=ruchika.gupta@freescale.com; X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(105606002)(68736005)(77096005)(81156004)(106466001)(97736003)(229853001)(107046002)(69596002)(6806004)(19580395003)(19580405001)(50226001)(4396001)(2950100001)(84676001)(104016003)(76176999)(50986999)(77156002)(120916001)(33646002)(99396003)(92566001)(86362001)(62966003)(36756003)(85426001)(89996001)(87936001)(64706001)(20776003)(47776003)(48376002)(50466002)(31966008)(46102003)(21056001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1291; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1291; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004); SRVR:CY1PR0301MB1291; X-Forefront-PRVS: 042857DBB5 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1291; X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2014 10:07:30.8742 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1291 Cc: Ruchika Gupta Subject: [U-Boot] [PATCH 4/4] [RFC] rsa: Use checksum algorithms from struct hash_algo X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Currently the hash functions used in RSA are called directly from the sha1 and sha256 libraries. Change the RSA checksum library to use the progressive hash API's registered with struct hash_algo. This will allow the checksum library to use the support of hardware accelerated progressive hash API's once available. Signed-off-by: Ruchika Gupta CC: Simon Glass --- include/image.h | 2 +- include/u-boot/rsa-checksum.h | 4 +-- lib/rsa/rsa-checksum.c | 61 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 60 insertions(+), 7 deletions(-) diff --git a/include/image.h b/include/image.h index af30d60..0067c75 100644 --- a/include/image.h +++ b/include/image.h @@ -926,7 +926,7 @@ struct checksum_algo { #if IMAGE_ENABLE_SIGN const EVP_MD *(*calculate_sign)(void); #endif - void (*calculate)(const struct image_region region[], + int (*calculate)(const struct image_region region[], int region_count, uint8_t *checksum); const uint8_t *rsa_padding; }; diff --git a/include/u-boot/rsa-checksum.h b/include/u-boot/rsa-checksum.h index c996fb3..db55046 100644 --- a/include/u-boot/rsa-checksum.h +++ b/include/u-boot/rsa-checksum.h @@ -16,9 +16,9 @@ extern const uint8_t padding_sha256_rsa4096[]; extern const uint8_t padding_sha256_rsa2048[]; extern const uint8_t padding_sha1_rsa2048[]; -void sha256_calculate(const struct image_region region[], int region_count, +int sha256_calculate(const struct image_region region[], int region_count, uint8_t *checksum); -void sha1_calculate(const struct image_region region[], int region_count, +int sha1_calculate(const struct image_region region[], int region_count, uint8_t *checksum); #endif diff --git a/lib/rsa/rsa-checksum.c b/lib/rsa/rsa-checksum.c index 8d8b59f..af27c97 100644 --- a/lib/rsa/rsa-checksum.c +++ b/lib/rsa/rsa-checksum.c @@ -10,12 +10,13 @@ #include #include #include +#include #else #include "fdt_host.h" -#endif -#include #include #include +#endif +#include /* PKCS 1.5 paddings as described in the RSA PKCS#1 v2.1 standard. */ @@ -136,7 +137,54 @@ const uint8_t padding_sha256_rsa4096[RSA4096_BYTES - SHA256_SUM_LEN] = { 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20 }; -void sha1_calculate(const struct image_region region[], int region_count, +#ifndef USE_HOSTCC +void hash_calculate(struct hash_algo *algo, const struct image_region region[], + int region_count, uint8_t *checksum) +{ + void *ctx; + uint32_t i; + i = 0; + + algo->hash_init(algo, &ctx); + for (i = 0; i < region_count - 1; i++) + algo->hash_update(algo, ctx, region[i].data, region[i].size, 0); + + algo->hash_update(algo, ctx, region[i].data, region[i].size, 1); + algo->hash_finish(algo, ctx, checksum, algo->digest_size); +} + +int sha1_calculate(const struct image_region region[], int region_count, + uint8_t *checksum) +{ + struct hash_algo *algo; + int ret = 0; + + ret = hash_progressive_lookup_algo("sha1", &algo); + if (ret) + return ret; + + hash_calculate(algo, region, region_count, checksum); + + return 0; +} + +int sha256_calculate(const struct image_region region[], int region_count, + uint8_t *checksum) +{ + struct hash_algo *algo; + int ret; + + ret = hash_progressive_lookup_algo("sha256", &algo); + if (ret) + return ret; + + hash_calculate(algo, region, region_count, checksum); + + return 0; +} + +#else +int sha1_calculate(const struct image_region region[], int region_count, uint8_t *checksum) { sha1_context ctx; @@ -147,9 +195,11 @@ void sha1_calculate(const struct image_region region[], int region_count, for (i = 0; i < region_count; i++) sha1_update(&ctx, region[i].data, region[i].size); sha1_finish(&ctx, checksum); + + return 0; } -void sha256_calculate(const struct image_region region[], int region_count, +int sha256_calculate(const struct image_region region[], int region_count, uint8_t *checksum) { sha256_context ctx; @@ -160,4 +210,7 @@ void sha256_calculate(const struct image_region region[], int region_count, for (i = 0; i < region_count; i++) sha256_update(&ctx, region[i].data, region[i].size); sha256_finish(&ctx, checksum); + + return 0; } +#endif