X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=decodekey.c;h=57a1e660754b1a7adf79284d028f248d23416b6d;hb=d76beb26081e5363c6263b6561a9e54ffb50d216;hp=0b72e5b918699c98414863e64bb3e322d078bd21;hpb=5e1b22d763640c4d7a09d07920403d8d491b4410;p=onak.git

diff --git a/decodekey.c b/decodekey.c
index 0b72e5b..57a1e66 100644
--- a/decodekey.c
+++ b/decodekey.c
@@ -61,11 +61,11 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation)
 		} else if (packetlen == 255) {
 			packetlen = data[offset++];
 			packetlen <<= 8;
-			packetlen = data[offset++];
+			packetlen |= data[offset++];
 			packetlen <<= 8;
-			packetlen = data[offset++];
+			packetlen |= data[offset++];
 			packetlen <<= 8;
-			packetlen = data[offset++];
+			packetlen |= data[offset++];
 		}
 		switch (data[offset] & 0x7F) {
 		case OPENPGP_SIGSUB_CREATION:
@@ -82,16 +82,10 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation)
 				*creation = data[offset + packetlen - 1];
 			}
 			break;
-		case OPENPGP_SIGSUB_EXPIRY:
 			/*
 			 * Signature expiration time. Might want to output this?
 			 */
 			break;
-		case OPENPGP_SIGSUB_REGEX:
-			/*
-			 * Regular expression for UIDs this sig is over.
-			 */
-			break;
 		case OPENPGP_SIGSUB_ISSUER:
 			if (keyid != NULL) {
 				*keyid = data[offset+packetlen - 8];
@@ -111,25 +105,36 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation)
 				*keyid += data[offset+packetlen - 1];
 			}
 			break;
+		case OPENPGP_SIGSUB_EXPIRY:
+		case OPENPGP_SIGSUB_EXPORTABLE:
+		case OPENPGP_SIGSUB_TRUSTSIG:
+		case OPENPGP_SIGSUB_REGEX:
+		case OPENPGP_SIGSUB_REVOCABLE:
+		case OPENPGP_SIGSUB_CAPABILITIES:
+		case OPENPGP_SIGSUB_KEYEXPIRY:
+		case OPENPGP_SIGSUB_ARR:
+		case OPENPGP_SIGSUB_PREFSYM:
+		case OPENPGP_SIGSUB_REVOCATION_KEY:
+		case OPENPGP_SIGSUB_ISSUER_UID:
+		case OPENPGP_SIGSUB_URL:
+		case OPENPGP_SIGSUB_ISSUER_FINGER:
 		case OPENPGP_SIGSUB_NOTATION:
-			/*
-			 * Annotation data.
-			 */
-			break;
-
+		case OPENPGP_SIGSUB_PREFHASH:
+		case OPENPGP_SIGSUB_PREFCOMPRESS:
 		case OPENPGP_SIGSUB_KEYSERVER:
-			/*
-			 * Key server preferences. Including no-modify.
-			 */
-			break;
+		case OPENPGP_SIGSUB_PREFKEYSERVER:
 		case OPENPGP_SIGSUB_PRIMARYUID:
-			/*
-			 * Primary UID.
-			 */
-			break;
 		case OPENPGP_SIGSUB_POLICYURI:
+		case OPENPGP_SIGSUB_KEYFLAGS:
+		case OPENPGP_SIGSUB_SIGNER_UID:
+		case OPENPGP_SIGSUB_REVOKE_REASON:
+		case OPENPGP_SIGSUB_FEATURES:
+		case OPENPGP_SIGSUB_SIGNATURE_TARGET:
+		case OPENPGP_SIGSUB_EMBEDDED_SIG:
 			/*
-			 * Policy URI.
+			 * Various subpacket types we know about, but don't
+			 * currently handle. Some are candidates for being
+			 * supported if we add signature checking support.
 			 */
 			break;
 		default:
@@ -318,21 +323,21 @@ char **keyuids(struct openpgp_publickey *key, char **primary)
  *	keysubkeys takes a public key structure and returns an array of the
  *	subkey keyids for that key.
  */
-uint64_t *keysubkeys(struct openpgp_publickey *key)
+struct openpgp_fingerprint *keysubkeys(struct openpgp_publickey *key)
 {
 	struct openpgp_signedpacket_list *cursubkey = NULL;
-	uint64_t                         *subkeys = NULL;
+	struct openpgp_fingerprint       *subkeys = NULL;
 	int                               count = 0;
-        
+
 	if (key != NULL && key->subkeys != NULL) {
 		subkeys = malloc((spsize(key->subkeys) + 1) *
-				sizeof (uint64_t));
+				sizeof (struct openpgp_fingerprint));
 		cursubkey = key->subkeys;
 		while (cursubkey != NULL) {
-			subkeys[count++] = get_packetid(cursubkey->packet);
+			get_fingerprint(cursubkey->packet, &subkeys[count++]);
 			cursubkey = cursubkey -> next;
 		}
-		subkeys[count] = 0;
+		subkeys[count].length = 0;
 	}
 
 	return subkeys;