bump

2025-12-17 03:50:57 +01:00 · 2016-10-20 23:12:00 +02:00
parent 94ea152460
commit f664cc24c4
9 changed files with 1100 additions and 1153 deletions
--- a/bindings/py/pypcp/raw.py
+++ b/bindings/py/pypcp/raw.py
@@ -1,79 +1,79 @@
 PCP_RAW_CODE = '''

 typedef enum {
-    JSON_OBJECT,
-    JSON_ARRAY,
-    JSON_STRING,
-    JSON_INTEGER,
-    JSON_REAL,
-    JSON_TRUE,
-    JSON_FALSE,
-    JSON_NULL
+JSON_OBJECT,
+JSON_ARRAY,
+JSON_STRING,
+JSON_INTEGER,
+JSON_REAL,
+JSON_TRUE,
+JSON_FALSE,
+JSON_NULL
 } json_type;

 typedef struct json_t {
-    json_type type;
-    size_t refcount;
+json_type type;
+size_t refcount;
 } json_t;

-/*** ./gencffi.pl: from ../../include/pcp/defines.h:183 */
+/*** ./gencffi.pl: from ../../include/pcp/defines.h:185 */
 typedef unsigned char   byte;

-/*** ./gencffi.pl: from ../../include/pcp/defines.h:183 */
+/*** ./gencffi.pl: from ../../include/pcp/defines.h:185 */
 typedef unsigned short  dbyte;

-/*** ./gencffi.pl: from ../../include/pcp/defines.h:183 */
+/*** ./gencffi.pl: from ../../include/pcp/defines.h:185 */
 typedef unsigned int    qbyte;

 /*** ./gencffi.pl: from ../../include/pcp/plist.h:83 */
 typedef struct _plist_t plist_t;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_key_t pcp_key_t;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_pubkey_t pcp_pubkey_t;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pbp_pubkey_t pbp_pubkey_t;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_rec_t pcp_rec_t;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_keysig_t pcp_keysig_t;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_ctx_t PCPCTX;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _vault_t vault_t;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _vault_header_t vault_header_t;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _vault_item_header_t vault_item_header_t;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_buffer Buffer;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_stream_t Pcpstream;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_rfc_pubkey_header_t rfc_pub_h;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_rfc_pubkey_0x21_t  rfc_pub_k;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_rfc_pubkey_sigheader_0x21_t rfc_pub_sig_h;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_rfc_pubkey_sigsub_0x21_t rfc_pub_sig_s;

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 typedef struct _pcp_ks_bundle_t pcp_ks_bundle_t;
 /*** ./gencffi.pl: from ../../include/pcp/plist.h:83 */
 struct _plist_t {
@@ -82,7 +82,7 @@ struct _plist_t {
  struct _plist_t *first;
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_key_t {
  byte masterpub[LEDPUB];    /**< ED25519 master public key signing key */
  byte mastersecret[LEDSEC]; /**< ED25519 master secret key signing key */
@@ -102,7 +102,7 @@ struct _pcp_key_t {
  byte hh[56];
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_pubkey_t {
  byte masterpub[LEDPUB];    /**< ED25519 master public key signing key */
  byte pub[LBOXPUB];         /**< Curve25519 encryption public key */
@@ -119,7 +119,7 @@ struct _pcp_pubkey_t {
  byte hh[56];
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pbp_pubkey_t {
  byte masterpub[32];
  byte edpub[32];
@@ -129,7 +129,7 @@ struct _pbp_pubkey_t {
  char name[1024];
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_rec_t {
  size_t ciphersize; /**< the size of the encrypted recipient list */
  byte *cipher;      /**< contains the whole encrypted recipient list */
@@ -137,7 +137,7 @@ struct _pcp_rec_t {
  pcp_pubkey_t *pub; /**< if verification were ok, contains the public key of the signer */
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_keysig_t {
  uint8_t type;
  uint32_t size;
@@ -147,7 +147,7 @@ struct _pcp_keysig_t {
  byte hh[56];
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_ctx_t {
  char *pcp_err;    /**< last error message. retrieve with fatals_ifany() */
  byte pcp_errset;  /**< indicates if an error occurred. */
@@ -159,7 +159,7 @@ struct _pcp_ctx_t {
  pcp_keysig_t *pcpkeysig_hash; /**< hash for key sigs */
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _vault_t {
  char *filename;    /**< The filename of the vault (full path) */
  FILE *fd;          /**< Filehandle if opened */
@@ -172,14 +172,14 @@ struct _vault_t {
  byte checksum[LSHA]; /**< SHA256 checksum over the whole vault */
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _vault_header_t {
  uint8_t fileid;    /**< File id, proprietary. Marks the vault as a vault */
  uint32_t version;  /**< File version */
  byte checksum[LSHA]; /**< SHA256 checksum over the whole vault */
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _vault_item_header_t {
  uint8_t type;       /**< Item type (secret key, public, key, keysig, \see _PCP_KEY_TYPES */
  uint32_t size;      /**< Size of the item */
@@ -187,7 +187,7 @@ struct _vault_item_header_t {
  byte checksum[LSHA];  /**< SHA256 checksum of the item */
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_buffer {
  char *name;        /**< just for convenience in error messages and the like, so we know which buffer cause trouble */
  uint8_t allocated; /**< marks the buffer as allocated */
@@ -199,13 +199,14 @@ struct _pcp_buffer {
  void *buf;         /**< the actual storage buffer */
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_stream_t {
  FILE *fd;          /**< The backend FILE stream */
  Buffer *b;         /**< The backend Buffer object */
  Buffer *cache;     /**< The caching Buffer object (for look ahead read) */
  Buffer *next;      /**< The caching Next-Buffer object (for look ahead read) */
  Buffer *save;      /**< Temporary buffer to backup overflow data */
+  byte    *xb;       /**< Temporary byte buffer for reading/writing data */
  uint8_t is_buffer; /**< Set to 1 if the backend is a Buffer */
  uint8_t eof;       /**< Set to 1 if EOF reached */
  uint8_t err;       /**< Set to 1 if an error occured */
@@ -219,21 +220,21 @@ struct _pcp_stream_t {
  size_t pos;        /**< remember i/o position */
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_rfc_pubkey_header_t {
  uint8_t version;
  uint64_t ctime;
  uint8_t cipher;
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_rfc_pubkey_0x21_t {
  byte sig_ed25519_pub[32];
  byte ed25519_pub[32];
  byte curve25519_pub[32];
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_rfc_pubkey_sigheader_0x21_t {
  uint8_t version;
  uint8_t type;
@@ -242,13 +243,13 @@ struct _pcp_rfc_pubkey_sigheader_0x21_t {
  uint16_t numsubs;
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_rfc_pubkey_sigsub_0x21_t {
  uint32_t size;
  uint8_t type;
 };

-/*** ./gencffi.pl: from ../../include/pcp/structs.h:379 */
+/*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
 struct _pcp_ks_bundle_t {
  pcp_pubkey_t *p;
  pcp_keysig_t *s;
@@ -463,82 +464,88 @@ char *pcp_get_passphrase(char *prompt);
 /*** ./gencffi.pl: from ../../include/pcp/jenhash.h:25 */
 unsigned jen_hash ( unsigned char *k, unsigned length, unsigned initval );

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 pcp_key_t *pcpkey_new ();

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 void pcp_keypairs(byte *msk, byte *mpk, byte *csk, byte *cpk, byte *esk, byte *epk);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 char *pcppubkey_get_art(pcp_pubkey_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 char *pcpkey_get_art(pcp_key_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 pcp_key_t *pcpkey_encrypt(PCPCTX *ptx, pcp_key_t *key, char *passphrase);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 pcp_key_t *pcpkey_decrypt(PCPCTX *ptx, pcp_key_t *key, char *passphrase);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 pcp_pubkey_t *pcpkey_pub_from_secret(pcp_key_t *key);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 char *pcp_getkeyid(pcp_key_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 char *pcp_getpubkeyid(pcp_pubkey_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 byte *pcppubkey_getchecksum(pcp_pubkey_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 byte *pcpkey_getchecksum(pcp_key_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 pcp_key_t * key2be(pcp_key_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 pcp_key_t *key2native(pcp_key_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 pcp_pubkey_t * pubkey2be(pcp_pubkey_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 pcp_pubkey_t *pubkey2native(pcp_pubkey_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 byte * pcp_gennonce();

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 byte *pcp_derivekey(PCPCTX *ptx, char *passphrase, byte *nonce);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 void pcp_seckeyblob(Buffer *b, pcp_key_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 void pcp_pubkeyblob(Buffer *b, pcp_pubkey_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 Buffer *pcp_keyblob(void *k, int type);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
+pcp_key_t *pcp_blob2key(Buffer *b);
+
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
+pcp_pubkey_t *pcp_blob2pubkey(Buffer *b);
+
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 int pcp_sanitycheck_pub(PCPCTX *ptx, pcp_pubkey_t *key);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 int pcp_sanitycheck_key(PCPCTX *ptx, pcp_key_t *key);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 void pcp_dumpkey(pcp_key_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 void pcp_dumppubkey(pcp_pubkey_t *k);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 void pcpkey_setowner(pcp_key_t *key, char *owner, char *mail);

-/*** ./gencffi.pl: from ../../include/pcp/key.h:320 */
+/*** ./gencffi.pl: from ../../include/pcp/key.h:324 */
 double pcp_getentropy(char *source);

 /*** ./gencffi.pl: from ../../include/pcp/keyhash.h:153 */
@@ -604,61 +611,61 @@ void ucfree(void *d, size_t len);
 /*** ./gencffi.pl: from ../../include/pcp/mem.h:58 */
 void sfree(void *d);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 Buffer *pcp_export_rfc_pub (PCPCTX *ptx, pcp_key_t *sk);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 Buffer *pcp_export_pbp_pub(pcp_key_t *sk);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 Buffer *pcp_export_secret(PCPCTX *ptx, pcp_key_t *sk, char *passphrase);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 Buffer *pcp_export_json_pub(PCPCTX *ptx, pcp_key_t *sk, byte *sig, size_t siglen);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 Buffer *pcp_export_json_secret(PCPCTX *ptx, pcp_key_t *sk, byte *nonce, byte *cipher, size_t clen);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 json_t *pcp_sk2json(pcp_key_t *sk, byte *sig,size_t siglen);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 json_t *pcp_pk2json(pcp_pubkey_t *pk);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 pcp_ks_bundle_t *pcp_import_pub_json(PCPCTX *ptx, byte *raw, size_t rawsize);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 Buffer *pcp_import_secret_json(PCPCTX *ptx, Buffer *json);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 pcp_ks_bundle_t *pcp_import_pub(PCPCTX *ptx, byte *raw, size_t rawsize);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 pcp_ks_bundle_t *pcp_import_binpub(PCPCTX *ptx, byte *raw, size_t rawsize);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 pcp_ks_bundle_t *pcp_import_pub_rfc(PCPCTX *ptx, Buffer *blob);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 pcp_ks_bundle_t *pcp_import_pub_pbp(PCPCTX *ptx, Buffer *blob);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 pcp_key_t *pcp_import_binsecret(PCPCTX *ptx, byte *raw, size_t rawsize, char *passphrase);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 pcp_key_t *pcp_import_secret(PCPCTX *ptx, byte *raw, size_t rawsize, char *passphrase);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 pcp_key_t *pcp_import_secret_native(PCPCTX *ptx, Buffer *cipher, char *passphrase);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 int _check_keysig_h(PCPCTX *ptx, Buffer *blob, rfc_pub_sig_h *h);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 int _check_hash_keysig(PCPCTX *ptx, Buffer *blob, pcp_pubkey_t *p, pcp_keysig_t *sk);

-/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:188 */
+/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:193 */
 int _check_sigsubs(PCPCTX *ptx, Buffer *blob, pcp_pubkey_t *p, rfc_pub_sig_s *subheader);

 /*** ./gencffi.pl: from ../../include/pcp/pcpstream.h:291 */
@@ -745,27 +752,45 @@ int pcp_readpass_fromprog(PCPCTX *ptx, char **passwd, const char *askpass);
 /*** ./gencffi.pl: from ../../include/pcp/scrypt.h:42 */
 byte * pcp_scrypt(PCPCTX *ptx, char *passwd, size_t passwdlen, byte *nonce, size_t noncelen);

-/*** ./gencffi.pl: from ../../include/pcp/util.h:128 */
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
 char *_lc(char *in);

-/*** ./gencffi.pl: from ../../include/pcp/util.h:128 */
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
 long int _findoffset(byte *bin, size_t binlen, char *sigstart, size_t hlen);

-/*** ./gencffi.pl: from ../../include/pcp/util.h:128 */
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
 void _xorbuf(byte *iv, byte *buf, size_t xlen);

-/*** ./gencffi.pl: from ../../include/pcp/util.h:128 */
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
 void _dump(char *n, byte *d, size_t s);

-/*** ./gencffi.pl: from ../../include/pcp/util.h:128 */
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
 char *_bin2hex(byte *bin, size_t len);

-/*** ./gencffi.pl: from ../../include/pcp/util.h:128 */
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
 size_t _hex2bin(const char *hex_str, unsigned char *byte_array, size_t byte_array_max);

-/*** ./gencffi.pl: from ../../include/pcp/util.h:128 */
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
 int cst_time_memcmp(const void *m1, const void *m2, size_t n);

+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
+uint64_t _wireto64(byte *data);
+
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
+uint32_t _wireto32(byte *data);
+
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
+uint16_t _wireto16(byte *data);
+
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
+void _64towire(uint64_t i, byte *data);
+
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
+void _32towire(uint32_t i, byte *data);
+
+/*** ./gencffi.pl: from ../../include/pcp/util.h:141 */
+void _16towire(uint16_t i, byte *data);
+
 /*** ./gencffi.pl: from ../../include/pcp/vault.h:230 */
 vault_t *pcpvault_init(PCPCTX *ptx, char *filename);

@@ -871,145 +896,145 @@ uint8_t *zmq_z85_decode (uint8_t *dest, char *string);
 /*** ./gencffi.pl: from ../../include/pcp/zmq_z85.h:31 */
 char *zmq_z85_encode (char *dest, uint8_t *data, size_t size);'''

-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_ASYM_CIPHER = 5
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_BLOCK_SIZE = 32 * 1024
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_PK_HEADER = "----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_SK_FOOTER = "----- END ED25519-CURVE29915 PRIVATE KEY -----"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_ENFILE_HEADER = "----- BEGIN PCP ENCRYPTED FILE -----\r\n"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_FORMAT_NATIVE = 1
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PBP_COMPAT_SALT = "qa~t](84z<1t<1oz:ik.@IRNyhG=8q(on9}4#!/_h#a7wqK{Nt$T?W>,mt8NqYq&6U<GB1$,<$j>,rSYI2GRDd:Bcm"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_HASH_CIPHER = 0x22
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_HASH_NAME = "BLAKE2"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_SIG_SUB_NOTATION = 20
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_SIG_CIPHER_NAME = "ED25519"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_SIG_CIPHER = 0x23
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_ZFILE_HEADER = "----- BEGIN Z85 ENCODED FILE -----"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_SIG_END = "----- END ED25519 SIGNATURE -----"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_PK_CIPHER = 0x21
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_RFC_CIPHER = 0x21 
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_ASYM_CIPHER_ANON = 6
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_ENFILE_FOOTER = "\r\n----- END PCP ENCRYPTED FILE -----\r\n"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_SYM_CIPHER = 23
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
 EXP_SIG_TYPE = 0x1F 


-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_SIG_SUB_KEYFLAGS = 27
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_SK_HEADER = "----- BEGIN ED25519-CURVE29915 PRIVATE KEY -----"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_SIGPREFIX = "\nnacl-"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_ME = "Pretty Curved Privacy"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_ZFILE_FOOTER = "----- END Z85 ENCODED FILE -----"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_SIG_SUB_SIGEXPIRE = 3
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_SIG_SUB_CTIME = 2
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_PK_FOOTER = "----- END ED25519-CURVE29915 PUBLIC KEY -----"
-
-
-# ./gencffi.pl: from ../../include/pcp/defines.h:183
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
 PCP_VAULT_ID = 14


-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_ASYM_CIPHER_ANON_SIG = 7
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_SIG_SUB_KEYFLAGS = 27


-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_SIG_HEADER = "----- BEGIN ED25519 SIGNED MESSAGE -----"
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_ASYM_CIPHER_ANON = 6


-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-PCP_ASYM_CIPHER_SIG = 24
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_SIGPREFIX = "\nnacl-"


-# ./gencffi.pl: from ../../include/pcp/defines.h:183
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
 EXP_PK_CIPHER_NAME = "CURVE25519-ED25519-POLY1305-SALSA20"


-# ./gencffi.pl: from ../../include/pcp/defines.h:183
-EXP_FORMAT_PBP = 2
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_ZFILE_HEADER = "----- BEGIN Z85 ENCODED FILE -----"


-# ./gencffi.pl: from ../../include/pcp/defines.h:183
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_SIG_SUB_CTIME = 2
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_ENFILE_FOOTER = "\r\n----- END PCP ENCRYPTED FILE -----\r\n"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_PK_FOOTER = "----- END ED25519-CURVE29915 PUBLIC KEY -----"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_PK_CIPHER = 0x21
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_SYM_CIPHER = 23
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_RFC_CIPHER = 0x21 
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_BLOCK_SIZE = 32 * 1024
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
 EXP_SIG_SUB_KEYEXPIRE = 9


-# ./gencffi.pl: from ../../include/pcp/defines.h:183
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_HASH_NAME = "BLAKE2"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_PK_HEADER = "----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_ZFILE_FOOTER = "----- END Z85 ENCODED FILE -----"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_SIG_END = "----- END ED25519 SIGNATURE -----"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PBP_COMPAT_SALT = "qa~t](84z<1t<1oz:ik.@IRNyhG=8q(on9}4#!/_h#a7wqK{Nt$T?W>,mt8NqYq&6U<GB1$,<$j>,rSYI2GRDd:Bcm"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_SK_HEADER = "----- BEGIN ED25519-CURVE29915 PRIVATE KEY -----"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_SIG_HEADER = "----- BEGIN ED25519 SIGNED MESSAGE -----"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_ENFILE_HEADER = "----- BEGIN PCP ENCRYPTED FILE -----\r\n"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_ASYM_CIPHER = 5
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
 PCP_SIG_START = "----- BEGIN ED25519 SIGNATURE -----"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_HASH_CIPHER = 0x22
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_ME = "Pretty Curved Privacy"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_FORMAT_PBP = 2
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_SK_FOOTER = "----- END ED25519-CURVE29915 PRIVATE KEY -----"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_SIG_CIPHER = 0x23
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_ASYM_CIPHER_ANON_SIG = 7
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_SIG_CIPHER_NAME = "ED25519"
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_FORMAT_NATIVE = 1
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+PCP_ASYM_CIPHER_SIG = 24
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_SIG_SUB_NOTATION = 20
+
+
+# ./gencffi.pl: from ../../include/pcp/defines.h:185
+EXP_SIG_SUB_SIGEXPIRE = 3