projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Debian Vcs-* fields to point to git repository
[onak.git]
/
decodekey.c
diff --git
a/decodekey.c
b/decodekey.c
index 0b72e5b918699c98414863e64bb3e322d078bd21..b4f7ceb46781d45f376385c4cea0ac42affffb63 100644
(file)
--- a/
decodekey.c
+++ b/
decodekey.c
@@
-82,16
+82,10
@@
int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation)
*creation = data[offset + packetlen - 1];
}
break;
*creation = data[offset + packetlen - 1];
}
break;
- case OPENPGP_SIGSUB_EXPIRY:
/*
* Signature expiration time. Might want to output this?
*/
break;
/*
* 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];
case OPENPGP_SIGSUB_ISSUER:
if (keyid != NULL) {
*keyid = data[offset+packetlen - 8];
@@
-111,25
+105,23
@@
int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation)
*keyid += data[offset+packetlen - 1];
}
break;
*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_KEYEXPIRY:
+ case OPENPGP_SIGSUB_PREFSYM:
case OPENPGP_SIGSUB_NOTATION:
case OPENPGP_SIGSUB_NOTATION:
- /*
- * Annotation data.
- */
- break;
-
+ case OPENPGP_SIGSUB_PREFHASH:
+ case OPENPGP_SIGSUB_PREFCOMPRESS:
case OPENPGP_SIGSUB_KEYSERVER:
case OPENPGP_SIGSUB_KEYSERVER:
- /*
- * Key server preferences. Including no-modify.
- */
- break;
case OPENPGP_SIGSUB_PRIMARYUID:
case OPENPGP_SIGSUB_PRIMARYUID:
- /*
- * Primary UID.
- */
- break;
case OPENPGP_SIGSUB_POLICYURI:
case OPENPGP_SIGSUB_POLICYURI:
+ case OPENPGP_SIGSUB_KEYFLAGS:
/*
/*
- * 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:
*/
break;
default:
@@
-323,13
+315,13
@@
uint64_t *keysubkeys(struct openpgp_publickey *key)
struct openpgp_signedpacket_list *cursubkey = NULL;
uint64_t *subkeys = NULL;
int count = 0;
struct openpgp_signedpacket_list *cursubkey = NULL;
uint64_t *subkeys = NULL;
int count = 0;
-
+
if (key != NULL && key->subkeys != NULL) {
subkeys = malloc((spsize(key->subkeys) + 1) *
sizeof (uint64_t));
cursubkey = key->subkeys;
while (cursubkey != NULL) {
if (key != NULL && key->subkeys != NULL) {
subkeys = malloc((spsize(key->subkeys) + 1) *
sizeof (uint64_t));
cursubkey = key->subkeys;
while (cursubkey != NULL) {
-
subkeys[count++] = get_packetid(cursubkey->packet
);
+
get_packetid(cursubkey->packet, &subkeys[count++]
);
cursubkey = cursubkey -> next;
}
subkeys[count] = 0;
cursubkey = cursubkey -> next;
}
subkeys[count] = 0;