Commit 2b9912e6 authored by Jeroen Hofstee's avatar Jeroen Hofstee Committed by Tom Rini

includes: move openssl headers to include/u-boot

commit 18b06652 "tools: include u-boot version of sha256.h"
unconditionally forced the sha256.h from u-boot to be used
for tools instead of the host version. This is fragile though
as it will also include the host version. Therefore move it
to include/u-boot to join u-boot/md5.h etc which were renamed
for the same reason.

cc: Simon Glass <sjg@chromium.org>
Signed-off-by: default avatarJeroen Hofstee <jeroen@myspectrum.nl>
parent 967a99ad
......@@ -30,7 +30,7 @@
#include <i2c.h>
#include <mmc.h>
#include <tpm.h>
#include <sha1.h>
#include <u-boot/sha1.h>
#include <asm/byteorder.h>
#include <asm/unaligned.h>
#include <pca9698.h>
......
......@@ -13,7 +13,7 @@
#include <asm/processor.h>
#include <spd_sdram.h>
#include <status_led.h>
#include <sha1.h>
#include <u-boot/sha1.h>
#include <asm/io.h>
#include <net.h>
#include <ata.h>
......
......@@ -11,7 +11,7 @@
#include <common.h>
#include <command.h>
#include <hash.h>
#include <sha1.h>
#include <u-boot/sha1.h>
int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
......
......@@ -15,8 +15,8 @@
#include <malloc.h>
#include <hw_sha.h>
#include <hash.h>
#include <sha1.h>
#include <sha256.h>
#include <u-boot/sha1.h>
#include <u-boot/sha256.h>
#include <asm/io.h>
#include <asm/errno.h>
......
......@@ -21,10 +21,10 @@ DECLARE_GLOBAL_DATA_PTR;
#endif /* !USE_HOSTCC*/
#include <bootstage.h>
#include <sha1.h>
#include <sha256.h>
#include <u-boot/crc.h>
#include <u-boot/md5.h>
#include <u-boot/sha1.h>
#include <u-boot/sha256.h>
/*****************************************************************************/
/* New uImage format routines */
......
......@@ -13,8 +13,8 @@
DECLARE_GLOBAL_DATA_PTR;
#endif /* !USE_HOSTCC*/
#include <image.h>
#include <rsa.h>
#include <rsa-checksum.h>
#include <u-boot/rsa.h>
#include <u-boot/rsa-checksum.h>
#define IMAGE_MAX_HASHED_NODES 100
......
......@@ -34,7 +34,7 @@
#endif
#include <u-boot/md5.h>
#include <sha1.h>
#include <u-boot/sha1.h>
#include <asm/errno.h>
#include <asm/io.h>
......
......@@ -8,8 +8,8 @@
#include "ace_sha.h"
#ifdef CONFIG_SHA_HW_ACCEL
#include <sha256.h>
#include <sha1.h>
#include <u-boot/sha256.h>
#include <u-boot/sha1.h>
#include <asm/errno.h>
/* SHA1 value for the message of zero length */
......
......@@ -13,7 +13,7 @@
#include <hash.h>
#include <malloc.h>
#include <os.h>
#include <sha256.h>
#include <u-boot/sha256.h>
#include <spi.h>
#include <asm/state.h>
#include <asm/sdl.h>
......
......@@ -11,7 +11,7 @@
#include <config.h>
#include <common.h>
#include <mmc.h>
#include <sha256.h>
#include <u-boot/sha256.h>
#include "mmc_private.h"
/* Request codes */
......
......@@ -886,7 +886,7 @@ struct image_region {
};
#if IMAGE_ENABLE_VERIFY
# include <rsa-checksum.h>
# include <u-boot/rsa-checksum.h>
#endif
struct checksum_algo {
const char *name;
......
......@@ -9,8 +9,8 @@
#include <errno.h>
#include <image.h>
#include <sha1.h>
#include <sha256.h>
#include <u-boot/sha1.h>
#include <u-boot/sha256.h>
extern const uint8_t padding_sha256_rsa4096[];
extern const uint8_t padding_sha256_rsa2048[];
......
......@@ -13,9 +13,9 @@
#else
#include "fdt_host.h"
#endif
#include <rsa.h>
#include <sha1.h>
#include <sha256.h>
#include <u-boot/rsa.h>
#include <u-boot/sha1.h>
#include <u-boot/sha256.h>
/* PKCS 1.5 paddings as described in the RSA PKCS#1 v2.1 standard. */
......
......@@ -17,9 +17,9 @@
#include "mkimage.h"
#include <fdt_support.h>
#endif
#include <rsa.h>
#include <sha1.h>
#include <sha256.h>
#include <u-boot/rsa.h>
#include <u-boot/sha1.h>
#include <u-boot/sha256.h>
#define UINT64_MULT32(v, multby) (((uint64_t)(v)) * ((uint32_t)(multby)))
......
......@@ -36,7 +36,7 @@
#include <string.h>
#endif /* USE_HOSTCC */
#include <watchdog.h>
#include "sha1.h"
#include <u-boot/sha1.h>
/*
* 32-bit integer manipulation macros (big endian)
......
......@@ -13,7 +13,7 @@
#include <string.h>
#endif /* USE_HOSTCC */
#include <watchdog.h>
#include <sha256.h>
#include <u-boot/sha256.h>
/*
* 32-bit integer manipulation macros (big endian)
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <stdarg.h>
#include <sha1.h>
#include <u-boot/sha1.h>
#include <tpm.h>
#include <asm/unaligned.h>
......
......@@ -192,7 +192,6 @@ endif # !LOGO_BMP
# Define _GNU_SOURCE to obtain the getline prototype from stdio.h
#
HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \
-include $(srctree)/include/sha256.h \
$(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \
-I$(srctree)/lib/libfdt \
-I$(srctree)/tools \
......
......@@ -18,7 +18,7 @@
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#include <sha1.h>
#include <u-boot/sha1.h>
#include "fdt_host.h"
#include "imagetool.h"
......
......@@ -18,7 +18,7 @@
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#include <sha1.h>
#include <u-boot/sha1.h>
#include "fdt_host.h"
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
......
......@@ -18,7 +18,7 @@
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#include <sha1.h>
#include <u-boot/sha1.h>
#include "fdt_host.h"
#include "imagetool.h"
......
......@@ -13,7 +13,7 @@
#include <errno.h>
#include <string.h>
#include <sys/stat.h>
#include "sha1.h"
#include <u-boot/sha1.h>
int main (int argc, char **argv)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment