X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/d5ee45b742e49fa30cc8d0a5a69ee47c8c5b1eb5..b1cb08b256587f6c5d2c484438d942e58583ba88:/keyindex.c

diff --git a/keyindex.c b/keyindex.c
index a8f9193..5911cac 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -7,21 +7,20 @@
  */
 
 #include <assert.h>
+#include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+#include "decodekey.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
 #include "keystructs.h"
-#include "ll.h"
-#include "stats.h"
 
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
@@ -139,7 +138,6 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
 	return 0;
 }
 
-
 /**
  *	key_index - List a set of OpenPGP keys.
  *	@keys: The keys to display.
@@ -223,216 +221,3 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 
 	return 0;
 }
-
-/*
- *	parse_subpackets - Parse the subpackets of a Type 4 signature.
- *	@data: The subpacket data.
- *      @keyid: A pointer to where we should return the keyid.
- *
- *	This function parses the subkey data of a Type 4 signature and fills
- *	in the supplied variables. It also returns the length of the data
- *	processed.
- */
-int parse_subpackets(unsigned char *data, uint64_t *keyid)
-{
-	int offset = 0;
-	int length = 0;
-	int packetlen = 0;
-
-	assert(data != NULL);
-
-	length = (data[0] << 8) + data[1] + 2;
-
-	offset = 2;
-	while (offset < length) {
-		packetlen = data[offset++];
-		if (packetlen > 191 && packetlen < 255) {
-			packetlen = ((packetlen - 192) << 8) +
-					data[offset++] + 192;
-		} else if (packetlen == 255) {
-			packetlen = data[offset++];
-			packetlen <<= 8;
-			packetlen = data[offset++];
-			packetlen <<= 8;
-			packetlen = data[offset++];
-			packetlen <<= 8;
-			packetlen = data[offset++];
-		}
-		switch (data[offset]) {
-		case 2:
-			/*
-			 * Signature creation time. Might want to output this?
-			 */
-			break;
-		case 0x83:
-			/*
-			 * Signature expiration time. Might want to output this?
-			 */
-			break;
-		case 16:
-			*keyid = data[offset+packetlen - 8];
-			*keyid <<= 8;
-			*keyid += data[offset+packetlen - 7];
-			*keyid <<= 8;
-			*keyid += data[offset+packetlen - 6];
-			*keyid <<= 8;
-			*keyid += data[offset+packetlen - 5];
-			*keyid <<= 8;
-			*keyid += data[offset+packetlen - 4];
-			*keyid <<= 8;
-			*keyid += data[offset+packetlen - 3];
-			*keyid <<= 8;
-			*keyid += data[offset+packetlen - 2];
-			*keyid <<= 8;
-			*keyid += data[offset+packetlen - 1];
-			break;
-		case 23:
-			/*
-			 * Key server preferences. Including no-modify.
-			 */
-			break;
-		case 25:
-			/*
-			 * Primary UID.
-			 */
-			break;
-		default:
-			/*
-			 * We don't care about unrecognized packets unless bit
-			 * 7 is set in which case we prefer an error than
-			 * ignoring it.
-			 */
-			assert(!(data[offset] & 0x80));
-		}
-		offset += packetlen;
-	}
-
-	return length;
-}
-
-/**
- *	keysigs - Return the sigs on a given OpenPGP signature list.
- *	@curll: The current linked list. Can be NULL to create a new list.
- *	@sigs: The signature list we want the sigs on.
- *
- *	Returns a linked list of stats_key elements containing the sigs on the
- *	supplied OpenPGP packet list.
- */
-struct ll *keysigs(struct ll *curll,
-		struct openpgp_packet_list *sigs)
-{
-	uint64_t keyid = 0;
-	
-	while (sigs != NULL) {
-		keyid = sig_keyid(sigs->packet);
-		sigs = sigs->next;
-		curll = lladd(curll, createandaddtohash(keyid));
-	}
-
-	return curll;
-}
-
-/**
- *	sig_keyid - Return the keyid for a given OpenPGP signature packet.
- *	@packet: The signature packet.
- *
- *	Returns the keyid for the supplied signature packet.
- */
-uint64_t sig_keyid(struct openpgp_packet *packet)
-{
-	int length = 0;
-	uint64_t keyid = 0;
-	
-	if (packet != NULL) {
-		keyid = 0;
-		switch (packet->data[0]) {
-		case 2:
-		case 3:
-			keyid = packet->data[7];
-			keyid <<= 8;
-			keyid += packet->data[8];
-			keyid <<= 8;
-			keyid += packet->data[9];
-			keyid <<= 8;
-			keyid += packet->data[10];
-			keyid <<= 8;
-			keyid += packet->data[11];
-			keyid <<= 8;
-			keyid += packet->data[12];
-			keyid <<= 8;
-			keyid += packet->data[13];
-			keyid <<= 8;
-			keyid += packet->data[14];
-			break;
-		case 4:
-			length = parse_subpackets(&packet->data[4],
-					&keyid);
-			parse_subpackets(&packet->data[length + 4],
-					&keyid);
-			/*
-			 * Don't bother to look at the unsigned packets.
-			 */
-			break;
-		default:
-			break;
-		}
-	}
-
-	return keyid;
-}
-
-/*
- * TODO: Abstract out; all our linked lists should be generic and then we can
- * llsize them.
- */
-int spsize(struct openpgp_signedpacket_list *list)
-{
-	int size = 0;
-	struct openpgp_signedpacket_list *cur;
-
-	for (cur = list; cur != NULL; cur = cur->next, size++) ;
-
-	return size;
-}
-
-/**
- *	keyuids - Takes a key and returns an array of its UIDs
- *	@key: The key to get the uids of.
- *	@primary: A pointer to store the primary UID in.
- *
- *	keyuids takes a public key structure and builds an array of the UIDs 
- *	on the key. It also attempts to work out the primary UID and returns a
- *	separate pointer to that particular element of the array.
- */
-char **keyuids(struct openpgp_publickey *key, char **primary)
-{
-	struct openpgp_signedpacket_list *curuid = NULL;
-	char buf[1024];
-	char **uids = NULL;
-	int count = 0;
-
-	if (key != NULL && key->uids != NULL) {
-		uids = malloc((spsize(key->uids) + 1) * sizeof (char *));
-	
-		curuid = key->uids;
-		while (curuid != NULL) {
-			buf[0] = 0;
-			if (curuid->packet->tag == 13) {
-				snprintf(buf, 1023, "%.*s",
-						(int) curuid->packet->length,
-						curuid->packet->data);
-				uids[count++] = strdup(buf);
-			}
-			curuid = curuid -> next;
-		}
-		uids[count] = NULL;
-	}
-	/*
-	 * TODO: Parse subpackets for real primary ID (v4 keys)
-	 */
-	if (primary != NULL) {
-		*primary = uids[0];
-	}
-
-	return uids;
-}