From 576754568dc383e78065e88e05eeb2d078524f9c Mon Sep 17 00:00:00 2001 From: Jonathan McDowell Date: Mon, 31 May 2004 23:47:48 +0000 Subject: [PATCH] cscvs to tla changeset 85 Author: noodles Date: 2003/06/08 19:04:31 Further compile warning (under gcc 3.3 anyway) cleanups. --- gpgwww.c | 4 ++-- keyindex.c | 4 ++-- keyindex.h | 10 +++++++++- main.c | 47 +++++++++++++++++++++++++---------------------- parsekey.c | 12 ++++++------ 5 files changed, 44 insertions(+), 33 deletions(-) diff --git a/gpgwww.c b/gpgwww.c index ad864f1..05cfc00 100644 --- a/gpgwww.c +++ b/gpgwww.c @@ -5,13 +5,13 @@ * * Copyright 2001-2002 Project Purple. * - * $Id: gpgwww.c,v 1.10 2003/06/04 20:57:08 noodles Exp $ + * $Id: gpgwww.c,v 1.11 2003/06/08 19:04:31 noodles Exp $ */ -// #include #include #include #include +#include #include "getcgi.h" #include "hash.h" diff --git a/keyindex.c b/keyindex.c index 180c312..6593224 100644 --- a/keyindex.c +++ b/keyindex.c @@ -5,7 +5,7 @@ * * Copyright 2002 Project Purple * - * $Id: keyindex.c,v 1.10 2003/06/04 22:11:40 noodles Exp $ + * $Id: keyindex.c,v 1.11 2003/06/08 19:04:32 noodles Exp $ */ #include @@ -306,7 +306,7 @@ int mrkey_index(struct openpgp_publickey *keys) keys->publickey->data[0]); } - printf(":%d:%d:%d::\n", + printf(":%d:%d:%ld::\n", type, length, created_time); diff --git a/keyindex.h b/keyindex.h index 8120224..110d234 100644 --- a/keyindex.h +++ b/keyindex.h @@ -5,7 +5,7 @@ * * Copyright 2002 Project Purple * - * $Id: keyindex.h,v 1.5 2003/06/04 20:57:09 noodles Exp $ + * $Id: keyindex.h,v 1.6 2003/06/08 19:04:32 noodles Exp $ */ #ifndef __KEYINDEX_H__ @@ -28,4 +28,12 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint, bool html); +/** + * mrkey_index - List a set of OpenPGP keys in the MRHKP format. + * @keys: The keys to display. + * + * This function takes a list of OpenPGP public keys and displays a + * machine readable list of them. + */ +int mrkey_index(struct openpgp_publickey *keys); #endif diff --git a/main.c b/main.c index c7bfe28..b140c8e 100644 --- a/main.c +++ b/main.c @@ -23,38 +23,41 @@ int putnextchar(void *ctx, size_t count, unsigned char *c) int main(int argc, char *argv[]) { - struct openpgp_packet_list *packets = NULL; //, *newpackets = NULL; -// struct openpgp_packet_list *list_end = NULL; -// struct openpgp_publickey *keys = NULL; -// struct openpgp_publickey *newkeys = NULL; -// void *ctx = NULL; - -// fputs("Doing read_openpgp_stream():\n", stderr); -// read_openpgp_stream(getnextchar, ctx, &packets); - + struct openpgp_packet_list *packets = NULL; +/* + , *newpackets = NULL; + struct openpgp_packet_list *list_end = NULL; + struct openpgp_publickey *keys = NULL; + struct openpgp_publickey *newkeys = NULL; + void *ctx = NULL; + + fputs("Doing read_openpgp_stream():\n", stderr); + read_openpgp_stream(getnextchar, ctx, &packets); +*/ fputs("Doing dearmor_openpgp_stream():\n", stderr); dearmor_openpgp_stream(getnextchar, NULL, &packets); fputs("Doing armor_openpgp_stream():\n", stderr); armor_openpgp_stream(putnextchar, NULL, packets); -// fputs("Doing parse_keys():\n", stderr); -// parse_keys(packets, &keys); - -// printf("Key id is 0x%llX\n", get_keyid(keys)); +/* + fputs("Doing parse_keys():\n", stderr); + parse_keys(packets, &keys); -// key_index(keys, true, false, false); + printf("Key id is 0x%llX\n", get_keyid(keys)); -// initdb(); -// fetch_key(get_keyid(keys), &newkeys); -// cleanupdb(); + key_index(keys, true, false, false); -// printf("New key id is 0x%llX\n", get_keyid(newkeys)); + initdb(); + fetch_key(get_keyid(keys), &newkeys); + cleanupdb(); -// fputs("Doing flatten_publickey():\n", stderr); -// flatten_publickey(keys, &newpackets, &list_end); + printf("New key id is 0x%llX\n", get_keyid(newkeys)); -// fputs("Doing write_openpgp_stream():\n", stderr); -// write_openpgp_stream(putnextchar, ctx, newpackets); + fputs("Doing flatten_publickey():\n", stderr); + flatten_publickey(keys, &newpackets, &list_end); + fputs("Doing write_openpgp_stream():\n", stderr); + write_openpgp_stream(putnextchar, ctx, newpackets); +*/ return 0; } diff --git a/parsekey.c b/parsekey.c index 88a4594..0f02e8c 100644 --- a/parsekey.c +++ b/parsekey.c @@ -5,7 +5,7 @@ * * Copyright 2002 Project Purple * - * $Id: parsekey.c,v 1.7 2003/06/04 20:57:12 noodles Exp $ + * $Id: parsekey.c,v 1.8 2003/06/08 19:04:32 noodles Exp $ */ #include @@ -203,7 +203,9 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count, curpacket->packet->newformat = (curchar & 0x40); - // TODO: Better error checking on getchar_func. + /* + * TODO: Better error checking on getchar_func. + */ if (curpacket->packet->newformat) { curpacket->packet->tag = (curchar & 0x3F); rc = getchar_func(ctx, 1, &curchar); @@ -356,10 +358,8 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count, } } - putchar_func(ctx, packets->packet->length, packets->packet->data); -// for (i = 0; i < packets->packet->length; i++) { -// putchar_func(ctx, packets->packet->data[i]); -// } + putchar_func(ctx, packets->packet->length, + packets->packet->data); packets = packets->next; } return 0; -- 2.39.5