diff options
| -rw-r--r-- | firmware/2lib/2misc.c | 2 | ||||
| -rw-r--r-- | tests/vb2_misc_tests.c | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c index bcf5b362..a0ae60e0 100644 --- a/firmware/2lib/2misc.c +++ b/firmware/2lib/2misc.c @@ -50,7 +50,7 @@ int vb2_read_gbb_header(struct vb2_context *ctx, struct vb2_gbb_header *gbb) return VB2_ERROR_GBB_VERSION; /* Current code is not backwards-compatible to 1.0 headers */ - if (gbb->minor_version < VB2_GBB_MINOR_VER) + if (gbb->minor_version == 0) return VB2_ERROR_GBB_TOO_OLD; /* diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index 8c3fc333..c93cbefc 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -157,18 +157,21 @@ static void gbb_tests(void) VB2_ERROR_GBB_MAGIC, "read gbb header bad magic"); gbb.signature[0]--; - gbb.major_version++; + gbb.major_version = VB2_GBB_MAJOR_VER + 1; TEST_EQ(vb2_read_gbb_header(&cc, &gbbdest), VB2_ERROR_GBB_VERSION, "read gbb header major version"); - gbb.major_version--; + gbb.major_version = VB2_GBB_MAJOR_VER; - gbb.minor_version++; + gbb.minor_version = VB2_GBB_MINOR_VER + 1; TEST_SUCC(vb2_read_gbb_header(&cc, &gbbdest), "read gbb header minor++"); - gbb.minor_version -= 2; + gbb.minor_version = 1; + TEST_SUCC(vb2_read_gbb_header(&cc, &gbbdest), + "read gbb header 1.1"); + gbb.minor_version = 0; TEST_EQ(vb2_read_gbb_header(&cc, &gbbdest), - VB2_ERROR_GBB_TOO_OLD, "read gbb header minor version old"); - gbb.minor_version++; + VB2_ERROR_GBB_TOO_OLD, "read gbb header 1.0 fails"); + gbb.minor_version = VB2_GBB_MINOR_VER; gbb.header_size--; TEST_EQ(vb2_read_gbb_header(&cc, &gbbdest), |