mirror of
https://git.proxmox.com/git/fwupd
synced 2025-08-06 14:32:56 +00:00
Sign the test binary with the correct key
Use the LVFS key rather than my own GPG key, and load that in the self tests. Fixes https://github.com/hughsie/fwupd/issues/14
This commit is contained in:
parent
e223577fac
commit
04ee5856d0
@ -1,7 +1,7 @@
|
||||
test_files = \
|
||||
colorhug-als-3.0.2.cab \
|
||||
firmware.bin \
|
||||
pki/GPG-KEY-Hughski-Limited
|
||||
pki/GPG-KEY-Linux-Vendor-Firmware-Service
|
||||
|
||||
EXTRA_DIST = $(test_files)
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
../../pki/GPG-KEY-Hughski-Limited
|
1
data/tests/pki/GPG-KEY-Linux-Vendor-Firmware-Service
Symbolic link
1
data/tests/pki/GPG-KEY-Linux-Vendor-Firmware-Service
Symbolic link
@ -0,0 +1 @@
|
||||
../../pki/GPG-KEY-Linux-Vendor-Firmware-Service
|
@ -197,11 +197,14 @@ fu_keyring_add_public_key (FuKeyring *keyring, const gchar *filename, GError **e
|
||||
gboolean ret = TRUE;
|
||||
gpgme_data_t data = NULL;
|
||||
gpgme_error_t rc;
|
||||
gpgme_import_result_t result;
|
||||
gpgme_import_status_t s;
|
||||
|
||||
g_return_val_if_fail (FU_IS_KEYRING (keyring), FALSE);
|
||||
g_return_val_if_fail (filename != NULL, FALSE);
|
||||
|
||||
/* import public key */
|
||||
g_debug ("Adding public key %s", filename);
|
||||
rc = gpgme_data_new_from_file (&data, filename, 1);
|
||||
if (rc != GPG_ERR_NO_ERROR) {
|
||||
ret = FALSE;
|
||||
@ -222,6 +225,13 @@ fu_keyring_add_public_key (FuKeyring *keyring, const gchar *filename, GError **e
|
||||
filename, gpgme_strerror (rc));
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* print what keys were imported */
|
||||
result = gpgme_op_import_result (keyring->priv->ctx);
|
||||
for (s = result->imports; s != NULL; s = s->next) {
|
||||
g_debug ("importing key %s [%i] %s",
|
||||
s->fpr, s->status, gpgme_strerror (s->result));
|
||||
}
|
||||
out:
|
||||
gpgme_data_release (data);
|
||||
return ret;
|
||||
|
@ -425,13 +425,13 @@ fu_keyring_func (void)
|
||||
_cleanup_free_ gchar *pki_dir = NULL;
|
||||
_cleanup_object_unref_ FuKeyring *keyring = NULL;
|
||||
const gchar *sig =
|
||||
"iQEcBAABAgAGBQJVK9RSAAoJEBesuo36lw4XvmoH/3tJL5wVRN+rsvoo/FMc3w4g"
|
||||
"I7rizJNIgQ04WVTREX6tRZJfxYzGAaeokVeqah2JUC4u1j22BDkoG/Fs+/2/Z/OP"
|
||||
"PTxMoiEzfzryWpVwt20As+H9CmMZGdCfvKgnWiosAENCzE7JE1miJ4YvTpRtdPMh"
|
||||
"erz8DqLTFAfr72aimf5hBs8ZFkBGPGjljdTDv78hk2WDep5E1+1swGoFbhDcXyih"
|
||||
"8GZjSLP7XkKo23/p6odCJD3SkkDE7jIUMA8GrTHHXIhF41UsriKx2ERYoau5k3cX"
|
||||
"OdK3/cRQ6BeuSBMLr7hUpa0RwlKUKex/I7+p/T9Ohk4lNnGS7GpE45RbpflK1VQ="
|
||||
"=0D8+";
|
||||
"iQEcBAABCAAGBQJVt0B4AAoJEEim2A5FOLrCFb8IAK+QTLY34Wu8xZ8nl6p3JdMu"
|
||||
"HOaifXAmX7291UrsFRwdabU2m65pqxQLwcoFrqGv738KuaKtu4oIwo9LIrmmTbEh"
|
||||
"IID8uszxBt0bMdcIHrvwd+ADx+MqL4hR3guXEE3YOBTLvv2RF1UBcJPInNf/7Ui1"
|
||||
"3lW1c3trL8RAJyx1B5RdKqAMlyfwiuvKM5oT4SN4uRSbQf+9mt78ZSWfJVZZH/RR"
|
||||
"H9q7PzR5GdmbsRPM0DgC27Trvqjo3MzoVtoLjIyEb/aWqyulUbnJUNKPYTnZgkzM"
|
||||
"v2yVofWKIM3e3wX5+MOtf6EV58mWa2cHJQ4MCYmpKxbIvAIZagZ4c9A8BA6tQWg="
|
||||
"=fkit";
|
||||
|
||||
/* add test keys to keyring */
|
||||
keyring = fu_keyring_new ();
|
||||
|
Loading…
Reference in New Issue
Block a user