You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/04/05 02:04:05 UTC
incubator-mynewt-core git commit: Require hash TLV even when
signature TLV is present;
even though not stricly necessary, it is handy to have at hand for image
identification purposes.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 58248ee11 -> f41a1090a
Require hash TLV even when signature TLV is present;
even though not stricly necessary, it is handy to have at hand
for image identification purposes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/f41a1090
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/f41a1090
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/f41a1090
Branch: refs/heads/develop
Commit: f41a1090ad9f4ae2bf6c430c2abc3a922ddc8236
Parents: 58248ee
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Mon Apr 4 17:02:51 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Mon Apr 4 17:02:51 2016 -0700
----------------------------------------------------------------------
libs/bootutil/src/image_validate.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f41a1090/libs/bootutil/src/image_validate.c
----------------------------------------------------------------------
diff --git a/libs/bootutil/src/image_validate.c b/libs/bootutil/src/image_validate.c
index b91949c..b0e79cb 100644
--- a/libs/bootutil/src/image_validate.c
+++ b/libs/bootutil/src/image_validate.c
@@ -227,11 +227,10 @@ bootutil_img_validate(struct image_header *hdr, uint8_t flash_id, uint32_t addr,
if ((hdr->ih_flags & IMAGE_F_PKCS15_RSA2048_SHA256) == 0) {
return -1;
}
-#else
+#endif
if ((hdr->ih_flags & IMAGE_F_SHA256) == 0) {
return -1;
}
-#endif
rc = bootutil_img_hash(hdr, flash_id, addr, tmp_buf, tmp_buf_sz, hash);
if (rc) {