libopkg: remove GPG support
authorJo-Philipp Wich <jo@mein.io>
Sat, 18 Feb 2017 14:00:14 +0000 (15:00 +0100)
committerJo-Philipp Wich <jo@mein.io>
Sat, 18 Feb 2017 14:00:14 +0000 (15:00 +0100)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
libopkg/opkg.c
libopkg/opkg_cmd.c
libopkg/opkg_download.c
libopkg/opkg_install.c

index c48d73a..99e8c6d 100644 (file)
@@ -591,7 +591,7 @@ opkg_update_package_lists(opkg_progress_callback_t progress_callback,
                }
                free(url);
 
-#if defined(HAVE_GPGME) || defined(HAVE_OPENSSL) || defined(HAVE_USIGN)
+#if defined(HAVE_OPENSSL) || defined(HAVE_USIGN)
                if (conf->check_signature) {
                        char *sig_file_name;
                        /* download detached signitures to verify the package lists */
index 9a76faf..427b356 100644 (file)
@@ -142,7 +142,7 @@ static int opkg_update_cmd(int argc, char **argv)
                                 list_file_name);
                }
                free(url);
-#if defined(HAVE_GPGME) || defined(HAVE_OPENSSL) || defined(HAVE_USIGN)
+#if defined(HAVE_OPENSSL) || defined(HAVE_USIGN)
                if (pkglist_dl_error == 0 && conf->check_signature) {
                        /* download detached signitures to verify the package lists */
                        /* get the url for the sig file */
index 433f7fc..c52f058 100644 (file)
@@ -42,9 +42,7 @@
 #include <openssl/ssl.h>
 #endif
 
-#if defined(HAVE_GPGME)
-#include <gpgme.h>
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
 #include <openssl/bio.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
@@ -375,71 +373,6 @@ int opkg_verify_file(char *text_file, char *sig_file)
                return -1;
 
        return 0;
-#elif defined HAVE_GPGME
-       if (conf->check_signature == 0)
-               return 0;
-       int status = -1;
-       gpgme_ctx_t ctx;
-       gpgme_data_t sig, text, key;
-       gpgme_error_t err;
-       gpgme_verify_result_t result;
-       gpgme_signature_t s;
-       char *trusted_path = NULL;
-
-       gpgme_check_version(NULL);
-
-       err = gpgme_new(&ctx);
-
-       if (err)
-               return -1;
-
-       sprintf_alloc(&trusted_path, "%s/%s", conf->offline_root,
-                     "/etc/opkg/trusted.gpg");
-       err = gpgme_data_new_from_file(&key, trusted_path, 1);
-       free(trusted_path);
-       if (err) {
-               return -1;
-       }
-       err = gpgme_op_import(ctx, key);
-       if (err) {
-               gpgme_data_release(key);
-               return -1;
-       }
-       gpgme_data_release(key);
-
-       err = gpgme_data_new_from_file(&sig, sig_file, 1);
-       if (err) {
-               gpgme_release(ctx);
-               return -1;
-       }
-
-       err = gpgme_data_new_from_file(&text, text_file, 1);
-       if (err) {
-               gpgme_data_release(sig);
-               gpgme_release(ctx);
-               return -1;
-       }
-
-       err = gpgme_op_verify(ctx, sig, text, NULL);
-
-       result = gpgme_op_verify_result(ctx);
-       if (!result)
-               return -1;
-
-       /* see if any of the signitures matched */
-       s = result->signatures;
-       while (s) {
-               status = gpg_err_code(s->status);
-               if (status == GPG_ERR_NO_ERROR)
-                       break;
-               s = s->next;
-       }
-
-       gpgme_data_release(sig);
-       gpgme_data_release(text);
-       gpgme_release(ctx);
-
-       return status;
 #elif defined HAVE_OPENSSL
        X509_STORE *store = NULL;
        PKCS7 *p7 = NULL;
index a2f97c9..6dd21fe 100644 (file)
@@ -1344,7 +1344,7 @@ int opkg_install_pkg(pkg_t * pkg, int from_upgrade)
        }
 
        /* check that the repository is valid */
-#if defined(HAVE_GPGME) || defined(HAVE_OPENSSL) || defined(HAVE_USIGN)
+#if defined(HAVE_OPENSSL) || defined(HAVE_USIGN)
        char *list_file_name, *sig_file_name, *lists_dir;
 
        /* check to ensure the package has come from a repository */