diff options
| author | Jeroen Hofstee <jeroen@myspectrum.nl> | 2014-06-12 22:27:12 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-19 11:19:04 -0400 |
| commit | 2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167 (patch) | |
| tree | f5467f0acbb6409a579f287b3ad814469afc7cf3 /lib | |
| parent | 967a99ad823342510857be84f7920a41f1949147 (diff) | |
| download | talos-obmc-uboot-2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167.tar.gz talos-obmc-uboot-2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167.zip | |
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>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rsa/rsa-checksum.c | 6 | ||||
| -rw-r--r-- | lib/rsa/rsa-verify.c | 6 | ||||
| -rw-r--r-- | lib/sha1.c | 2 | ||||
| -rw-r--r-- | lib/sha256.c | 2 | ||||
| -rw-r--r-- | lib/tpm.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/lib/rsa/rsa-checksum.c b/lib/rsa/rsa-checksum.c index 32d6602e97..8d8b59f779 100644 --- a/lib/rsa/rsa-checksum.c +++ b/lib/rsa/rsa-checksum.c @@ -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. */ diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c index 587da5b470..bcb906368d 100644 --- a/lib/rsa/rsa-verify.c +++ b/lib/rsa/rsa-verify.c @@ -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))) diff --git a/lib/sha1.c b/lib/sha1.c index a121224855..0a5f68864c 100644 --- a/lib/sha1.c +++ b/lib/sha1.c @@ -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) diff --git a/lib/sha256.c b/lib/sha256.c index b1085ea791..bb338baefa 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -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> |
