Merge branch 'master' of git://git.denx.de/u-boot-dm

[karo-tx-uboot.git] / common / image-sig.c

diff --git a/common/image-sig.c b/common/image-sig.c
index 763960a45a3c438a6797a419e3af23f0dd82e30e..2c9f0cdf7ae3996b5c57bbe74b9ff7ee5cea58d7 100644 (file)
--- a/common/image-sig.c
+++ b/common/image-sig.c
@@ -13,15 +13,20 @@
 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
 
 #ifdef USE_HOSTCC
-__attribute__((weak)) void *get_blob(void)
+void *host_blob;
+void image_set_host_blob(void *blob)
 {
-       return NULL;
+       host_blob = blob;
+}
+void *image_get_host_blob(void)
+{
+       return host_blob;
 }
 #endif
 
@@ -32,10 +37,9 @@ struct checksum_algo checksum_algos[] = {
                RSA2048_BYTES,
 #if IMAGE_ENABLE_SIGN
                EVP_sha1,
-#else
-               sha1_calculate,
-               padding_sha1_rsa2048,
 #endif
+               hash_calculate,
+               padding_sha1_rsa2048,
        },
        {
                "sha256",
@@ -43,10 +47,9 @@ struct checksum_algo checksum_algos[] = {
                RSA2048_BYTES,
 #if IMAGE_ENABLE_SIGN
                EVP_sha256,
-#else
-               sha256_calculate,
-               padding_sha256_rsa2048,
 #endif
+               hash_calculate,
+               padding_sha256_rsa2048,
        },
        {
                "sha256",
@@ -54,10 +57,9 @@ struct checksum_algo checksum_algos[] = {
                RSA4096_BYTES,
 #if IMAGE_ENABLE_SIGN
                EVP_sha256,
-#else
-               sha256_calculate,
-               padding_sha256_rsa4096,
 #endif
+               hash_calculate,
+               padding_sha256_rsa4096,
        }
 
 };
@@ -465,6 +467,6 @@ int fit_config_verify_required_sigs(const void *fit, int conf_noffset,
 
 int fit_config_verify(const void *fit, int conf_noffset)
 {
-       return !fit_config_verify_required_sigs(fit, conf_noffset,
-                                               gd_fdt_blob());
+       return fit_config_verify_required_sigs(fit, conf_noffset,
+                                              gd_fdt_blob());
 }