X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=decodekey.c;h=57a1e660754b1a7adf79284d028f248d23416b6d;hb=8aefbded3634aff93af5aa094094ca87c0e64239;hp=b4f7ceb46781d45f376385c4cea0ac42affffb63;hpb=e0dd4d10f385cd19da389ec66622eea8aa66ae59;p=onak.git

diff --git a/decodekey.c b/decodekey.c
index b4f7ceb..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:
@@ -109,15 +109,28 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation)
 		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:
 		case OPENPGP_SIGSUB_PREFHASH:
 		case OPENPGP_SIGSUB_PREFCOMPRESS:
 		case OPENPGP_SIGSUB_KEYSERVER:
+		case OPENPGP_SIGSUB_PREFKEYSERVER:
 		case OPENPGP_SIGSUB_PRIMARYUID:
 		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:
 			/*
 			 * Various subpacket types we know about, but don't
 			 * currently handle. Some are candidates for being
@@ -310,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) {
-			get_packetid(cursubkey->packet, &subkeys[count++]);
+			get_fingerprint(cursubkey->packet, &subkeys[count++]);
 			cursubkey = cursubkey -> next;
 		}
-		subkeys[count] = 0;
+		subkeys[count].length = 0;
 	}
 
 	return subkeys;