X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=decodekey.c;h=705b827d43ef7a7e69197a9a4dd9af537e81d542;hb=23f086c85c5d2db35e9ce76cf0bbf72200b4dc42;hp=5b2092e024c0b6016e9a77b679fc1c8006f2f019;hpb=8337392d1507b70c6e3e6c6523b6eb8a843a7395;p=onak.git

diff --git a/decodekey.c b/decodekey.c
index 5b2092e..705b827 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:
@@ -310,21 +310,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;