mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 14:41:31 +00:00
image: Move HOSTCC image code to tools/
This code is never compiled into U-Boot, so move it into a separate file in tools/ to avoid the large #ifdef. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Simon Glass
Tom Rini
parent
53fbb7e885
commit
604f23dde0
4 changed files with 207 additions and 170 deletions
|
|
@ -827,7 +827,7 @@ int fit_set_timestamp(void *fit, int noffset, time_t timestamp)
|
||||||
* 0, on success
|
* 0, on success
|
||||||
* -1, when algo is unsupported
|
* -1, when algo is unsupported
|
||||||
*/
|
*/
|
||||||
static int calculate_hash(const void *data, int data_len, const char *algo,
|
int calculate_hash(const void *data, int data_len, const char *algo,
|
||||||
uint8_t *value, int *value_len)
|
uint8_t *value, int *value_len)
|
||||||
{
|
{
|
||||||
if (strcmp(algo, "crc32") == 0) {
|
if (strcmp(algo, "crc32") == 0) {
|
||||||
|
|
@ -849,175 +849,6 @@ static int calculate_hash(const void *data, int data_len, const char *algo,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef USE_HOSTCC
|
|
||||||
/**
|
|
||||||
* fit_set_hashes - process FIT component image nodes and calculate hashes
|
|
||||||
* @fit: pointer to the FIT format image header
|
|
||||||
*
|
|
||||||
* fit_set_hashes() adds hash values for all component images in the FIT blob.
|
|
||||||
* Hashes are calculated for all component images which have hash subnodes
|
|
||||||
* with algorithm property set to one of the supported hash algorithms.
|
|
||||||
*
|
|
||||||
* returns
|
|
||||||
* 0, on success
|
|
||||||
* libfdt error code, on failure
|
|
||||||
*/
|
|
||||||
int fit_set_hashes(void *fit)
|
|
||||||
{
|
|
||||||
int images_noffset;
|
|
||||||
int noffset;
|
|
||||||
int ndepth;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
/* Find images parent node offset */
|
|
||||||
images_noffset = fdt_path_offset(fit, FIT_IMAGES_PATH);
|
|
||||||
if (images_noffset < 0) {
|
|
||||||
printf("Can't find images parent node '%s' (%s)\n",
|
|
||||||
FIT_IMAGES_PATH, fdt_strerror(images_noffset));
|
|
||||||
return images_noffset;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Process its subnodes, print out component images details */
|
|
||||||
for (ndepth = 0, noffset = fdt_next_node(fit, images_noffset, &ndepth);
|
|
||||||
(noffset >= 0) && (ndepth > 0);
|
|
||||||
noffset = fdt_next_node(fit, noffset, &ndepth)) {
|
|
||||||
if (ndepth == 1) {
|
|
||||||
/*
|
|
||||||
* Direct child node of the images parent node,
|
|
||||||
* i.e. component image node.
|
|
||||||
*/
|
|
||||||
ret = fit_image_set_hashes(fit, noffset);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* fit_image_set_hashes - calculate/set hashes for given component image node
|
|
||||||
* @fit: pointer to the FIT format image header
|
|
||||||
* @image_noffset: requested component image node
|
|
||||||
*
|
|
||||||
* fit_image_set_hashes() adds hash values for an component image node. All
|
|
||||||
* existing hash subnodes are checked, if algorithm property is set to one of
|
|
||||||
* the supported hash algorithms, hash value is computed and corresponding
|
|
||||||
* hash node property is set, for example:
|
|
||||||
*
|
|
||||||
* Input component image node structure:
|
|
||||||
*
|
|
||||||
* o image@1 (at image_noffset)
|
|
||||||
* | - data = [binary data]
|
|
||||||
* o hash@1
|
|
||||||
* |- algo = "sha1"
|
|
||||||
*
|
|
||||||
* Output component image node structure:
|
|
||||||
*
|
|
||||||
* o image@1 (at image_noffset)
|
|
||||||
* | - data = [binary data]
|
|
||||||
* o hash@1
|
|
||||||
* |- algo = "sha1"
|
|
||||||
* |- value = sha1(data)
|
|
||||||
*
|
|
||||||
* returns:
|
|
||||||
* 0 on sucess
|
|
||||||
* <0 on failure
|
|
||||||
*/
|
|
||||||
int fit_image_set_hashes(void *fit, int image_noffset)
|
|
||||||
{
|
|
||||||
const void *data;
|
|
||||||
size_t size;
|
|
||||||
char *algo;
|
|
||||||
uint8_t value[FIT_MAX_HASH_LEN];
|
|
||||||
int value_len;
|
|
||||||
int noffset;
|
|
||||||
int ndepth;
|
|
||||||
|
|
||||||
/* Get image data and data length */
|
|
||||||
if (fit_image_get_data(fit, image_noffset, &data, &size)) {
|
|
||||||
printf("Can't get image data/size\n");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Process all hash subnodes of the component image node */
|
|
||||||
for (ndepth = 0, noffset = fdt_next_node(fit, image_noffset, &ndepth);
|
|
||||||
(noffset >= 0) && (ndepth > 0);
|
|
||||||
noffset = fdt_next_node(fit, noffset, &ndepth)) {
|
|
||||||
if (ndepth == 1) {
|
|
||||||
/* Direct child node of the component image node */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Check subnode name, must be equal to "hash".
|
|
||||||
* Multiple hash nodes require unique unit node
|
|
||||||
* names, e.g. hash@1, hash@2, etc.
|
|
||||||
*/
|
|
||||||
if (strncmp(fit_get_name(fit, noffset, NULL),
|
|
||||||
FIT_HASH_NODENAME,
|
|
||||||
strlen(FIT_HASH_NODENAME)) != 0) {
|
|
||||||
/* Not a hash subnode, skip it */
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fit_image_hash_get_algo(fit, noffset, &algo)) {
|
|
||||||
printf("Can't get hash algo property for '%s' hash node in '%s' image node\n",
|
|
||||||
fit_get_name(fit, noffset, NULL),
|
|
||||||
fit_get_name(fit, image_noffset, NULL));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (calculate_hash(data, size, algo, value,
|
|
||||||
&value_len)) {
|
|
||||||
printf("Unsupported hash algorithm (%s) for '%s' hash node in '%s' image node\n",
|
|
||||||
algo, fit_get_name(fit, noffset, NULL),
|
|
||||||
fit_get_name(fit, image_noffset, NULL));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fit_image_hash_set_value(fit, noffset, value,
|
|
||||||
value_len)) {
|
|
||||||
printf("Can't set hash value for '%s' hash node in '%s' image node\n",
|
|
||||||
fit_get_name(fit, noffset, NULL),
|
|
||||||
fit_get_name(fit, image_noffset, NULL));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* fit_image_hash_set_value - set hash value in requested has node
|
|
||||||
* @fit: pointer to the FIT format image header
|
|
||||||
* @noffset: hash node offset
|
|
||||||
* @value: hash value to be set
|
|
||||||
* @value_len: hash value length
|
|
||||||
*
|
|
||||||
* fit_image_hash_set_value() attempts to set hash value in a node at offset
|
|
||||||
* given and returns operation status to the caller.
|
|
||||||
*
|
|
||||||
* returns
|
|
||||||
* 0, on success
|
|
||||||
* -1, on failure
|
|
||||||
*/
|
|
||||||
int fit_image_hash_set_value(void *fit, int noffset, uint8_t *value,
|
|
||||||
int value_len)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = fdt_setprop(fit, noffset, FIT_VALUE_PROP, value, value_len);
|
|
||||||
if (ret) {
|
|
||||||
printf("Can't set hash '%s' property for '%s' node(%s)\n",
|
|
||||||
FIT_VALUE_PROP, fit_get_name(fit, noffset, NULL),
|
|
||||||
fdt_strerror(ret));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif /* USE_HOSTCC */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* fit_image_check_hashes - verify data intergity
|
* fit_image_check_hashes - verify data intergity
|
||||||
* @fit: pointer to the FIT format image header
|
* @fit: pointer to the FIT format image header
|
||||||
|
|
|
||||||
|
|
@ -636,6 +636,9 @@ void fit_conf_print(const void *fit, int noffset, const char *p);
|
||||||
int fit_check_ramdisk(const void *fit, int os_noffset,
|
int fit_check_ramdisk(const void *fit, int os_noffset,
|
||||||
uint8_t arch, int verify);
|
uint8_t arch, int verify);
|
||||||
|
|
||||||
|
int calculate_hash(const void *data, int data_len, const char *algo,
|
||||||
|
uint8_t *value, int *value_len);
|
||||||
|
|
||||||
#ifndef USE_HOSTCC
|
#ifndef USE_HOSTCC
|
||||||
static inline int fit_image_check_target_arch(const void *fdt, int node)
|
static inline int fit_image_check_target_arch(const void *fdt, int node)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -96,6 +96,7 @@ NOPED_OBJ_FILES-y += aisimage.o
|
||||||
NOPED_OBJ_FILES-y += kwbimage.o
|
NOPED_OBJ_FILES-y += kwbimage.o
|
||||||
NOPED_OBJ_FILES-y += pblimage.o
|
NOPED_OBJ_FILES-y += pblimage.o
|
||||||
NOPED_OBJ_FILES-y += imximage.o
|
NOPED_OBJ_FILES-y += imximage.o
|
||||||
|
NOPED_OBJ_FILES-y += image-host.o
|
||||||
NOPED_OBJ_FILES-y += omapimage.o
|
NOPED_OBJ_FILES-y += omapimage.o
|
||||||
NOPED_OBJ_FILES-y += mkenvimage.o
|
NOPED_OBJ_FILES-y += mkenvimage.o
|
||||||
NOPED_OBJ_FILES-y += mkimage.o
|
NOPED_OBJ_FILES-y += mkimage.o
|
||||||
|
|
@ -212,6 +213,7 @@ $(obj)mkimage$(SFX): $(obj)aisimage.o \
|
||||||
$(obj)fit_image.o \
|
$(obj)fit_image.o \
|
||||||
$(obj)image-fit.o \
|
$(obj)image-fit.o \
|
||||||
$(obj)image.o \
|
$(obj)image.o \
|
||||||
|
$(obj)image-host.o \
|
||||||
$(obj)imximage.o \
|
$(obj)imximage.o \
|
||||||
$(obj)kwbimage.o \
|
$(obj)kwbimage.o \
|
||||||
$(obj)pblimage.o \
|
$(obj)pblimage.o \
|
||||||
|
|
|
||||||
201
tools/image-host.c
Normal file
201
tools/image-host.c
Normal file
|
|
@ -0,0 +1,201 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2013, Google Inc.
|
||||||
|
*
|
||||||
|
* (C) Copyright 2008 Semihalf
|
||||||
|
*
|
||||||
|
* (C) Copyright 2000-2006
|
||||||
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||||
|
*
|
||||||
|
* See file CREDITS for list of people who contributed to this
|
||||||
|
* project.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||||
|
* MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "mkimage.h"
|
||||||
|
#include <bootstage.h>
|
||||||
|
#include <image.h>
|
||||||
|
#include <sha1.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <u-boot/crc.h>
|
||||||
|
#include <u-boot/md5.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* fit_set_hashes - process FIT component image nodes and calculate hashes
|
||||||
|
* @fit: pointer to the FIT format image header
|
||||||
|
*
|
||||||
|
* fit_set_hashes() adds hash values for all component images in the FIT blob.
|
||||||
|
* Hashes are calculated for all component images which have hash subnodes
|
||||||
|
* with algorithm property set to one of the supported hash algorithms.
|
||||||
|
*
|
||||||
|
* returns
|
||||||
|
* 0, on success
|
||||||
|
* libfdt error code, on failure
|
||||||
|
*/
|
||||||
|
int fit_set_hashes(void *fit)
|
||||||
|
{
|
||||||
|
int images_noffset;
|
||||||
|
int noffset;
|
||||||
|
int ndepth;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
/* Find images parent node offset */
|
||||||
|
images_noffset = fdt_path_offset(fit, FIT_IMAGES_PATH);
|
||||||
|
if (images_noffset < 0) {
|
||||||
|
printf("Can't find images parent node '%s' (%s)\n",
|
||||||
|
FIT_IMAGES_PATH, fdt_strerror(images_noffset));
|
||||||
|
return images_noffset;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Process its subnodes, print out component images details */
|
||||||
|
for (ndepth = 0, noffset = fdt_next_node(fit, images_noffset, &ndepth);
|
||||||
|
(noffset >= 0) && (ndepth > 0);
|
||||||
|
noffset = fdt_next_node(fit, noffset, &ndepth)) {
|
||||||
|
if (ndepth == 1) {
|
||||||
|
/*
|
||||||
|
* Direct child node of the images parent node,
|
||||||
|
* i.e. component image node.
|
||||||
|
*/
|
||||||
|
ret = fit_image_set_hashes(fit, noffset);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* fit_image_set_hashes - calculate/set hashes for given component image node
|
||||||
|
* @fit: pointer to the FIT format image header
|
||||||
|
* @image_noffset: requested component image node
|
||||||
|
*
|
||||||
|
* fit_image_set_hashes() adds hash values for an component image node. All
|
||||||
|
* existing hash subnodes are checked, if algorithm property is set to one of
|
||||||
|
* the supported hash algorithms, hash value is computed and corresponding
|
||||||
|
* hash node property is set, for example:
|
||||||
|
*
|
||||||
|
* Input component image node structure:
|
||||||
|
*
|
||||||
|
* o image@1 (at image_noffset)
|
||||||
|
* | - data = [binary data]
|
||||||
|
* o hash@1
|
||||||
|
* |- algo = "sha1"
|
||||||
|
*
|
||||||
|
* Output component image node structure:
|
||||||
|
*
|
||||||
|
* o image@1 (at image_noffset)
|
||||||
|
* | - data = [binary data]
|
||||||
|
* o hash@1
|
||||||
|
* |- algo = "sha1"
|
||||||
|
* |- value = sha1(data)
|
||||||
|
*
|
||||||
|
* returns:
|
||||||
|
* 0 on sucess
|
||||||
|
* <0 on failure
|
||||||
|
*/
|
||||||
|
int fit_image_set_hashes(void *fit, int image_noffset)
|
||||||
|
{
|
||||||
|
const void *data;
|
||||||
|
size_t size;
|
||||||
|
char *algo;
|
||||||
|
uint8_t value[FIT_MAX_HASH_LEN];
|
||||||
|
int value_len;
|
||||||
|
int noffset;
|
||||||
|
int ndepth;
|
||||||
|
|
||||||
|
/* Get image data and data length */
|
||||||
|
if (fit_image_get_data(fit, image_noffset, &data, &size)) {
|
||||||
|
printf("Can't get image data/size\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Process all hash subnodes of the component image node */
|
||||||
|
for (ndepth = 0, noffset = fdt_next_node(fit, image_noffset, &ndepth);
|
||||||
|
(noffset >= 0) && (ndepth > 0);
|
||||||
|
noffset = fdt_next_node(fit, noffset, &ndepth)) {
|
||||||
|
if (ndepth == 1) {
|
||||||
|
/* Direct child node of the component image node */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check subnode name, must be equal to "hash".
|
||||||
|
* Multiple hash nodes require unique unit node
|
||||||
|
* names, e.g. hash@1, hash@2, etc.
|
||||||
|
*/
|
||||||
|
if (strncmp(fit_get_name(fit, noffset, NULL),
|
||||||
|
FIT_HASH_NODENAME,
|
||||||
|
strlen(FIT_HASH_NODENAME)) != 0) {
|
||||||
|
/* Not a hash subnode, skip it */
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fit_image_hash_get_algo(fit, noffset, &algo)) {
|
||||||
|
printf("Can't get hash algo property for '%s' hash node in '%s' image node\n",
|
||||||
|
fit_get_name(fit, noffset, NULL),
|
||||||
|
fit_get_name(fit, image_noffset, NULL));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (calculate_hash(data, size, algo, value,
|
||||||
|
&value_len)) {
|
||||||
|
printf("Unsupported hash algorithm (%s) for '%s' hash node in '%s' image node\n",
|
||||||
|
algo, fit_get_name(fit, noffset, NULL),
|
||||||
|
fit_get_name(fit, image_noffset, NULL));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fit_image_hash_set_value(fit, noffset, value,
|
||||||
|
value_len)) {
|
||||||
|
printf("Can't set hash value for '%s' hash node in '%s' image node\n",
|
||||||
|
fit_get_name(fit, noffset, NULL),
|
||||||
|
fit_get_name(fit, image_noffset, NULL));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* fit_image_hash_set_value - set hash value in requested has node
|
||||||
|
* @fit: pointer to the FIT format image header
|
||||||
|
* @noffset: hash node offset
|
||||||
|
* @value: hash value to be set
|
||||||
|
* @value_len: hash value length
|
||||||
|
*
|
||||||
|
* fit_image_hash_set_value() attempts to set hash value in a node at offset
|
||||||
|
* given and returns operation status to the caller.
|
||||||
|
*
|
||||||
|
* returns
|
||||||
|
* 0, on success
|
||||||
|
* -1, on failure
|
||||||
|
*/
|
||||||
|
int fit_image_hash_set_value(void *fit, int noffset, uint8_t *value,
|
||||||
|
int value_len)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = fdt_setprop(fit, noffset, FIT_VALUE_PROP, value, value_len);
|
||||||
|
if (ret) {
|
||||||
|
printf("Can't set hash '%s' property for '%s' node(%s)\n",
|
||||||
|
FIT_VALUE_PROP, fit_get_name(fit, noffset, NULL),
|
||||||
|
fdt_strerror(ret));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
Loading…
Add table
Reference in a new issue