key: Don't create a new context for each key when importing keys

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/libpakfire/key.c b/src/libpakfire/key.c
index 13c70138db5f6d19cb7ee9346b1b030b7d6e7975..8ac26d51daa1b17dfe7d98334ea5936d2be9ab75 100644 (file)
--- a/src/libpakfire/key.c
+++ b/src/libpakfire/key.c
@@ -186,16 +186,36 @@ void pakfire_key_unref(PakfireKey key) {
        pakfire_key_free(key);
 }
 
-PakfireKey pakfire_key_get(Pakfire pakfire, const char* fingerprint) {
-       gpgme_ctx_t gpgctx = pakfire_get_gpgctx(pakfire);
+static PakfireKey __pakfire_get_key(Pakfire pakfire, gpgme_ctx_t gpgctx, const char* fingerprint) {
+       DEBUG("Seaching for key with fingerprint %s\n", fingerprint);
 
+       PakfireKey key = NULL;
        gpgme_key_t gpgkey = NULL;
-       gpgme_error_t error = gpgme_get_key(gpgctx, fingerprint, &gpgkey, 1);
-       if (error != GPG_ERR_NO_ERROR)
-               return NULL;
 
-       PakfireKey key = pakfire_key_create(pakfire, gpgkey);
-       gpgme_key_unref(gpgkey);
+       gpgme_error_t error = gpgme_get_key(gpgctx, fingerprint, &gpgkey, 0);
+       switch (gpg_error(error)) {
+               case GPG_ERR_NO_ERROR:
+                       key = pakfire_key_create(pakfire, gpgkey);
+                       gpgme_key_unref(gpgkey);
+                       break;
+
+               case GPG_ERR_EOF:
+                       DEBUG("Nothing found\n");
+                       break;
+
+               default:
+                       DEBUG("Could not find key: %s\n", gpgme_strerror(error));
+                       break;
+       }
+
+       return key;
+}
+
+
+PakfireKey pakfire_key_get(Pakfire pakfire, const char* fingerprint) {
+       gpgme_ctx_t gpgctx = pakfire_get_gpgctx(pakfire);
+
+       PakfireKey key = __pakfire_get_key(pakfire, gpgctx, fingerprint);
        gpgme_release(gpgctx);
 
        return key;
@@ -392,7 +412,7 @@ PakfireKey* pakfire_key_import(Pakfire pakfire, const char* data) {
 
                        // Retrieve all imported keys
                        while (status) {
-                               PakfireKey key = pakfire_key_get(pakfire, status->fpr);
+                               PakfireKey key = __pakfire_get_key(pakfire, gpgctx, status->fpr);
                                if (key) {
                                        const char* fingerprint = pakfire_key_get_fingerprint(key);
                                        INFO("Imported key %s\n", fingerprint);