image: Rename hash printing to fit_image_print_verification_data()

This function will be used to print signatures as well as hashes, so rename
it. Also make it static since it is not used outside this file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Marek Vasut <marex@denx.de>

diff --git a/common/image-fit.c b/common/image-fit.c
index de6fce629ac62e27e1192d50302b5e45c6f22af3..9516abf7055669588c2a38c3271d99d8547ae407 100644 (file)
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -228,6 +228,84 @@ void fit_print_contents(const void *fit)
        }
 }
 
+/**
+ * fit_image_print_data() - prints out the hash node details
+ * @fit: pointer to the FIT format image header
+ * @noffset: offset of the hash node
+ * @p: pointer to prefix string
+ *
+ * fit_image_print_data() lists properies for the processed hash node
+ *
+ * returns:
+ *     no returned results
+ */
+static void fit_image_print_data(const void *fit, int noffset, const char *p)
+{
+       char *algo;
+       uint8_t *value;
+       int value_len;
+       int i, ret;
+
+       /*
+        * 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)
+               return;
+
+       debug("%s  Hash node:    '%s'\n", p,
+             fit_get_name(fit, noffset, NULL));
+
+       printf("%s  Hash algo:    ", p);
+       if (fit_image_hash_get_algo(fit, noffset, &algo)) {
+               printf("invalid/unsupported\n");
+               return;
+       }
+       printf("%s\n", algo);
+
+       ret = fit_image_hash_get_value(fit, noffset, &value,
+                                       &value_len);
+       printf("%s  Hash value:   ", p);
+       if (ret) {
+               printf("unavailable\n");
+       } else {
+               for (i = 0; i < value_len; i++)
+                       printf("%02x", value[i]);
+               printf("\n");
+       }
+
+       debug("%s  Hash len:     %d\n", p, value_len);
+}
+
+/**
+ * fit_image_print_verification_data() - prints out the hash/signature details
+ * @fit: pointer to the FIT format image header
+ * @noffset: offset of the hash or signature node
+ * @p: pointer to prefix string
+ *
+ * This lists properies for the processed hash node
+ *
+ * returns:
+ *     no returned results
+ */
+static void fit_image_print_verification_data(const void *fit, int noffset,
+                                      const char *p)
+{
+       const char *name;
+
+       /*
+        * Check subnode name, must be equal to "hash" or "signature".
+        * Multiple hash/signature nodes require unique unit node
+        * names, e.g. hash@1, hash@2, signature@1, signature@2, etc.
+        */
+       name = fit_get_name(fit, noffset, NULL);
+       if (!strncmp(name, FIT_HASH_NODENAME, strlen(FIT_HASH_NODENAME)))
+               fit_image_print_data(fit, noffset, p);
+}
+
 /**
  * fit_image_print - prints out the FIT component image details
  * @fit: pointer to the FIT format image header
@@ -323,62 +401,11 @@ void fit_image_print(const void *fit, int image_noffset, const char *p)
             noffset = fdt_next_node(fit, noffset, &ndepth)) {
                if (ndepth == 1) {
                        /* Direct child node of the component image node */
-                       fit_image_print_hash(fit, noffset, p);
+                       fit_image_print_verification_data(fit, noffset, p);
                }
        }
 }
 
-/**
- * fit_image_print_hash - prints out the hash node details
- * @fit: pointer to the FIT format image header
- * @noffset: offset of the hash node
- * @p: pointer to prefix string
- *
- * fit_image_print_hash() lists properies for the processed hash node
- *
- * returns:
- *     no returned results
- */
-void fit_image_print_hash(const void *fit, int noffset, const char *p)
-{
-       char *algo;
-       uint8_t *value;
-       int value_len;
-       int i, ret;
-
-       /*
-        * 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)
-               return;
-
-       debug("%s  Hash node:    '%s'\n", p,
-             fit_get_name(fit, noffset, NULL));
-
-       printf("%s  Hash algo:    ", p);
-       if (fit_image_hash_get_algo(fit, noffset, &algo)) {
-               printf("invalid/unsupported\n");
-               return;
-       }
-       printf("%s\n", algo);
-
-       ret = fit_image_hash_get_value(fit, noffset, &value,
-                                       &value_len);
-       printf("%s  Hash value:   ", p);
-       if (ret) {
-               printf("unavailable\n");
-       } else {
-               for (i = 0; i < value_len; i++)
-                       printf("%02x", value[i]);
-               printf("\n");
-       }
-
-       debug("%s  Hash len:     %d\n", p, value_len);
-}
-
 /**
  * fit_get_desc - get node description property
  * @fit: pointer to the FIT format image header

diff --git a/include/image.h b/include/image.h
index f82d709ae192868cee1c8f73b456a9709eaa90ca..aa93d9eccc1f83e6cb32c5002448481ba75cdaf8 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -556,7 +556,6 @@ int fit_parse_subimage(const char *spec, ulong addr_curr,
 
 void fit_print_contents(const void *fit);
 void fit_image_print(const void *fit, int noffset, const char *p);
-void fit_image_print_hash(const void *fit, int noffset, const char *p);
 
 /**
  * fit_get_end - get FIT image size