]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
Revert "image-fit: Fix signature checking"
authorSimon Glass <sjg@chromium.org>
Wed, 24 Feb 2016 16:14:43 +0000 (09:14 -0700)
committerSimon Glass <sjg@chromium.org>
Fri, 26 Feb 2016 15:53:10 +0000 (08:53 -0700)
This reverts commit 84ca65aa4bd0d03867e9e49805201d0564d3ffb0.

On signature verification failures fit_image_verify() should NOT exit with
error. Only keys marked 'required' can cause image verification failure.
This logic is already there and works correctly.

Add a comment to make this clear.

Fixes: 84ca65aa (image-fit: Fix signature checking)
Signed-off-by: Simon Glass <sjg@chromium.org>
common/image-fit.c

index d3fad30c34389b630f21fe98a786a1526976b07f..fbd9e0d770571148ad4f79483bace326e9b9dc6b 100644 (file)
@@ -1035,10 +1035,15 @@ int fit_image_verify(const void *fit, int image_noffset)
                                        strlen(FIT_SIG_NODENAME))) {
                        ret = fit_image_check_sig(fit, noffset, data,
                                                        size, -1, &err_msg);
-                       if (ret) {
+
+                       /*
+                        * Show an indication on failure, but do not return
+                        * an error. Only keys marked 'required' can cause
+                        * an image validation failure. See the call to
+                        * fit_image_verify_required_sigs() above.
+                        */
+                       if (ret)
                                puts("- ");
-                               goto error;
-                       }
                        else
                                puts("+ ");
                }