X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/8b4052ad6015aa9f54c9c824f28655f230d09d8d..1a72b8d85895fc9ffba0d8f6a9240634ce6ee8dc:/parsekey.c?ds=inline

diff --git a/parsekey.c b/parsekey.c
index 687fd9b..a0c0311 100644
--- a/parsekey.c
+++ b/parsekey.c
@@ -48,8 +48,7 @@ int parse_keys(struct openpgp_packet_list *packets,
 		case 2:
 			/*
 			 * It's a signature packet. Add it to either the public
-			 * key (it should be a revocation), to the current UID
-			 * or the current subkey.
+			 * key, to the current UID or the current subkey.
 			 */
 			log_assert(curkey != NULL);
 			if (curkey->subkeys != NULL) {
@@ -62,8 +61,25 @@ int parse_keys(struct openpgp_packet_list *packets,
 					packet_dup(packets->packet));
 			} else {
 				ADD_PACKET_TO_LIST_END(curkey,
-					revocation,
+					sig,
 					packet_dup(packets->packet));
+				/*
+				 * This is a signature on the public key; check
+				 * if it's a revocation.
+				 */
+				if (packets->packet->data[0] == 3 &&
+					packets->packet->data[2] == 0x20) {
+					/*
+					 * Type 3 key, 0x20 == revocation
+					 */
+					curkey->revoked = true;
+				} else if (packets->packet->data[0] == 4 &&
+					packets->packet->data[1] == 0x20) {
+					/*
+					 * Type 4 key, 0x20 == revocation
+					 */
+					curkey->revoked = true;
+				}
 			}
 			break;
 		case 6:
@@ -132,7 +148,7 @@ int parse_keys(struct openpgp_packet_list *packets,
  */
 int debug_packet(struct openpgp_packet *packet)
 {
-	printf("\tNew format: %d, Tag: %u, Length: %d\n",
+	printf("\tNew format: %d, Tag: %u, Length: %zd\n",
 			packet->newformat,
 			packet->tag,
 			packet->length);
@@ -416,9 +432,9 @@ int flatten_publickey(struct openpgp_publickey *key,
 		}
 
 		/*
-		 * Now do any revocation signatures on the main key.
+		 * Now do any signatures on the main key.
 		 */
-		for (tmplist = key->revocations; tmplist != NULL;
+		for (tmplist = key->sigs; tmplist != NULL;
 				tmplist = tmplist->next) {
 			ADD_PACKET_TO_LIST((*list_end),
 					packet_dup(tmplist->packet));