proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-06-06 22:29:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Require libjcat 0.1.4

Browse Source 
Although we can compile against older versions, we can't actually work
as current firmware.jcat metadata from the LVFS needs these commits:

109399e1f2
583df67e3e

If it helps, 0.1.4 was released in October *2020*.
This commit is contained in:
Richard Hughes 2022-02-22 12:58:36 +00:00
parent 96c1f9dba6
commit 7157ca79e4
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -224,7 +224,7 @@ if get_option('libarchive')
conf.set('HAVE_LIBARCHIVE', '1') conf.set('HAVE_LIBARCHIVE', '1')
endif endif
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') libjsonglib = dependency('json-glib-1.0', version : '>= 1.1.1')
valgrind = dependency('valgrind', required: false) valgrind = dependency('valgrind', required: false)
if get_option('curl') if get_option('curl')

9
src/fu-engine.c
View File

@ -4123,17 +4123,8 @@ fu_engine_get_newest_signature_jcat_result(GPtrArray *results, GError **error)
/* get the first signature, ignoring the checksums */ /* get the first signature, ignoring the checksums */
for (guint i = 0; i < results->len; i++) { for (guint i = 0; i < results->len; i++) {
JcatResult *result = g_ptr_array_index(results, 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) if (jcat_result_get_method(result) == JCAT_BLOB_METHOD_SIGNATURE)
return g_object_ref(result); 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 */ /* should never happen due to %JCAT_VERIFY_FLAG_REQUIRE_SIGNATURE */