X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=decodekey.c;h=705b827d43ef7a7e69197a9a4dd9af537e81d542;hb=23f086c85c5d2db35e9ce76cf0bbf72200b4dc42;hp=aeb7c623c516a959a277bf0b7177792fb5e472b8;hpb=ba236fc3d763f23987f70f15ba43ac3667f2d08c;p=onak.git diff --git a/decodekey.c b/decodekey.c index aeb7c62..705b827 100644 --- a/decodekey.c +++ b/decodekey.c @@ -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) { - get_packetid(cursubkey->packet, &subkeys[count++]); + get_fingerprint(cursubkey->packet, &subkeys[count++]); cursubkey = cursubkey -> next; } - subkeys[count] = 0; + subkeys[count].length = 0; } return subkeys;