Add support for displaying Elgamal encrypt or sign keys (deprecated)

[onak.git] / keystructs.h

diff --git a/keystructs.h b/keystructs.h
index 10dfcc627a722f2dab4abedbeb5be4d89e343e97..33c6226ed77cf925544c2af78ef763580a6a0b7b 100644 (file)
--- a/keystructs.h
+++ b/keystructs.h
@@ -9,9 +9,12 @@
 #ifndef __KEYSTRUCTS_H__
 #define __KEYSTRUCTS_H__
 
 #ifndef __KEYSTRUCTS_H__
 #define __KEYSTRUCTS_H__
 

+#include <inttypes.h>

 #include <stdbool.h>
 #include <stdlib.h>
 
 #include <stdbool.h>
 #include <stdlib.h>
 

+#include "ll.h"
+

 /**
  *     struct openpgp_packet - Stores an OpenPGP packet.
  *     @tag: The packet tag (ie type).
 /**
  *     struct openpgp_packet - Stores an OpenPGP packet.
  *     @tag: The packet tag (ie type).


@@ -62,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.
 /**
  *     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;
  *     @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;
        struct openpgp_signedpacket_list        *uids;
        struct openpgp_signedpacket_list        *last_uid;
        struct openpgp_signedpacket_list        *subkeys;


@@ -78,4 +83,25 @@ struct openpgp_publickey {
        struct openpgp_publickey                *next;
 };
 
        struct openpgp_publickey                *next;
 };
 

+/**
+ *     struct stats_key - holds key details suitable for doing stats on.
+ *     @keyid: The keyid.
+ *     @colour: Used for marking during DFS/BFS.
+ *     @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__ */
 #endif /* __KEYSTRUCTS_H__ */