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

diff --git a/keyindex.c b/keyindex.c
index 869befd..46e778c 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -2,6 +2,19 @@
  * keyindex.c - Routines to list an OpenPGP key.
  *
  * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>
+ *
+ * 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.
+ *
+ * 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 <inttypes.h>
@@ -19,7 +32,9 @@
 #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)
 {
@@ -39,7 +54,7 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
 		}
 		if (html && uid != NULL) {
 			printf("%s         <a href=\"lookup?op=get&"
-				"search=%016" PRIX64 "\">%08" PRIX64
+				"search=0x%016" PRIX64 "\">%08" PRIX64
 				"</a>             "
 				"<a href=\"lookup?op=vindex&search=0x%016"
 				PRIX64 "\">%s</a>\n",
@@ -78,13 +93,13 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
 	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("                                %s\n",
 				(html) ? txt2html(buf) : buf);
-		} else if (uids->packet->tag == 17) {
+		} else if (uids->packet->tag == OPENPGP_PACKET_UAT) {
 			printf("                                ");
 			if (html) {
 				printf("<img src=\"lookup?op=photo&search="
@@ -113,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) +
@@ -140,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);
@@ -174,10 +194,11 @@ 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");
 
@@ -259,19 +280,21 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 				keys->publickey->data[0]);
 		}
 		
-		keyid = get_keyid(keys);
+		if (get_keyid(keys, &keyid) != ONAK_E_OK) {
+			logthing(LOGTHING_ERROR, "Couldn't get keyid.");
+		}
 
 		switch (type) {
-		case 1:
+		case OPENPGP_PKALGO_RSA:
 			typech = 'R';
 			break;
-		case 16:
+		case OPENPGP_PKALGO_ELGAMAL_ENC:
 			typech = 'g';
 			break;
-		case 17:
+		case OPENPGP_PKALGO_DSA:
 			typech = 'D';
 			break;
-		case 20:
+		case OPENPGP_PKALGO_ELGAMAL_SIGN:
 			typech = 'G';
 			break;
 		default:
@@ -281,7 +304,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 
 		if (html) {
 			printf("pub  %5d%c/<a href=\"lookup?op=get&"
-				"search=%016" PRIX64 "\">%08" PRIX64
+				"search=0x%016" PRIX64 "\">%08" PRIX64
 				"</a> %04d/%02d/%02d ",
 				length,
 				typech,
@@ -301,7 +324,8 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 		}
 
 		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);
@@ -364,6 +388,7 @@ int mrkey_index(struct openpgp_publickey *keys)
 	size_t					 fplength = 0;
 	unsigned char				 fp[20];
 	int					 c;
+	uint64_t				 keyid;
 
 	while (keys != NULL) {
 		created_time = (keys->publickey->data[1] << 24) +
@@ -376,7 +401,10 @@ int mrkey_index(struct openpgp_publickey *keys)
 		switch (keys->publickey->data[0]) {
 		case 2:
 		case 3:
-			printf("%016" PRIX64, 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];
@@ -406,7 +434,7 @@ int mrkey_index(struct openpgp_publickey *keys)
 		for (curuid = keys->uids; curuid != NULL;
 			 curuid = curuid->next) {
 		
-			if (curuid->packet->tag == 13) {
+			if (curuid->packet->tag == OPENPGP_PACKET_UID) {
 				printf("uid:");
 				for (i = 0; i < (int) curuid->packet->length;
 						i++) {