Browse Source

includes: move openssl headers to include/u-boot

commit 18b06652cd "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: Jeroen Hofstee <jeroen@myspectrum.nl>
tags/2020-06-01
Jeroen Hofstee 7 years ago
committed by Tom Rini
parent
commit
2b9912e6a7
25 changed files with 30 additions and 31 deletions
  1. +1
    -1
      board/gdsys/p1022/controlcenterd-id.c
  2. +1
    -1
      board/pcs440ep/pcs440ep.c
  3. +1
    -1
      common/cmd_sha1sum.c
  4. +2
    -2
      common/hash.c
  5. +2
    -2
      common/image-fit.c
  6. +2
    -2
      common/image-sig.c
  7. +1
    -1
      common/image.c
  8. +2
    -2
      drivers/crypto/ace_sha.c
  9. +1
    -1
      drivers/misc/cros_ec_sandbox.c
  10. +1
    -1
      drivers/mmc/rpmb.c
  11. +1
    -1
      include/image.h
  12. +2
    -2
      include/u-boot/rsa-checksum.h
  13. +0
    -0
      include/u-boot/rsa.h
  14. +0
    -0
      include/u-boot/sha1.h
  15. +0
    -0
      include/u-boot/sha256.h
  16. +3
    -3
      lib/rsa/rsa-checksum.c
  17. +3
    -3
      lib/rsa/rsa-verify.c
  18. +1
    -1
      lib/sha1.c
  19. +1
    -1
      lib/sha256.c
  20. +1
    -1
      lib/tpm.c
  21. +0
    -1
      tools/Makefile
  22. +1
    -1
      tools/dumpimage.h
  23. +1
    -1
      tools/imagetool.h
  24. +1
    -1
      tools/mkimage.h
  25. +1
    -1
      tools/ubsha1.c

+ 1
- 1
board/gdsys/p1022/controlcenterd-id.c View File

@@ -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>


+ 1
- 1
board/pcs440ep/pcs440ep.c View File

@@ -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>


+ 1
- 1
common/cmd_sha1sum.c View File

@@ -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[])
{


+ 2
- 2
common/hash.c View File

@@ -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>



+ 2
- 2
common/image-fit.c View File

@@ -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 */


+ 2
- 2
common/image-sig.c View File

@@ -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



+ 1
- 1
common/image.c View File

@@ -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>



+ 2
- 2
drivers/crypto/ace_sha.c View File

@@ -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 */


+ 1
- 1
drivers/misc/cros_ec_sandbox.c View File

@@ -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>


+ 1
- 1
drivers/mmc/rpmb.c View File

@@ -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 */


+ 1
- 1
include/image.h View File

@@ -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;


include/rsa-checksum.h → include/u-boot/rsa-checksum.h View File

@@ -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[];

include/rsa.h → include/u-boot/rsa.h View File


include/sha1.h → include/u-boot/sha1.h View File


include/sha256.h → include/u-boot/sha256.h View File


+ 3
- 3
lib/rsa/rsa-checksum.c View File

@@ -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. */



+ 3
- 3
lib/rsa/rsa-verify.c View File

@@ -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)))



+ 1
- 1
lib/sha1.c View File

@@ -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)


+ 1
- 1
lib/sha256.c View File

@@ -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)


+ 1
- 1
lib/tpm.c View File

@@ -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>



+ 0
- 1
tools/Makefile View File

@@ -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 \


+ 1
- 1
tools/dumpimage.h View File

@@ -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"



+ 1
- 1
tools/imagetool.h View File

@@ -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]))


+ 1
- 1
tools/mkimage.h View File

@@ -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"



+ 1
- 1
tools/ubsha1.c View File

@@ -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)
{