From: Simon Glass <sjg@chromium.org>
Date: Mon, 5 Jul 2021 22:32:56 +0000 (-0600)
Subject: image: Allow @ in node names when not using signatures
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=1ac9c4cef521c5c5fd6591e83acf9728b167aaee;p=u-boot.git

image: Allow @ in node names when not using signatures

If signature verification is not in use we don't need to worry about
the risk of using @ in node names. Update fit_image_verify() to allow
it if the function is not enabled.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/image-fit.c b/common/image-fit.c
index 8e23d51cf2..28bd8e78c7 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -1377,7 +1377,7 @@ int fit_image_verify(const void *fit, int image_noffset)
 	size_t		size;
 	char		*err_msg = "";
 
-	if (strchr(name, '@')) {
+	if (IS_ENABLED(CONFIG_FIT_SIGNATURE) && strchr(name, '@')) {
 		/*
 		 * We don't support this since libfdt considers names with the
 		 * name root but different @ suffix to be equal