New function log_clock.

[gnupg.git] / g10 / packet.h

diff --git a/g10/packet.h b/g10/packet.h
index 36115be..fa32ab1 100644 (file)
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -1,11 +1,12 @@
-/* packet.h - packet read/write stuff
- *     Copyright (C) 1998 Free Software Foundation, Inc.
+/* packet.h - OpenPGP packet definitions
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ *               2007 Free Software Foundation, Inc.

  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This file is part of GnuPG.
  *
  * GnuPG 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; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or

  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,


@@ -14,48 +15,50 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.

  */
 
 #ifndef G10_PACKET_H
 #define G10_PACKET_H
 
 #include "types.h"
  */
 
 #ifndef G10_PACKET_H
 #define G10_PACKET_H
 
 #include "types.h"

-#include "iobuf.h"
-#include "mpi.h"
+#include "../common/iobuf.h"
+#include "../common/strlist.h"

 #include "cipher.h"
 #include "filter.h"
 #include "cipher.h"
 #include "filter.h"

+#include "../common/openpgpdefs.h"
+#include "../common/userids.h"

 
 #define DEBUG_PARSE_PACKET 1
 
 
 #define DEBUG_PARSE_PACKET 1
 

-typedef enum {
-       PKT_NONE           =0,
-       PKT_PUBKEY_ENC     =1, /* public key encrypted packet */
-       PKT_SIGNATURE      =2, /* secret key encrypted packet */
-       PKT_SYMKEY_ENC     =3, /* session key packet (OpenPGP)*/
-       PKT_ONEPASS_SIG    =4, /* one pass sig packet (OpenPGP)*/
-       PKT_SECRET_KEY     =5, /* secret key */
-       PKT_PUBLIC_KEY     =6, /* public key */
-       PKT_SECRET_SUBKEY  =7, /* secret subkey (OpenPGP) */
-       PKT_COMPRESSED     =8, /* compressed data packet */
-       PKT_ENCRYPTED      =9, /* conventional encrypted data */
-       PKT_MARKER        =10, /* marker packet (OpenPGP) */
-       PKT_PLAINTEXT     =11, /* plaintext data with filename and mode */
-       PKT_RING_TRUST    =12, /* keyring trust packet */
-       PKT_USER_ID       =13, /* user id packet */
-       PKT_PUBLIC_SUBKEY =14, /* public subkey (OpenPGP) */
-       PKT_OLD_COMMENT   =16, /* comment packet from an OpenPGP draft */
-       PKT_COMMENT       =61  /* new comment packet (private) */
-} pkttype_t;

 
 typedef struct packet_struct PACKET;
 
 
 typedef struct packet_struct PACKET;
 

+/* PKT_GPG_CONTROL types */
+typedef enum {
+    CTRLPKT_CLEARSIGN_START = 1,
+    CTRLPKT_PIPEMODE = 2,
+    CTRLPKT_PLAINTEXT_MARK =3
+} ctrlpkttype_t;
+
+typedef enum {
+    PREFTYPE_NONE = 0,
+    PREFTYPE_SYM = 1,
+    PREFTYPE_HASH = 2,
+    PREFTYPE_ZIP = 3
+} preftype_t;
+

 typedef struct {
 typedef struct {

-    byte mode;
-    byte hash_algo;
-    byte salt[8];
-    u32  count;
+    byte type;
+    byte value;
+} prefitem_t;
+
+typedef struct
+{
+  int  mode;      /* Must be an integer due to the GNU modes 1001 et al.  */
+  byte hash_algo;
+  byte salt[8];
+  u32  count;

 } STRING2KEY;
 
 typedef struct {
 } STRING2KEY;
 
 typedef struct {


@@ -71,7 +74,7 @@ typedef struct {
     byte    version;
     byte    pubkey_algo;    /* algorithm used for public key scheme */
     byte    throw_keyid;
     byte    version;
     byte    pubkey_algo;    /* algorithm used for public key scheme */
     byte    throw_keyid;

-    MPI     data[PUBKEY_MAX_NENC];
+    gcry_mpi_t     data[PUBKEY_MAX_NENC];

 } PKT_pubkey_enc;
 
 
 } PKT_pubkey_enc;
 
 


@@ -85,66 +88,208 @@ typedef struct {
 
 
 typedef struct {
 
 
 typedef struct {

-    ulong   local_id;      /* internal use, valid if > 0 */
-    struct {
-       unsigned checked:1; /* signature has been checked */
-       unsigned valid:1;   /* signature is good (if checked is set) */
-       unsigned unknown_critical:1;
-    } flags;
-    u32     keyid[2];      /* 64 bit keyid */
-    u32     timestamp;     /* signature made */
-    byte    version;
-    byte    sig_class;     /* sig classification, append for MD calculation*/
-    byte    pubkey_algo;    /* algorithm used for public key scheme */
-                           /* (PUBKEY_ALGO_xxx) */
-    byte digest_algo;      /* algorithm used for digest (DIGEST_ALGO_xxxx) */
-    byte *hashed_data;     /* all subpackets with hashed  data (v4 only) */
-    byte *unhashed_data;    /* ditto for unhashed data */
-    byte digest_start[2];   /* first 2 bytes of the digest */
-    MPI  data[PUBKEY_MAX_NSIG];
+    size_t size;  /* allocated */
+    size_t len;   /* used */
+    byte data[1];
+} subpktarea_t;
+
+struct revocation_key {
+  byte class;
+  byte algid;
+  byte fpr[MAX_FINGERPRINT_LEN];
+};
+
+
+/* Object to keep information about a PKA DNS record. */
+typedef struct
+{
+  int valid;    /* An actual PKA record exists for EMAIL. */
+  int checked;  /* Set to true if the FPR has been checked against the
+                   actual key. */
+  char *uri;    /* Malloced string with the URI. NULL if the URI is
+                   not available.*/
+  unsigned char fpr[20]; /* The fingerprint as stored in the PKA RR. */
+  char email[1];/* The email address from the notation data. */
+} pka_info_t;
+
+
+/* Object to keep information pertaining to a signature. */
+typedef struct
+{
+  struct
+  {
+    unsigned checked:1;         /* Signature has been checked. */
+    unsigned valid:1;           /* Signature is good (if checked is set). */
+    unsigned chosen_selfsig:1;  /* A selfsig that is the chosen one. */
+    unsigned unknown_critical:1;
+    unsigned exportable:1;
+    unsigned revocable:1;
+    unsigned policy_url:1;  /* At least one policy URL is present */
+    unsigned notation:1;    /* At least one notation is present */
+    unsigned pref_ks:1;     /* At least one preferred keyserver is present */
+    unsigned expired:1;
+    unsigned pka_tried:1;   /* Set if we tried to retrieve the PKA record. */
+  } flags;
+  u32     keyid[2];      /* 64 bit keyid */
+  u32     timestamp;     /* Signature made (seconds since Epoch). */
+  u32     expiredate;     /* Expires at this date or 0 if not at all. */
+  byte    version;
+  byte    sig_class;     /* Sig classification, append for MD calculation. */
+  byte    pubkey_algo;    /* Algorithm used for public key scheme */
+                          /* (PUBKEY_ALGO_xxx) */
+  byte    digest_algo;    /* Algorithm used for digest (DIGEST_ALGO_xxxx). */
+  byte    trust_depth;
+  byte    trust_value;
+  const byte *trust_regexp;
+  struct revocation_key **revkey;
+  int numrevkeys;
+  pka_info_t *pka_info;      /* Malloced PKA data or NULL if not
+                                available.  See also flags.pka_tried. */
+  subpktarea_t *hashed;      /* All subpackets with hashed data (v4 only). */
+  subpktarea_t *unhashed;    /* Ditto for unhashed data. */
+  byte digest_start[2];      /* First 2 bytes of the digest. */
+  gcry_mpi_t  data[PUBKEY_MAX_NSIG];

 } PKT_signature;
 
 } PKT_signature;
 

+#define ATTRIB_IMAGE 1

 
 

-/****************
- * Note about the pkey/skey elements:  We assume that the secret keys
- * has the same elemts as the public key at the begin of the array, so
- * that npkey < nskey and it is possible to compare the secret and
- * public keys by comparing the first npkey elements of pkey againts skey.
- */
-typedef struct {
-    u32     timestamp;     /* key made */
-    u32     expiredate;     /* expires at this date or 0 if not at all */
-    byte    hdrbytes;      /* number of header bytes */
-    byte    version;
-    byte    pubkey_algo;    /* algorithm used for public key scheme */
-    byte    pubkey_usage;   /* for now only used to pass it to getkey() */
-    ulong   local_id;      /* internal use, valid if > 0 */
-    u32     keyid[2];      /* calculated by keyid_from_pk() */
-    byte    *namehash;     /* if != NULL: found by this name */
-    MPI     pkey[PUBKEY_MAX_NPKEY];
-} PKT_public_key;
+/* This is the cooked form of attributes.  */
+struct user_attribute {
+  byte type;
+  const byte *data;
+  u32 len;
+};

 
 

-typedef struct {
-    u32     timestamp;     /* key made */
-    u32     expiredate;     /* expires at this date or 0 if not at all */
-    byte    hdrbytes;      /* number of header bytes */
-    byte    version;
-    byte    pubkey_algo;    /* algorithm used for public key scheme */
-    byte    pubkey_usage;
-    byte is_primary;
-    byte is_protected; /* The secret info is protected and must */
+
+/* (See also keybox-search-desc.h) */
+struct gpg_pkt_user_id_s
+{
+  int ref;              /* reference counter */
+  int len;             /* length of the name */
+  struct user_attribute *attribs;
+  int numattribs;
+  byte *attrib_data;    /* if this is not NULL, the packet is an attribute */
+  unsigned long attrib_len;
+  byte *namehash;
+  int help_key_usage;
+  u32 help_key_expire;
+  int help_full_count;
+  int help_marginal_count;
+  int is_primary;       /* 2 if set via the primary flag, 1 if calculated */
+  int is_revoked;
+  int is_expired;
+  u32 expiredate;       /* expires at this date or 0 if not at all */
+  prefitem_t *prefs;    /* list of preferences (may be NULL)*/
+  u32 created;          /* according to the self-signature */
+  byte selfsigversion;
+  struct
+  {
+    /* TODO: Move more flags here */
+    unsigned int mdc:1;
+    unsigned int ks_modify:1;
+    unsigned int compacted:1;
+  } flags;
+  char name[1];
+};
+typedef struct gpg_pkt_user_id_s PKT_user_id;
+
+
+
+struct revoke_info
+{
+  /* revoked at this date */
+  u32 date;
+  /* the keyid of the revoking key (selfsig or designated revoker) */
+  u32 keyid[2];
+  /* the algo of the revoking key */
+  byte algo;
+};
+
+
+/* Information pertaining to secret keys. */
+struct seckey_info
+{
+  int is_protected:1;  /* The secret info is protected and must */

                        /* be decrypted before use, the protected */
                        /* MPIs are simply (void*) pointers to memory */
                        /* and should never be passed to a mpi_xxx() */
                        /* be decrypted before use, the protected */
                        /* MPIs are simply (void*) pointers to memory */
                        /* and should never be passed to a mpi_xxx() */

-    struct {
-       byte algo;  /* cipher used to protect the secret information*/
-       STRING2KEY s2k;
-       byte ivlen;  /* used length of the iv */
-       byte iv[16]; /* initialization vector for CFB mode */
-    } protect;
-    MPI skey[PUBKEY_MAX_NSKEY];
-    u16 csum;          /* checksum */
-} PKT_secret_key;
+  int sha1chk:1;        /* SHA1 is used instead of a 16 bit checksum */
+  u16 csum;            /* Checksum for old protection modes.  */
+  byte algo;            /* Cipher used to protect the secret information. */
+  STRING2KEY s2k;       /* S2K parameter.  */
+  byte ivlen;           /* Used length of the IV.  */
+  byte iv[16];          /* Initialization vector for CFB mode.  */
+};
+
+
+/****************
+ * We assume that secret keys have the same number of parameters as
+ * the public key and that the public parameters are the first items
+ * in the PKEY array.  Thus NPKEY is always less than NSKEY and it is
+ * possible to compare the secret and public keys by comparing the
+ * first NPKEY elements of the PKEY array.  Note that since GnuPG 2.1
+ * we don't use secret keys anymore directly because they are managed
+ * by gpg-agent.  However for parsing OpenPGP key files we need a way
+ * to temporary store those secret keys.  We do this by putting them
+ * into the public key structure and extending the PKEY field to NSKEY
+ * elements; the extra secret key information are stored in the
+ * SECKEY_INFO field.
+ */
+typedef struct
+{
+  u32     timestamp;       /* key made */
+  u32     expiredate;     /* expires at this date or 0 if not at all */
+  u32     max_expiredate; /* must not expire past this date */
+  struct revoke_info revoked;
+  byte    hdrbytes;        /* number of header bytes */
+  byte    version;
+  byte    selfsigversion; /* highest version of all of the self-sigs */
+  byte    pubkey_algo;    /* algorithm used for public key scheme */
+  byte    pubkey_usage;   /* for now only used to pass it to getkey() */
+  byte    req_usage;      /* hack to pass a request to getkey() */
+  byte    req_algo;       /* Ditto */
+  u32     has_expired;    /* set to the expiration date if expired */
+  u32     main_keyid[2];  /* keyid of the primary key */
+  u32     keyid[2];        /* calculated by keyid_from_pk() */
+  prefitem_t *prefs;      /* list of preferences (may be NULL) */
+  struct
+  {
+    unsigned int mdc:1;           /* MDC feature set.  */
+    unsigned int disabled_valid:1;/* The next flag is valid.  */
+    unsigned int disabled:1;      /* The key has been disabled.  */
+    unsigned int primary:1;       /* This is a primary key.  */
+    unsigned int revoked:2;       /* Key has been revoked.
+                                     1 = revoked by the owner
+                                     2 = revoked by designated revoker.  */
+    unsigned int maybe_revoked:1; /* A designated revocation is
+                                     present, but without the key to
+                                     check it.  */
+    unsigned int valid:1;         /* Key (especially subkey) is valid.  */
+    unsigned int dont_cache:1;    /* Do not cache this key.  */
+    unsigned int backsig:2;       /* 0=none, 1=bad, 2=good.  */
+    unsigned int serialno_valid:1;/* SERIALNO below is valid.  */
+  } flags;
+  PKT_user_id *user_id;   /* If != NULL: found by that uid. */
+  struct revocation_key *revkey;
+  int     numrevkeys;
+  u32     trust_timestamp;
+  byte    trust_depth;
+  byte    trust_value;
+  const byte *trust_regexp;
+  char    *serialno;      /* Malloced hex string or NULL if it is
+                             likely not on a card.  See also
+                             flags.serialno_valid.  */
+  struct seckey_info *seckey_info;  /* If not NULL this malloced
+                                       structure describes a secret
+                                       key.  */
+  gcry_mpi_t  pkey[PUBKEY_MAX_NSKEY]; /* Right, NSKEY elements.  */
+} PKT_public_key;
+
+/* Evaluates as true if the pk is disabled, and false if it isn't.  If
+   there is no disable value cached, fill one in. */
+#define pk_is_disabled(a)                                       \
+  (((a)->flags.disabled_valid)?                                 \
+   ((a)->flags.disabled):(cache_disabled_value((a))))

 
 
 typedef struct {
 
 
 typedef struct {


@@ -153,33 +298,47 @@ typedef struct {
 } PKT_comment;
 
 typedef struct {
 } PKT_comment;
 
 typedef struct {

-    int  len;            /* length of the name */
-    char name[1];
-} PKT_user_id;
-
-typedef struct {

     u32  len;            /* reserved */
     byte  new_ctb;
     byte  algorithm;
     u32  len;            /* reserved */
     byte  new_ctb;
     byte  algorithm;

-    IOBUF buf;           /* IOBUF reference */
+    iobuf_t buf;         /* IOBUF reference */

 } PKT_compressed;
 
 typedef struct {
 } PKT_compressed;
 
 typedef struct {

-    u32  len;            /* length of encrypted data */
-    byte  new_ctb;
-    IOBUF buf;           /* IOBUF reference */
+    u32  len;            /* Remaining length of encrypted data. */
+    int  extralen;        /* This is (blocksize+2).  Used by build_packet. */
+    byte new_ctb;        /* uses a new CTB */
+    byte is_partial;      /* partial length encoded */
+    byte mdc_method;     /* > 0: integrity protected encrypted data packet */
+    iobuf_t buf;         /* IOBUF reference */

 } PKT_encrypted;
 
 typedef struct {
 } PKT_encrypted;
 
 typedef struct {

+    byte hash[20];
+} PKT_mdc;
+
+typedef struct {
+    unsigned int trustval;
+    unsigned int sigcache;
+} PKT_ring_trust;
+
+typedef struct {

     u32  len;            /* length of encrypted data */
     u32  len;            /* length of encrypted data */

-    IOBUF buf;           /* IOBUF reference */
+    iobuf_t buf;         /* IOBUF reference */

     byte new_ctb;
     byte new_ctb;

+    byte is_partial;      /* partial length encoded */

     int mode;
     u32 timestamp;
     int  namelen;
     char name[1];
 } PKT_plaintext;
 
     int mode;
     u32 timestamp;
     int  namelen;
     char name[1];
 } PKT_plaintext;
 

+typedef struct {
+    int  control;
+    size_t datalen;
+    char data[1];
+} PKT_gpg_control;
+

 /* combine all packets into a union */
 struct packet_struct {
     pkttype_t pkttype;
 /* combine all packets into a union */
 struct packet_struct {
     pkttype_t pkttype;


@@ -190,12 +349,15 @@ struct packet_struct {
        PKT_onepass_sig *onepass_sig;   /* PKT_ONEPASS_SIG */
        PKT_signature   *signature;     /* PKT_SIGNATURE */
        PKT_public_key  *public_key;    /* PKT_PUBLIC_[SUB)KEY */
        PKT_onepass_sig *onepass_sig;   /* PKT_ONEPASS_SIG */
        PKT_signature   *signature;     /* PKT_SIGNATURE */
        PKT_public_key  *public_key;    /* PKT_PUBLIC_[SUB)KEY */

-       PKT_secret_key  *secret_key;    /* PKT_SECRET_[SUB]KEY */
+       PKT_public_key  *secret_key;    /* PKT_SECRET_[SUB]KEY */

        PKT_comment     *comment;       /* PKT_COMMENT */
        PKT_user_id     *user_id;       /* PKT_USER_ID */
        PKT_compressed  *compressed;    /* PKT_COMPRESSED */
        PKT_comment     *comment;       /* PKT_COMMENT */
        PKT_user_id     *user_id;       /* PKT_USER_ID */
        PKT_compressed  *compressed;    /* PKT_COMPRESSED */

-       PKT_encrypted   *encrypted;     /* PKT_ENCRYPTED */
+       PKT_encrypted   *encrypted;     /* PKT_ENCRYPTED[_MDC] */
+       PKT_mdc         *mdc;           /* PKT_MDC */
+       PKT_ring_trust  *ring_trust;    /* PKT_RING_TRUST */

        PKT_plaintext   *plaintext;     /* PKT_PLAINTEXT */
        PKT_plaintext   *plaintext;     /* PKT_PLAINTEXT */

+        PKT_gpg_control *gpg_control;   /* PKT_GPG_CONTROL */

     } pkt;
 };
 
     } pkt;
 };
 


@@ -203,75 +365,97 @@ struct packet_struct {
                            (a)->pkt.generic = NULL;    \
                       } while(0)
 
                            (a)->pkt.generic = NULL;    \
                       } while(0)
 

-typedef enum {
-    SIGSUBPKT_TEST_CRITICAL=-3,
-    SIGSUBPKT_LIST_UNHASHED=-2,
-    SIGSUBPKT_LIST_HASHED  =-1,
-    SIGSUBPKT_NONE        = 0,
-    SIGSUBPKT_SIG_CREATED  = 2, /* signature creation time */
-    SIGSUBPKT_SIG_EXPIRE   = 3, /* signature expiration time */
-    SIGSUBPKT_EXPORTABLE   = 4, /* exportable */
-    SIGSUBPKT_TRUST       = 5, /* trust signature */
-    SIGSUBPKT_REGEXP      = 6, /* regular expression */
-    SIGSUBPKT_REVOCABLE    = 7, /* revocable */
-    SIGSUBPKT_KEY_EXPIRE   = 9, /* key expiration time */
-    SIGSUBPKT_ARR         =10, /* additional recipient request */
-    SIGSUBPKT_PREF_SYM    =11, /* preferred symmetric algorithms */
-    SIGSUBPKT_REV_KEY     =12, /* revocation key */
-    SIGSUBPKT_ISSUER      =16, /* issuer key ID */
-    SIGSUBPKT_NOTATION    =20, /* notation data */
-    SIGSUBPKT_PREF_HASH    =21, /* preferred hash algorithms */
-    SIGSUBPKT_PREF_COMPR   =22, /* preferred compression algorithms */
-    SIGSUBPKT_KS_FLAGS    =23, /* key server preferences */
-    SIGSUBPKT_PREF_KS     =24, /* preferred key server */
-    SIGSUBPKT_PRIMARY_UID  =25, /* primary user id */
-    SIGSUBPKT_POLICY      =26, /* policy URL */
-    SIGSUBPKT_KEY_FLAGS    =27, /* key flags */
-    SIGSUBPKT_SIGNERS_UID  =28, /* signer's user id */
-    SIGSUBPKT_PRIV_ADD_SIG =101 /* signatur is also valid for this uid */
-} sigsubpkttype_t;

 
 

+struct notation
+{
+  char *name;
+  char *value;
+  char *altvalue;
+  unsigned char *bdat;
+  size_t blen;
+  struct
+  {
+    unsigned int critical:1;
+    unsigned int ignore:1;
+  } flags;
+  struct notation *next;
+};

 
 /*-- mainproc.c --*/
 
 /*-- mainproc.c --*/

-int proc_packets( IOBUF a );
-int proc_signature_packets( IOBUF a, STRLIST signedfiles, const char *sigfile );
-int proc_encryption_packets( IOBUF a );
-int list_packets( IOBUF a );
+void reset_literals_seen(void);
+int proc_packets (ctrl_t ctrl, void *ctx, iobuf_t a );
+int proc_signature_packets (ctrl_t ctrl, void *ctx, iobuf_t a,
+                           strlist_t signedfiles, const char *sigfile );
+int proc_signature_packets_by_fd (ctrl_t ctrl,
+                                  void *anchor, IOBUF a, int signed_data_fd );
+int proc_encryption_packets (ctrl_t ctrl, void *ctx, iobuf_t a);
+int list_packets( iobuf_t a );

 
 /*-- parse-packet.c --*/
 int set_packet_list_mode( int mode );
 
 #if DEBUG_PARSE_PACKET
 
 /*-- parse-packet.c --*/
 int set_packet_list_mode( int mode );
 
 #if DEBUG_PARSE_PACKET

-int dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos, const char* file, int lineno  );
-int dbg_parse_packet( IOBUF inp, PACKET *ret_pkt, const char* file, int lineno );
-int dbg_copy_all_packets( IOBUF inp, IOBUF out, const char* file, int lineno  );
-int dbg_copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff, const char* file, int lineno  );
-int dbg_skip_some_packets( IOBUF inp, unsigned n, const char* file, int lineno );
-#define search_packet( a,b,c,d )   dbg_search_packet( (a), (b), (c), (d), __FILE__, __LINE__ )
-#define parse_packet( a, b )      dbg_parse_packet( (a), (b), __FILE__, __LINE__ )
-#define copy_all_packets( a,b )    dbg_copy_all_packets((a),(b), __FILE__, __LINE__ )
-#define copy_some_packets( a,b,c ) dbg_copy_some_packets((a),(b),(c), __FILE__, __LINE__ )
-#define skip_some_packets( a,b )   dbg_skip_some_packets((a),(b), __FILE__, __LINE__ )
+int dbg_search_packet( iobuf_t inp, PACKET *pkt, off_t *retpos, int with_uid,
+                       const char* file, int lineno  );
+int dbg_parse_packet( iobuf_t inp, PACKET *ret_pkt,
+                      const char* file, int lineno );
+int dbg_copy_all_packets( iobuf_t inp, iobuf_t out,
+                          const char* file, int lineno  );
+int dbg_copy_some_packets( iobuf_t inp, iobuf_t out, off_t stopoff,
+                           const char* file, int lineno  );
+int dbg_skip_some_packets( iobuf_t inp, unsigned n,
+                           const char* file, int lineno        );
+#define search_packet( a,b,c,d )   \
+             dbg_search_packet( (a), (b), (c), (d), __FILE__, __LINE__ )
+#define parse_packet( a, b )  \
+            dbg_parse_packet( (a), (b), __FILE__, __LINE__ )
+#define copy_all_packets( a,b )  \
+             dbg_copy_all_packets((a),(b), __FILE__, __LINE__ )
+#define copy_some_packets( a,b,c ) \
+             dbg_copy_some_packets((a),(b),(c), __FILE__, __LINE__ )
+#define skip_some_packets( a,b ) \
+             dbg_skip_some_packets((a),(b), __FILE__, __LINE__ )

 #else
 #else

-int search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos );
-int parse_packet( IOBUF inp, PACKET *ret_pkt);
-int copy_all_packets( IOBUF inp, IOBUF out );
-int copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff );
-int skip_some_packets( IOBUF inp, unsigned n );
+int search_packet( iobuf_t inp, PACKET *pkt, off_t *retpos, int with_uid );
+int parse_packet( iobuf_t inp, PACKET *ret_pkt);
+int copy_all_packets( iobuf_t inp, iobuf_t out );
+int copy_some_packets( iobuf_t inp, iobuf_t out, off_t stopoff );
+int skip_some_packets( iobuf_t inp, unsigned n );

 #endif
 
 #endif
 

-const byte *parse_sig_subpkt( const byte *buffer,
-                             sigsubpkttype_t reqtype, size_t *ret_n );
-const byte *parse_sig_subpkt2( PKT_signature *sig,
-                              sigsubpkttype_t reqtype, size_t *ret_n );
+int parse_signature( iobuf_t inp, int pkttype, unsigned long pktlen,
+                    PKT_signature *sig );
+const byte *enum_sig_subpkt ( const subpktarea_t *subpkts,
+                              sigsubpkttype_t reqtype,
+                              size_t *ret_n, int *start, int *critical );
+const byte *parse_sig_subpkt ( const subpktarea_t *buffer,
+                               sigsubpkttype_t reqtype,
+                               size_t *ret_n );
+const byte *parse_sig_subpkt2 ( PKT_signature *sig,
+                                sigsubpkttype_t reqtype,
+                                size_t *ret_n );
+int parse_one_sig_subpkt( const byte *buffer, size_t n, int type );
+void parse_revkeys(PKT_signature *sig);
+int parse_attribute_subpkts(PKT_user_id *uid);
+void make_attribute_uidname(PKT_user_id *uid, size_t max_namelen);
+PACKET *create_gpg_control ( ctrlpkttype_t type,
+                             const byte *data,
+                             size_t datalen );

 
 /*-- build-packet.c --*/
 
 /*-- build-packet.c --*/

-int build_packet( IOBUF inp, PACKET *pkt );
+int build_packet( iobuf_t inp, PACKET *pkt );
+gpg_error_t gpg_mpi_write (iobuf_t out, gcry_mpi_t a);

 u32 calc_packet_length( PACKET *pkt );
 u32 calc_packet_length( PACKET *pkt );

-void hash_public_key( MD_HANDLE md, PKT_public_key *pk );

 void build_sig_subpkt( PKT_signature *sig, sigsubpkttype_t type,
                        const byte *buffer, size_t buflen );
 void build_sig_subpkt_from_sig( PKT_signature *sig );
 void build_sig_subpkt( PKT_signature *sig, sigsubpkttype_t type,
                        const byte *buffer, size_t buflen );
 void build_sig_subpkt_from_sig( PKT_signature *sig );

+int  delete_sig_subpkt(subpktarea_t *buffer, sigsubpkttype_t type );
+void build_attribute_subpkt(PKT_user_id *uid,byte type,
+                           const void *buf,u32 buflen,
+                           const void *header,u32 headerlen);
+struct notation *string_to_notation(const char *string,int is_utf8);
+struct notation *sig_to_notation(PKT_signature *sig);
+void free_notation(struct notation *notation);

 
 /*-- free-packet.c --*/
 void free_symkey_enc( PKT_symkey_enc *enc );
 
 /*-- free-packet.c --*/
 void free_symkey_enc( PKT_symkey_enc *enc );


@@ -280,61 +464,60 @@ void free_seckey_enc( PKT_signature *enc );
 int  digest_algo_from_sig( PKT_signature *sig );
 void release_public_key_parts( PKT_public_key *pk );
 void free_public_key( PKT_public_key *key );
 int  digest_algo_from_sig( PKT_signature *sig );
 void release_public_key_parts( PKT_public_key *pk );
 void free_public_key( PKT_public_key *key );

-void release_secret_key_parts( PKT_secret_key *sk );
-void free_secret_key( PKT_secret_key *sk );
+void free_attributes(PKT_user_id *uid);

 void free_user_id( PKT_user_id *uid );
 void free_comment( PKT_comment *rem );
 void free_packet( PACKET *pkt );
 void free_user_id( PKT_user_id *uid );
 void free_comment( PKT_comment *rem );
 void free_packet( PACKET *pkt );

+prefitem_t *copy_prefs (const prefitem_t *prefs);

 PKT_public_key *copy_public_key( PKT_public_key *d, PKT_public_key *s );
 PKT_public_key *copy_public_key( PKT_public_key *d, PKT_public_key *s );

-PKT_public_key *copy_public_key_new_namehash( PKT_public_key *d,
-                                             PKT_public_key *s,
-                                             const byte *namehash );
-PKT_secret_key *copy_secret_key( PKT_secret_key *d, PKT_secret_key *s );

 PKT_signature *copy_signature( PKT_signature *d, PKT_signature *s );
 PKT_signature *copy_signature( PKT_signature *d, PKT_signature *s );

-PKT_user_id *copy_user_id( PKT_user_id *d, PKT_user_id *s );
+PKT_user_id *scopy_user_id (PKT_user_id *sd );

 int cmp_public_keys( PKT_public_key *a, PKT_public_key *b );
 int cmp_public_keys( PKT_public_key *a, PKT_public_key *b );

-int cmp_secret_keys( PKT_secret_key *a, PKT_secret_key *b );

 int cmp_signatures( PKT_signature *a, PKT_signature *b );
 int cmp_signatures( PKT_signature *a, PKT_signature *b );

-int cmp_public_secret_key( PKT_public_key *pk, PKT_secret_key *sk );

 int cmp_user_ids( PKT_user_id *a, PKT_user_id *b );
 
 
 /*-- sig-check.c --*/
 int cmp_user_ids( PKT_user_id *a, PKT_user_id *b );
 
 
 /*-- sig-check.c --*/

-int signature_check( PKT_signature *sig, MD_HANDLE digest );
+int signature_check( PKT_signature *sig, gcry_md_hd_t digest );
+int signature_check2( PKT_signature *sig, gcry_md_hd_t digest, u32 *r_expiredate,
+                     int *r_expired, int *r_revoked, PKT_public_key *ret_pk );

 
 

-/*-- seckey-cert.c --*/
-int is_secret_key_protected( PKT_secret_key *sk );
-int check_secret_key( PKT_secret_key *sk, int retries );
-int protect_secret_key( PKT_secret_key *sk, DEK *dek );

 
 /*-- pubkey-enc.c --*/
 
 /*-- pubkey-enc.c --*/

-int get_session_key( PKT_pubkey_enc *k, DEK *dek );
+gpg_error_t get_session_key (PKT_pubkey_enc *k, DEK *dek);
+gpg_error_t get_override_session_key (DEK *dek, const char *string);

 
 /*-- compress.c --*/
 
 /*-- compress.c --*/

-int handle_compressed( PKT_compressed *cd,
-                      int (*callback)(IOBUF, void *), void *passthru );
+int handle_compressed (ctrl_t ctrl, void *ctx, PKT_compressed *cd,
+                      int (*callback)(iobuf_t, void *), void *passthru );

 
 /*-- encr-data.c --*/
 
 /*-- encr-data.c --*/

-int decrypt_data( PKT_encrypted *ed, DEK *dek );
-int encrypt_data( PKT_encrypted *ed, DEK *dek );
+int decrypt_data (ctrl_t ctrl, void *ctx, PKT_encrypted *ed, DEK *dek );

 
 /*-- plaintext.c --*/
 int handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
                                        int nooutput, int clearsig );
 
 /*-- plaintext.c --*/
 int handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
                                        int nooutput, int clearsig );

-int ask_for_detached_datafile( md_filter_context_t *mfx, const char *inname );
-
-/*-- comment.c --*/
-int write_comment( IOBUF out, const char *s );
+int ask_for_detached_datafile( gcry_md_hd_t md, gcry_md_hd_t md2,
+                              const char *inname, int textmode );

 
 /*-- sign.c --*/
 int make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
                        PKT_user_id *uid, PKT_public_key *subpk,
 
 /*-- sign.c --*/
 int make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
                        PKT_user_id *uid, PKT_public_key *subpk,

-                       PKT_secret_key *sk,
-                       int sigclass, int digest_algo,
+                       PKT_public_key *pksk, int sigclass, int digest_algo,
+                       int sigversion, u32 timestamp, u32 duration,

                        int (*mksubpkt)(PKT_signature *, void *),
                        int (*mksubpkt)(PKT_signature *, void *),

-                       void *opaque  );
+                       void *opaque,
+                        const char *cache_nonce);
+int update_keysig_packet( PKT_signature **ret_sig,
+                      PKT_signature *orig_sig,
+                      PKT_public_key *pk,
+                      PKT_user_id *uid,
+                      PKT_public_key *subpk,
+                      PKT_public_key *pksk,
+                      int (*mksubpkt)(PKT_signature *, void *),
+                      void *opaque   );

 
 /*-- keygen.c --*/
 
 /*-- keygen.c --*/

-PKT_user_id *generate_user_id(void);
+PKT_user_id *generate_user_id (KBNODE keyblock);

 
 #endif /*G10_PACKET_H*/
 
 #endif /*G10_PACKET_H*/