Fix assumption that a signature on a public key is a revocation

[onak.git] / keydb_pg.c

diff --git a/keydb_pg.c b/keydb_pg.c
index b5afc9e46b4063597154652b71be1e4052d760c0..5933c91381647f4fb837c3de4ea859aafb9d59f9 100644 (file)
--- a/keydb_pg.c
+++ b/keydb_pg.c
@@ -3,9 +3,7 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
  *
  * Jonathan McDowell <noodles@earth.li>
  *

- * Copyright 2002 Project Purple
- *
- * $Id: keydb_pg.c,v 1.14 2004/03/23 12:33:47 noodles Exp $
+ * Copyright 2002-2004 Project Purple

  */
 
 #include <postgresql/libpq-fe.h>
  */
 
 #include <postgresql/libpq-fe.h>


@@ -40,7 +38,7 @@ static PGconn *dbconn = NULL;
  */
 static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
 {
  */
 static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
 {

-       return (!lo_read(dbconn, *(int *) fd, c, count));
+       return (!lo_read(dbconn, *(int *) fd, (char *) c, count));

 }
 
 /**
 }
 
 /**


@@ -48,7 +46,7 @@ static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
  */
 static int keydb_putchar(void *fd, size_t count, unsigned char *c)
 {
  */
 static int keydb_putchar(void *fd, size_t count, unsigned char *c)
 {

-       return !(lo_write(dbconn, *(int *) fd, c, count));
+       return !(lo_write(dbconn, *(int *) fd, (char *) c, count));

 }
 
 /**
 }
 
 /**


@@ -570,22 +568,67 @@ struct ll *getkeysigs(uint64_t keyid, bool *revoked)
 }
 
 /**
 }
 
 /**

- *     dumpdb - dump the key database
- *     @filenamebase: The base filename to use for the dump.
+ *     iterate_keys - call a function once for each key in the db.
+ *     @iterfunc: The function to call.
+ *     @ctx: A context pointer
+ *
+ *     Calls iterfunc once for each key in the database. ctx is passed
+ *     unaltered to iterfunc. This function is intended to aid database dumps
+ *     and statistic calculations.

  *
  *

- *     Dumps the database into one or more files, which contain pure OpenPGP
- *     that can be reimported into onak or gpg. filenamebase provides a base
- *     file name for the dump; several files may be created, all of which will
- *     begin with this string and then have a unique number and a .pgp
- *     extension.
- *          */
-int dumpdb(char *filenamebase)
+ *     Returns the number of keys we iterated over.
+ */
+int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
+               void *ctx)

 {
 {

-       return 0;
+       struct openpgp_packet_list *packets = NULL;
+       struct openpgp_publickey *key = NULL;
+       PGresult *result = NULL;
+       char *oids = NULL;
+       char statement[1024];
+       int fd = -1;
+       int i = 0;
+       int numkeys = 0;
+       Oid key_oid;
+
+       result = PQexec(dbconn, "SELECT keydata FROM onak_keys;");
+
+       if (PQresultStatus(result) == PGRES_TUPLES_OK) {
+               numkeys = PQntuples(result);
+               for (i = 0; i < numkeys; i++) {
+                       oids = PQgetvalue(result, i, 0);
+                       key_oid = (Oid) atoi(oids);
+
+                       fd = lo_open(dbconn, key_oid, INV_READ);
+                       if (fd < 0) {
+                               logthing(LOGTHING_ERROR,
+                                               "Can't open large object.");
+                       } else {
+                               read_openpgp_stream(keydb_fetchchar, &fd,
+                                               &packets, 0);
+                               parse_keys(packets, key);
+                               lo_close(dbconn, fd);
+
+                               iterfunc(ctx, key);
+                                       
+                               free_publickey(key);
+                               key = NULL;
+                               free_packet_list(packets);
+                               packets = NULL;
+                       }
+               }
+       } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
+               logthing(LOGTHING_ERROR, "Problem retrieving key from DB.");
+       }
+
+       PQclear(result);
+
+       return (numkeys);

 }
 
 /*
  * Include the basic keydb routines.
  */
 #define NEED_GETFULLKEYID 1
 }
 
 /*
  * Include the basic keydb routines.
  */
 #define NEED_GETFULLKEYID 1

+#define NEED_UPDATEKEYS 1

 #include "keydb.c"
 #include "keydb.c"