Changeset 4431

Timestamp:

05/14/08 11:14:50 (5 years ago)

Author:

thomas

Message:

opkg: * Add opkg-key utility

• Move update-alternatives to utils directory
• Update opkg_verify_file function to import keys from /etc/opkg

Location:

trunk/src/target/opkg

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• libopkg/opkg_download.c (modified) (3 diffs)
• src/Makefile.am (modified) (2 diffs)
• utils (added)
• utils/Makefile.am (added)
• utils/opkg-key (added)
• utils/update-alternatives (moved) (moved from trunk/src/target/opkg/update-alternatives)

trunk/src/target/opkg/Makefile.am

@@ -1 @@
-SUBDIRS = libbb libopkg src tests
+SUBDIRS = libbb libopkg src tests utils
 
 HOST_CPU=@host_cpu@
@@ -10 +10 @@
 
 
-bin_SCRIPTS = update-alternatives
 
 interceptdir = $(datadir)/opkg/intercept

trunk/src/target/opkg/configure.ac

@@ -138 +138 @@
     src/Makefile
     libbb/Makefile
+    utils/Makefile
     libopkg.pc
     )

trunk/src/target/opkg/libopkg/opkg_download.c

@@ -234 +234 @@
     int status = -1;
     gpgme_ctx_t ctx;
-    gpgme_data_t sig, text;
+    gpgme_data_t sig, text, key;
     gpgme_error_t err = -1;
     gpgme_verify_result_t result;
     gpgme_signature_t s;
+    char *trusted_path = NULL;
     
     err = gpgme_new (&ctx);
@@ -244 +245 @@
         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)
-        return -1;
+    {
+        gpgme_release (ctx);
+        return -1;
+    }
 
     err = gpgme_data_new_from_file (&text, text_file, 1); 
     if (err)
-        return -1;
+    {
+        gpgme_data_release (sig);
+        gpgme_release (ctx);
+        return -1;
+    }
 
     err = gpgme_op_verify (ctx, sig, text, NULL);
-    if (err)
-        return -1;
 
     result = gpgme_op_verify_result (ctx);
@@ -269 +290 @@
         s = s->next;
     }
+
 
     gpgme_data_release (sig);

trunk/src/target/opkg/src/Makefile.am

@@ -1 +1 @@
 AM_CFLAGS = -I${top_srcdir}/libopkg ${ALL_CFLAGS}
-bin_PROGRAMS = opkg-cl
+bin_PROGRAMS = opkg-cl opkg-key
 
 opkg_cl_SOURCES = opkg-frontend.c
@@ -6 +6 @@
                 $(top_builddir)/libbb/libbb.la 
 
-
+opkg_key_SOURCES = opkg-key.c
+opkg_key_LDADD = $(GPGME_LIBS)