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

Support all hash types when loading cabinet archives

Browse Source 
Fixes half of https://github.com/fwupd/fwupd/issues/3193
This commit is contained in:
Richard Hughes 2021-04-27 14:56:25 +01:00
parent 5ad6fb2a27
commit c6bb21356f
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libfwupdplugin/fu-cabinet.c
View File

@ -14,6 +14,7 @@
#include "fu-cabinet.h"
#include "fu-common.h"
#include "fwupd-common.h"
#include "fwupd-enums.h"
#include "fwupd-error.h"
@ -285,9 +286,11 @@ fu_cabinet_parse_release (FuCabinet *self, XbNode *release, GError **error)
/* set if unspecified, but error out if specified and incorrect */
if (csum_tmp != NULL && xb_node_get_text (csum_tmp) != NULL) {
const gchar *checksum_old = xb_node_get_text (csum_tmp);
GChecksumType checksum_type = fwupd_checksum_guess_kind (checksum_old);
g_autofree gchar *checksum = NULL;
checksum = g_compute_checksum_for_bytes (G_CHECKSUM_SHA1, blob);
if (g_strcmp0 (checksum, xb_node_get_text (csum_tmp)) != 0) {
checksum = g_compute_checksum_for_bytes (checksum_type, blob);
if (g_strcmp0 (checksum, checksum_old) != 0) {
g_set_error (error,
FWUPD_ERROR,
FWUPD_ERROR_INVALID_FILE,

26
libfwupdplugin/fu-self-test.c
View File

@ -981,6 +981,31 @@ fu_common_store_cab_unsigned_func (void)
g_assert_nonnull (blob_tmp);
}
static void
fu_common_store_cab_sha256_func (void)
{
g_autoptr(GBytes) blob = NULL;
g_autoptr(GError) error = NULL;
g_autoptr(XbSilo) silo = NULL;
/* create silo */
blob = _build_cab (GCAB_COMPRESSION_NONE,
"acme.metainfo.xml",
"<component type=\"firmware\">\n"
" <id>com.acme.example.firmware</id>\n"
" <releases>\n"
" <release version=\"1.2.3\" date=\"2017-09-06\">\n"
" <checksum target=\"content\" type=\"sha256\">486ea46224d1bb4fb680f34f7c9ad96a8f24ec88be73ea8e5a6c65260e9cb8a7</checksum>\n"
" </release>\n"
" </releases>\n"
"</component>",
"firmware.bin", "world",
NULL);
silo = fu_common_cab_build_silo (blob, 10240, &error);
g_assert_no_error (error);
g_assert_nonnull (silo);
}
static void
fu_common_store_cab_folder_func (void)
{
@ -2756,6 +2781,7 @@ main (int argc, char **argv)
g_test_add_func ("/fwupd/common{cab-success}", fu_common_store_cab_func);
g_test_add_func ("/fwupd/common{cab-success-unsigned}", fu_common_store_cab_unsigned_func);
g_test_add_func ("/fwupd/common{cab-success-folder}", fu_common_store_cab_folder_func);
g_test_add_func ("/fwupd/common{cab-success-sha256}", fu_common_store_cab_sha256_func);
g_test_add_func ("/fwupd/common{cab-error-no-metadata}", fu_common_store_cab_error_no_metadata_func);
g_test_add_func ("/fwupd/common{cab-error-wrong-size}", fu_common_store_cab_error_wrong_size_func);
g_test_add_func ("/fwupd/common{cab-error-wrong-checksum}", fu_common_store_cab_error_wrong_checksum_func);