X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/ce8be6edbed5c435a8f957781a26e6f9eac6fcec..HEAD:/keyindex.c diff --git a/keyindex.c b/keyindex.c index b81ec61..46e778c 100644 --- a/keyindex.c +++ b/keyindex.c @@ -1,14 +1,22 @@ /* * keyindex.c - Routines to list an OpenPGP key. * - * Jonathan McDowell + * Copyright 2002-2008 Jonathan McDowell * - * Copyright 2002 Project Purple + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; version 2 of the License. * - * $Id: keyindex.c,v 1.13 2003/10/11 21:52:18 noodles Exp $ + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include #include #include @@ -24,31 +32,46 @@ #include "keyindex.h" #include "keystructs.h" #include "log.h" +#include "onak.h" +#include "onak-conf.h" +#include "openpgp.h" int list_sigs(struct openpgp_packet_list *sigs, bool html) { char *uid = NULL; uint64_t sigid = 0; + char *sig = NULL; while (sigs != NULL) { sigid = sig_keyid(sigs->packet); - uid = keyid2uid(sigid); + uid = config.dbbackend->keyid2uid(sigid); + if (sigs->packet->data[0] == 4 && + sigs->packet->data[1] == 0x30) { + /* It's a Type 4 sig revocation */ + sig = "rev"; + } else { + sig = "sig"; + } if (html && uid != NULL) { - printf("sig %08llX " - "" - "%s\n", - sigid & 0xFFFFFFFF, - sigid & 0xFFFFFFFF, + printf("%s %08" PRIX64 + " " + "%s\n", + sig, + sigid, sigid & 0xFFFFFFFF, + sigid, txt2html(uid)); } else if (html && uid == NULL) { - printf("sig %08llX " + printf("%s %08" PRIX64 " " "[User id not found]\n", + sig, sigid & 0xFFFFFFFF); } else { - printf("sig %08llX" + printf("%s %08" PRIX64 " %s\n", + sig, sigid & 0xFFFFFFFF, (uid != NULL) ? uid : "[User id not found]"); @@ -63,20 +86,31 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html) return 0; } -int list_uids(struct openpgp_signedpacket_list *uids, bool verbose, bool html) +int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids, + bool verbose, bool html) { char buf[1024]; + int imgindx = 0; while (uids != NULL) { - if (uids->packet->tag == 13) { + if (uids->packet->tag == OPENPGP_PACKET_UID) { snprintf(buf, 1023, "%.*s", (int) uids->packet->length, uids->packet->data); - printf("uid %s\n", + printf(" %s\n", (html) ? txt2html(buf) : buf); - } else if (uids->packet->tag == 17) { - printf("uid " - "[photo id]\n"); + } else if (uids->packet->tag == OPENPGP_PACKET_UAT) { + printf(" "); + if (html) { + printf("\""\n", + keyid, + imgindx); + imgindx++; + } else { + printf("[photo id]\n"); + } } if (verbose) { list_sigs(uids->sigs, html); @@ -94,9 +128,10 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose, time_t created_time = 0; int type = 0; int length = 0; + uint64_t keyid = 0; while (subkeys != NULL) { - if (subkeys->packet->tag == 14) { + if (subkeys->packet->tag == OPENPGP_PACKET_PUBLICSUBKEY) { created_time = (subkeys->packet->data[1] << 24) + (subkeys->packet->data[2] << 16) + @@ -121,13 +156,17 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose, "Unknown key type: %d", subkeys->packet->data[0]); } - + + if (get_packetid(subkeys->packet, + &keyid) != ONAK_E_OK) { + logthing(LOGTHING_ERROR, "Couldn't get keyid."); + } printf("sub %5d%c/%08X %04d/%02d/%02d\n", length, - (type == 1) ? 'R' : ((type == 16) ? 'g' : - ((type == 17) ? 'D' : '?')), - (uint32_t) (get_packetid(subkeys->packet) & - 0xFFFFFFFF), + (type == OPENPGP_PKALGO_RSA) ? 'R' : + ((type == OPENPGP_PKALGO_ELGAMAL_ENC) ? 'g' : + ((type == OPENPGP_PKALGO_DSA) ? 'D' : '?')), + (uint32_t) (keyid & 0xFFFFFFFF), created->tm_year + 1900, created->tm_mon + 1, created->tm_mday); @@ -155,10 +194,36 @@ void display_fingerprint(struct openpgp_publickey *key) (i % 2 == 0)) { printf(" "); } - printf("%02X", fp[i]); - if ((i * 2) == length) { + if (length == 20 && (i * 2) == length) { + /* Extra space in the middle of a SHA1 fingerprint */ printf(" "); } + printf("%02X", fp[i]); + } + printf("\n"); + + return; +} + +void display_skshash(struct openpgp_publickey *key, bool html) +{ + int i = 0; + struct skshash hash; + + get_skshash(key, &hash); + printf(" Key hash = "); + if (html) { + printf(""); + } + for (i = 0; i < sizeof(hash.hash); i++) { + printf("%02X", hash.hash[i]); + } + if (html) { + printf(""); } printf("\n"); @@ -176,14 +241,16 @@ void display_fingerprint(struct openpgp_publickey *key) * of them. Useful for debugging or the keyserver Index function. */ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint, - bool html) + bool skshash, bool html) { struct openpgp_signedpacket_list *curuid = NULL; struct tm *created = NULL; time_t created_time = 0; int type = 0; + char typech; int length = 0; char buf[1024]; + uint64_t keyid; if (html) { puts("
");
@@ -213,24 +280,67 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 				keys->publickey->data[0]);
 		}
 		
-		printf("pub  %5d%c/%08X %04d/%02d/%02d ",
-			length,
-			(type == 1) ? 'R' : ((type == 16) ? 'g' : 
-				((type == 17) ? 'D' : '?')),
-			(uint32_t) (get_keyid(keys) & 0xFFFFFFFF),
-			created->tm_year + 1900,
-			created->tm_mon + 1,
-			created->tm_mday);
+		if (get_keyid(keys, &keyid) != ONAK_E_OK) {
+			logthing(LOGTHING_ERROR, "Couldn't get keyid.");
+		}
+
+		switch (type) {
+		case OPENPGP_PKALGO_RSA:
+			typech = 'R';
+			break;
+		case OPENPGP_PKALGO_ELGAMAL_ENC:
+			typech = 'g';
+			break;
+		case OPENPGP_PKALGO_DSA:
+			typech = 'D';
+			break;
+		case OPENPGP_PKALGO_ELGAMAL_SIGN:
+			typech = 'G';
+			break;
+		default:
+			typech = '?';
+			break;
+		}
+
+		if (html) {
+			printf("pub  %5d%c/%08" PRIX64
+				" %04d/%02d/%02d ",
+				length,
+				typech,
+				keyid,
+				keyid & 0xFFFFFFFF,
+				created->tm_year + 1900,
+				created->tm_mon + 1,
+				created->tm_mday);
+		} else {
+			printf("pub  %5d%c/%08" PRIX64 " %04d/%02d/%02d ",
+				length,
+				typech,
+				keyid & 0xFFFFFFFF,
+				created->tm_year + 1900,
+				created->tm_mon + 1,
+				created->tm_mday);
+		}
 
 		curuid = keys->uids;
-		if (curuid != NULL && curuid->packet->tag == 13) {
+		if (curuid != NULL &&
+				curuid->packet->tag == OPENPGP_PACKET_UID) {
 			snprintf(buf, 1023, "%.*s",
 				(int) curuid->packet->length,
 				curuid->packet->data);
-			printf("%s%s\n", 
+			if (html) {
+				printf("",
+					keyid);
+			}
+			printf("%s%s%s\n", 
 				(html) ? txt2html(buf) : buf,
-				(keys->revocations == NULL) ? "" :
-					" *** REVOKED ***");
+				(html) ? "" : "",
+				(keys->revoked) ? " *** REVOKED ***" : "");
+			if (skshash) {
+				display_skshash(keys, html);
+			}
 			if (fingerprint) {
 				display_fingerprint(keys);
 			}
@@ -240,15 +350,16 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 			curuid = curuid->next;
 		} else {
 			printf("%s\n", 
-				(keys->revocations == NULL) ? "" :
-					"*** REVOKED ***");
+				(keys->revoked) ? "*** REVOKED ***": "");
 			if (fingerprint) {
 				display_fingerprint(keys);
 			}
 		}
 
-		list_uids(curuid, verbose, html);
-		list_subkeys(keys->subkeys, verbose, html);
+		list_uids(keyid, curuid, verbose, html);
+		if (verbose) {
+			list_subkeys(keys->subkeys, verbose, html);
+		}
 
 		keys = keys->next;
 	}
@@ -276,6 +387,8 @@ int mrkey_index(struct openpgp_publickey *keys)
 	int					 i = 0;
 	size_t					 fplength = 0;
 	unsigned char				 fp[20];
+	int					 c;
+	uint64_t				 keyid;
 
 	while (keys != NULL) {
 		created_time = (keys->publickey->data[1] << 24) +
@@ -288,7 +401,10 @@ int mrkey_index(struct openpgp_publickey *keys)
 		switch (keys->publickey->data[0]) {
 		case 2:
 		case 3:
-			printf("%016llX", get_keyid(keys));
+			if (get_keyid(keys, &keyid) != ONAK_E_OK) {
+				logthing(LOGTHING_ERROR, "Couldn't get keyid");
+			}
+			printf("%016" PRIX64, keyid);
 			type = keys->publickey->data[7];
 			length = (keys->publickey->data[8] << 8) +
 					keys->publickey->data[9];
@@ -313,15 +429,26 @@ int mrkey_index(struct openpgp_publickey *keys)
 			type,
 			length,
 			created_time,
-			(keys->revocations == NULL) ? "" : "r");
+			(keys->revoked) ? "r" : "");
 	
 		for (curuid = keys->uids; curuid != NULL;
 			 curuid = curuid->next) {
 		
-			if (curuid->packet->tag == 13) {
-				printf("uid:%.*s\n",
-					(int) curuid->packet->length,
-					curuid->packet->data);
+			if (curuid->packet->tag == OPENPGP_PACKET_UID) {
+				printf("uid:");
+				for (i = 0; i < (int) curuid->packet->length;
+						i++) {
+					c = curuid->packet->data[i];
+					if (c == '%') {
+						putchar('%');
+						putchar(c);
+					} else if (c == ':' || c > 127) {
+						printf("%%%X", c);
+					} else {
+						putchar(c);
+					}
+				}
+				printf("\n");
 			}
 		}
 		keys = keys->next;