diff --git a/data/tests/Makefile.am b/data/tests/Makefile.am index 0f4da014f..b10f9fc6d 100644 --- a/data/tests/Makefile.am +++ b/data/tests/Makefile.am @@ -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) diff --git a/data/tests/pki/GPG-KEY-Hughski-Limited b/data/tests/pki/GPG-KEY-Hughski-Limited deleted file mode 120000 index 0d11f9622..000000000 --- a/data/tests/pki/GPG-KEY-Hughski-Limited +++ /dev/null @@ -1 +0,0 @@ -../../pki/GPG-KEY-Hughski-Limited \ No newline at end of file diff --git a/data/tests/pki/GPG-KEY-Linux-Vendor-Firmware-Service b/data/tests/pki/GPG-KEY-Linux-Vendor-Firmware-Service new file mode 120000 index 000000000..27abe4c04 --- /dev/null +++ b/data/tests/pki/GPG-KEY-Linux-Vendor-Firmware-Service @@ -0,0 +1 @@ +../../pki/GPG-KEY-Linux-Vendor-Firmware-Service \ No newline at end of file diff --git a/src/fu-keyring.c b/src/fu-keyring.c index d24c061eb..29105ec7b 100644 --- a/src/fu-keyring.c +++ b/src/fu-keyring.c @@ -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; diff --git a/src/fu-self-test.c b/src/fu-self-test.c index fbc286df2..fd092846e 100644 --- a/src/fu-self-test.c +++ b/src/fu-self-test.c @@ -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 ();