* packet.h, tdbio.h, tdbio.c (tdbio_read_record, tdbio_write_record),

trustdb.c (update_validity): Store temporary full & marginal counts in the
trustdb. (clear_validity, get_validity_counts): Return and clear temp
counts. (store_validation_status): Keep track of which keyids have been
stored. (validate_one_keyblock, validate_key_list): Use per-uid copies of
the full & marginal counts so they can be recalled for multiple levels.
(validate_keys): Only use unused keys for each new round.
(reset_unconnected_keys): Rename to reset_trust_records, and only skip
specifically excluded records.

1 files changed, 3 insertions, 1 deletions

diff --git a/g10/packet.h b/g10/packet.h
index 00b7d2b14..05e7c261a 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -49,7 +49,7 @@ typedef enum {
 	PKT_OLD_COMMENT   =16, /* comment packet from an OpenPGP draft */
 	PKT_ATTRIBUTE     =17, /* PGP's attribute packet */
 	PKT_ENCRYPTED_MDC =18, /* integrity protected encrypted data */
-	PKT_MDC 	  =19, /* manipulaion detection code packet */
+	PKT_MDC 	  =19, /* manipulation detection code packet */
 	PKT_COMMENT	  =61, /* new comment packet (private) */
         PKT_GPG_CONTROL   =63  /* internal control packet */
 } pkttype_t;
@@ -169,6 +169,8 @@ typedef struct {
     unsigned long attrib_len;
     int help_key_usage;
     u32 help_key_expire;
+    int help_full_count;
+    int help_marginal_count;
     int is_primary;
     int is_revoked;
     int is_expired;