mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-07-23 07:12:25 +00:00
rsa: Use checksum algorithms from struct hash_algo
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 hardware accelerated progressive hash API's once available. Signed-off-by: Ruchika Gupta <ruchika.gupta@freescale.com> CC: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org> (Fixed build error in am335x_boneblack_vboot due to duplicate CONFIG_DM) Change-Id: Ic44279432f88d4e8594c6e94feb1cfcae2443a54
This commit is contained in:
parent
2dd9002719
commit
b37b46f042
6 changed files with 57 additions and 30 deletions
|
@ -10,12 +10,13 @@
|
|||
#include <asm/byteorder.h>
|
||||
#include <asm/errno.h>
|
||||
#include <asm/unaligned.h>
|
||||
#include <hash.h>
|
||||
#else
|
||||
#include "fdt_host.h"
|
||||
#endif
|
||||
#include <u-boot/rsa.h>
|
||||
#include <u-boot/sha1.h>
|
||||
#include <u-boot/sha256.h>
|
||||
#endif
|
||||
#include <u-boot/rsa.h>
|
||||
|
||||
/* PKCS 1.5 paddings as described in the RSA PKCS#1 v2.1 standard. */
|
||||
|
||||
|
@ -136,28 +137,37 @@ 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,
|
||||
uint8_t *checksum)
|
||||
int hash_calculate(const char *name,
|
||||
const struct image_region region[],
|
||||
int region_count, uint8_t *checksum)
|
||||
{
|
||||
sha1_context ctx;
|
||||
struct hash_algo *algo;
|
||||
int ret = 0;
|
||||
void *ctx;
|
||||
uint32_t i;
|
||||
i = 0;
|
||||
|
||||
sha1_starts(&ctx);
|
||||
for (i = 0; i < region_count; i++)
|
||||
sha1_update(&ctx, region[i].data, region[i].size);
|
||||
sha1_finish(&ctx, checksum);
|
||||
}
|
||||
ret = hash_progressive_lookup_algo(name, &algo);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
void sha256_calculate(const struct image_region region[], int region_count,
|
||||
uint8_t *checksum)
|
||||
{
|
||||
sha256_context ctx;
|
||||
uint32_t i;
|
||||
i = 0;
|
||||
ret = algo->hash_init(algo, &ctx);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
sha256_starts(&ctx);
|
||||
for (i = 0; i < region_count; i++)
|
||||
sha256_update(&ctx, region[i].data, region[i].size);
|
||||
sha256_finish(&ctx, checksum);
|
||||
for (i = 0; i < region_count - 1; i++) {
|
||||
ret = algo->hash_update(algo, ctx, region[i].data,
|
||||
region[i].size, 0);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = algo->hash_update(algo, ctx, region[i].data, region[i].size, 1);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = algo->hash_finish(algo, ctx, checksum, algo->digest_size);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue