X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e3ee7975fc8f8b343390272663b8c644030b17c1..59e5def499b3e9ae3587ebae2bef8794a1df34ea:/keystructs.h

diff --git a/keystructs.h b/keystructs.h
index e145fdf..33c6226 100644
--- a/keystructs.h
+++ b/keystructs.h
@@ -65,15 +65,17 @@ struct openpgp_signedpacket_list {
 /**
  *	struct openpgp_publickey - An OpenPGP public key complete with sigs.
  *	@publickey: The OpenPGP packet for the public key.
- *	@revocation: The OpenPGP packet for the revocation [optional]
+ *	@revoked: True if the key is revoked.
+ *	@sigs: Any signatures directly on the publickey packet.
  *	@uids: The list of UIDs with signatures for this key.
  *	@subkeys: The list of subkeys with signatures for this key.
  *	@next: The next public key.
  */
 struct openpgp_publickey {
 	struct openpgp_packet			*publickey;
-	struct openpgp_packet_list		*revocations;
-	struct openpgp_packet_list		*last_revocation;
+	bool					 revoked;
+	struct openpgp_packet_list		*sigs;
+	struct openpgp_packet_list		*last_sig;
 	struct openpgp_signedpacket_list	*uids;
 	struct openpgp_signedpacket_list	*last_uid;
 	struct openpgp_signedpacket_list	*subkeys;
@@ -88,14 +90,18 @@ struct openpgp_publickey {
  *	@parent: The key that lead us to this one for DFS/BFS.
  *	@sigs: A linked list of the signatures on this key.
  *	@gotsigs: A bool indicating if we've initialized the sigs element yet.
+ *	@disabled: If we shouldn't consider the key in calculations.
+ *	@revoked: If the key is revoked (and shouldn't be considered).
  */
 struct stats_key {
 	uint64_t keyid;
 	int colour;
 	uint64_t parent;
 	struct ll *sigs;
+	struct ll *signs;
 	bool gotsigs;
 	bool disabled;
+	bool revoked;
 };
 
 #endif /* __KEYSTRUCTS_H__ */