cscvs to tla changeset 47

[onak.git] / keydb_file.c

diff --git a/keydb_file.c b/keydb_file.c
index 1d9b081e726ba38f3f52202ef5bb74c859171320..a132ea73c833d679aec4083da3d71ffdbfe1140e 100644 (file)
--- a/keydb_file.c
+++ b/keydb_file.c
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

+#include "charfuncs.h"

 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"


@@ -24,43 +25,48 @@
 #include "parsekey.h"
 
 /**
 #include "parsekey.h"
 
 /**

- *     keydb_fetchchar - Fetches a char from a file.
+ *     initdb - Initialize the key database.
+ *
+ *     This is just a no-op for flat file access.

  */
  */

-static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
+void initdb(void)

 {
 {

-       return !(read( *(int *) fd, c, count));

 }
 
 /**
 }
 
 /**

- *     keydb_putchar - Puts a char to a file.
+ *     cleanupdb - De-initialize the key database.
+ *
+ *     This is just a no-op for flat file access.

  */
  */

-static int keydb_putchar(void *fd, size_t count, unsigned char *c)
+void cleanupdb(void)

 {
 {

-       return !(write( *(int *) fd, c, count));

 }
 
 /**
 }
 
 /**

- *     initdb - Initialize the key database.
+ *     starttrans - Start a transaction.

  *
  *     This is just a no-op for flat file access.
  */
  *
  *     This is just a no-op for flat file access.
  */

-void initdb(void)
+bool starttrans(void)

 {
 {

+       return true;

 }
 
 /**
 }
 
 /**

- *     cleanupdb - De-initialize the key database.
+ *     endtrans - End a transaction.

  *
  *     This is just a no-op for flat file access.
  */
  *
  *     This is just a no-op for flat file access.
  */

-void cleanupdb(void)
+void endtrans(void)

 {
 {

+       return;

 }
 
 /**
  *     fetch_key - Given a keyid fetch the key from storage.
  *     @keyid: The keyid to fetch.
  *     @publickey: A pointer to a structure to return the key in.
 }
 
 /**
  *     fetch_key - Given a keyid fetch the key from storage.
  *     @keyid: The keyid to fetch.
  *     @publickey: A pointer to a structure to return the key in.

+ *     @intrans: If we're already in a transaction.

  *
  *     We use the hex representation of the keyid as the filename to fetch the
  *     key from. The key is stored in the file as a binary OpenPGP stream of
  *
  *     We use the hex representation of the keyid as the filename to fetch the
  *     key from. The key is stored in the file as a binary OpenPGP stream of


@@ -68,19 +74,22 @@ void cleanupdb(void)
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */

-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
+int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+               bool intrans)

 {
        struct openpgp_packet_list *packets = NULL;
        char keyfile[1024];
        int fd = -1;
 
 {
        struct openpgp_packet_list *packets = NULL;
        char keyfile[1024];
        int fd = -1;
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,

                        keyid & 0xFFFFFFFF);
        fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 
        if (fd > -1) {
                        keyid & 0xFFFFFFFF);
        fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 
        if (fd > -1) {

-               read_openpgp_stream(keydb_fetchchar, &fd, &packets);
+               read_openpgp_stream(file_fetchchar, &fd, &packets);

                parse_keys(packets, publickey);
                parse_keys(packets, publickey);

+               free_packet_list(packets);
+               packets = NULL;

                close(fd);
        }
 
                close(fd);
        }
 


@@ -90,13 +99,15 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
 /**
  *     store_key - Takes a key and stores it.
  *     @publickey: A pointer to the public key to store.
 /**
  *     store_key - Takes a key and stores it.
  *     @publickey: A pointer to the public key to store.

+ *     @intrans: If we're already in a transaction.
+ *     @update: If true the key exists and should be updated.

  *
  *     Again we just use the hex representation of the keyid as the filename
  *     to store the key to. We flatten the public key to a list of OpenPGP
  *     packets and then use write_openpgp_stream() to write the stream out to
  *     the file.
  */
  *
  *     Again we just use the hex representation of the keyid as the filename
  *     to store the key to. We flatten the public key to a list of OpenPGP
  *     packets and then use write_openpgp_stream() to write the stream out to
  *     the file.
  */

-int store_key(struct openpgp_publickey *publickey)
+int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)

 {
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;
 {
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;


@@ -104,7 +115,7 @@ int store_key(struct openpgp_publickey *publickey)
        char keyfile[1024];
        int fd = -1;
 
        char keyfile[1024];
        int fd = -1;
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,

                        get_keyid(publickey) & 0xFFFFFFFF);
        fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 
                        get_keyid(publickey) & 0xFFFFFFFF);
        fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 


@@ -114,8 +125,10 @@ int store_key(struct openpgp_publickey *publickey)
                flatten_publickey(publickey, &packets, &list_end);
                publickey -> next = next;
                
                flatten_publickey(publickey, &packets, &list_end);
                publickey -> next = next;
                

-               write_openpgp_stream(keydb_putchar, &fd, packets);
+               write_openpgp_stream(file_putchar, &fd, packets);

                close(fd);
                close(fd);

+               free_packet_list(packets);
+               packets = NULL;

        }
 
        return (fd > -1);
        }
 
        return (fd > -1);


@@ -124,20 +137,36 @@ int store_key(struct openpgp_publickey *publickey)
 /**
  *     delete_key - Given a keyid delete the key from storage.
  *     @keyid: The keyid to delete.
 /**
  *     delete_key - Given a keyid delete the key from storage.
  *     @keyid: The keyid to delete.

+ *     @intrans: If we're already in a transaction.

  *
  *     This function deletes a public key from whatever storage mechanism we
  *     are using. Returns 0 if the key existed.
  */
  *
  *     This function deletes a public key from whatever storage mechanism we
  *     are using. Returns 0 if the key existed.
  */

-int delete_key(uint64_t keyid)
+int delete_key(uint64_t keyid, bool intrans)

 {
        char keyfile[1024];
 
 {
        char keyfile[1024];
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,

                        keyid & 0xFFFFFFFF);
 
        return unlink(keyfile);
 }
 
                        keyid & 0xFFFFFFFF);
 
        return unlink(keyfile);
 }
 

+/**
+ *     fetch_key_text - Trys to find the keys that contain the supplied text.
+ *     @search: The text to search for.
+ *     @publickey: A pointer to a structure to return the key in.
+ *
+ *     This function searches for the supplied text and returns the keys that
+ *     contain it.
+ *
+ *     TODO: Write for flat file access. Some sort of grep?
+ */
+int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
+{
+       return 0;
+}
+

 /*
  * Include the basic keydb routines.
  */
 /*
  * Include the basic keydb routines.
  */