Skip to content

Commit

Permalink
Require libjcat 0.1.4
Browse files Browse the repository at this point in the history
Although we can compile against older versions, we can't actually work
as current firmware.jcat metadata from the LVFS needs these commits:

hughsie/libjcat@109399e
hughsie/libjcat@583df67

If it helps, 0.1.4 was released in October *2020*.
  • Loading branch information
hughsie committed Feb 22, 2022
1 parent 96c1f9d commit 7157ca7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ if get_option('libarchive')
conf.set('HAVE_LIBARCHIVE', '1')
endif
endif
libjcat = dependency('jcat', version : '>= 0.1.0', fallback : ['libjcat', 'libjcat_dep'])
libjcat = dependency('jcat', version : '>= 0.1.4', fallback : ['libjcat', 'libjcat_dep'])
libjsonglib = dependency('json-glib-1.0', version : '>= 1.1.1')
valgrind = dependency('valgrind', required: false)
if get_option('curl')
Expand Down
9 changes: 0 additions & 9 deletions src/fu-engine.c
Original file line number Diff line number Diff line change
Expand Up @@ -4123,17 +4123,8 @@ fu_engine_get_newest_signature_jcat_result(GPtrArray *results, GError **error)
/* get the first signature, ignoring the checksums */
for (guint i = 0; i < results->len; i++) {
JcatResult *result = g_ptr_array_index(results, i);
#if LIBJCAT_CHECK_VERSION(0, 1, 3)
if (jcat_result_get_method(result) == JCAT_BLOB_METHOD_SIGNATURE)
return g_object_ref(result);
#else
guint verify_kind = 0;
g_autoptr(JcatEngine) engine = NULL;
g_object_get(result, "engine", &engine, NULL);
g_object_get(engine, "verify-kind", &verify_kind, NULL);
if (verify_kind == 2) /* SIGNATURE */
return g_object_ref(result);
#endif
}

/* should never happen due to %JCAT_VERIFY_FLAG_REQUIRE_SIGNATURE */
Expand Down

0 comments on commit 7157ca7

Please sign in to comment.