fit: cipher: aes: allow to read the IV in the FIT image

This commit add the support in u-boot to read the IV
in the FIT image instead of u-boot device tree.

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>

diff --git a/common/image-cipher.c b/common/image-cipher.c
index 09869f78464402a9c005122e5380b2d543b6dcf6..4ca9eec4ef1506cde0ddf6bcb0104fee087c89b0 100644 (file)
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -94,9 +94,11 @@ static int fit_image_setup_decrypt(struct image_cipher_info *info,
                return -1;
        }
 
+       info->iv = fdt_getprop(fit, cipher_noffset, "iv", NULL);
        info->ivname = fdt_getprop(fit, cipher_noffset, "iv-name-hint", NULL);
-       if (!info->ivname) {
-               printf("Can't get IV name\n");
+
+       if (!info->iv && !info->ivname) {
+               printf("Can't get IV or IV name\n");
                return -1;
        }
 
@@ -120,8 +122,12 @@ static int fit_image_setup_decrypt(struct image_cipher_info *info,
         * Search the cipher node in the u-boot fdt
         * the path should be: /cipher/key-<algo>-<key>-<iv>
         */
-       snprintf(node_path, sizeof(node_path), "/%s/key-%s-%s-%s",
-                FIT_CIPHER_NODENAME, algo_name, info->keyname, info->ivname);
+       if (info->ivname)
+               snprintf(node_path, sizeof(node_path), "/%s/key-%s-%s-%s",
+                        FIT_CIPHER_NODENAME, algo_name, info->keyname, info->ivname);
+       else
+               snprintf(node_path, sizeof(node_path), "/%s/key-%s-%s",
+                        FIT_CIPHER_NODENAME, algo_name, info->keyname);
 
        noffset = fdt_path_offset(fdt, node_path);
        if (noffset < 0) {
@@ -137,10 +143,12 @@ static int fit_image_setup_decrypt(struct image_cipher_info *info,
        }
 
        /* read iv */
-       info->iv = fdt_getprop(fdt, noffset, "iv", NULL);
        if (!info->iv) {
-               printf("Can't get IV in cipher node '%s'\n", node_path);
-               return -1;
+               info->iv = fdt_getprop(fdt, noffset, "iv", NULL);
+               if (!info->iv) {
+                       printf("Can't get IV in cipher node '%s'\n", node_path);
+                       return -1;
+               }
        }
 
        return 0;