Use C99 uint32_t rather than u_int32_t

[onak.git] / keystructs.h

diff --git a/keystructs.h b/keystructs.h
index 24799eb5101ffdcb9dbf4de7d84c6f753dad4caf..4aa8bcb9be37021bc0fa4068723c386544521d0a 100644 (file)
--- a/keystructs.h
+++ b/keystructs.h
@@ -1,11 +1,20 @@
 /*
  * keystructs.h - Structures for OpenPGP keys
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
  *
- * $Id: keystructs.h,v 1.7 2003/06/08 21:11:01 noodles Exp $
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef __KEYSTRUCTS_H__
@@ -67,15 +76,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;
@@ -104,4 +115,12 @@ struct stats_key {
        bool revoked;
 };
 
+/**
+ *     struct skshash - holds an SKS key hash (md5 over sorted packet list)
+ *     @hash: The 128 bit MD5 hash of the sorted packet list from the key
+ */
+struct skshash {
+       uint8_t hash[16];
+};
+
 #endif /* __KEYSTRUCTS_H__ */