scip/pcp
1
0
Fork 0
mirror of https://codeberg.org/scip/pcp.git synced 2025-12-17 03:50:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated

Browse Source
This commit is contained in:
TLINDEN
2015-07-08 23:52:08 +02:00
parent 5301734f23
commit cc47e63731
6 changed files with 130 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,6 +1,13 @@
NEXT NEXT
Changed publuc key signature storage, previously
I didn't add the actual signature, therefore a
public key could have been verified only during
import but never thereafter. This affects exported
public keys (32 byte larger) and vault storage,
but is backwards compatible.
Added JSON output support using libjansson (-j), Added JSON output support using libjansson (-j),
supported by -t, -p and -s. supported by -t, -p, -s and -K.
Abandoned YAML, perl and C key export support, Abandoned YAML, perl and C key export support,
better doing one external format but doing it better doing one external format but doing it

2
TODO
View File

@@ -1,5 +1,5 @@
JSON: JSON:
- import pub und secret as json - import secret as json
detach keysig generation from pub key export, so that an existing detach keysig generation from pub key export, so that an existing
keysig can be verified later. keysig can be verified later.

232
bindings/py/pypcp/raw.py
View File

@@ -12,52 +12,52 @@ typedef unsigned int qbyte;
/*** ./gencffi.pl: from ../../include/pcp/plist.h:83 */ /*** ./gencffi.pl: from ../../include/pcp/plist.h:83 */
typedef struct _plist_t plist_t; typedef struct _plist_t plist_t;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_key_t pcp_key_t; typedef struct _pcp_key_t pcp_key_t;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_pubkey_t pcp_pubkey_t; typedef struct _pcp_pubkey_t pcp_pubkey_t;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pbp_pubkey_t pbp_pubkey_t; typedef struct _pbp_pubkey_t pbp_pubkey_t;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_rec_t pcp_rec_t; typedef struct _pcp_rec_t pcp_rec_t;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_keysig_t pcp_keysig_t; typedef struct _pcp_keysig_t pcp_keysig_t;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_ctx_t PCPCTX; typedef struct _pcp_ctx_t PCPCTX;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _vault_t vault_t; typedef struct _vault_t vault_t;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _vault_header_t vault_header_t; typedef struct _vault_header_t vault_header_t;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _vault_item_header_t vault_item_header_t; typedef struct _vault_item_header_t vault_item_header_t;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_buffer Buffer; typedef struct _pcp_buffer Buffer;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_stream_t Pcpstream; typedef struct _pcp_stream_t Pcpstream;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_rfc_pubkey_header_t rfc_pub_h; typedef struct _pcp_rfc_pubkey_header_t rfc_pub_h;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_rfc_pubkey_0x21_t rfc_pub_k; typedef struct _pcp_rfc_pubkey_0x21_t rfc_pub_k;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_rfc_pubkey_sigheader_0x21_t rfc_pub_sig_h; typedef struct _pcp_rfc_pubkey_sigheader_0x21_t rfc_pub_sig_h;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_rfc_pubkey_sigsub_0x21_t rfc_pub_sig_s; typedef struct _pcp_rfc_pubkey_sigsub_0x21_t rfc_pub_sig_s;
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
typedef struct _pcp_ks_bundle_t pcp_ks_bundle_t; typedef struct _pcp_ks_bundle_t pcp_ks_bundle_t;
/*** ./gencffi.pl: from ../../include/pcp/plist.h:83 */ /*** ./gencffi.pl: from ../../include/pcp/plist.h:83 */
struct _plist_t { struct _plist_t {
@@ -66,7 +66,7 @@ struct _plist_t {
struct _plist_t *first; struct _plist_t *first;
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_key_t { struct _pcp_key_t {
byte masterpub[32]; /**< ED25519 master public key signing key */ byte masterpub[32]; /**< ED25519 master public key signing key */
byte mastersecret[64]; /**< ED25519 master secret key signing key */ byte mastersecret[64]; /**< ED25519 master secret key signing key */
@@ -86,7 +86,7 @@ struct _pcp_key_t {
byte hh[56]; byte hh[56];
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_pubkey_t { struct _pcp_pubkey_t {
byte masterpub[32]; /**< ED25519 master public key signing key */ byte masterpub[32]; /**< ED25519 master public key signing key */
byte sigpub[32]; /**< ED25519 public signing key */ byte sigpub[32]; /**< ED25519 public signing key */
@@ -104,7 +104,7 @@ struct _pcp_pubkey_t {
byte hh[56]; byte hh[56];
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pbp_pubkey_t { struct _pbp_pubkey_t {
byte sigpub[32]; byte sigpub[32];
byte edpub[32]; byte edpub[32];
@@ -114,7 +114,7 @@ struct _pbp_pubkey_t {
char name[1024]; char name[1024];
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_rec_t { struct _pcp_rec_t {
size_t ciphersize; /**< the size of the encrypted recipient list */ size_t ciphersize; /**< the size of the encrypted recipient list */
byte *cipher; /**< contains the whole encrypted recipient list */ byte *cipher; /**< contains the whole encrypted recipient list */
@@ -122,7 +122,7 @@ struct _pcp_rec_t {
pcp_pubkey_t *pub; /**< if verification were ok, contains the public key of the signer */ pcp_pubkey_t *pub; /**< if verification were ok, contains the public key of the signer */
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_keysig_t { struct _pcp_keysig_t {
uint8_t type; uint8_t type;
uint32_t size; uint32_t size;
@@ -132,21 +132,19 @@ struct _pcp_keysig_t {
byte hh[56]; byte hh[56];
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_ctx_t { struct _pcp_ctx_t {
char *pcp_err; /**< last error message. retrieve with fatals_ifany() */ char *pcp_err; /**< last error message. retrieve with fatals_ifany() */
byte pcp_errset; /**< indicates if an error occurred. */ byte pcp_errset; /**< indicates if an error occurred. */
int pcp_exit; /**< exit code for pcp commandline utility */ int pcp_exit; /**< exit code for pcp commandline utility */
int verbose; /**< enable verbose output */ int verbose; /**< enable verbose output */
#ifdef HAVE_JSON
int json; /**< enable json i/o */ int json; /**< enable json i/o */
#endif
pcp_key_t *pcpkey_hash; /**< hash containing for keys */ pcp_key_t *pcpkey_hash; /**< hash containing for keys */
pcp_pubkey_t *pcppubkey_hash; /**< hash for keys. */ pcp_pubkey_t *pcppubkey_hash; /**< hash for keys. */
pcp_keysig_t *pcpkeysig_hash; /**< hash for key sigs */ pcp_keysig_t *pcpkeysig_hash; /**< hash for key sigs */
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _vault_t { struct _vault_t {
char *filename; /**< The filename of the vault (full path) */ char *filename; /**< The filename of the vault (full path) */
FILE *fd; /**< Filehandle if opened */ FILE *fd; /**< Filehandle if opened */
@@ -159,14 +157,14 @@ struct _vault_t {
byte checksum[32]; /**< SHA256 checksum over the whole vault */ byte checksum[32]; /**< SHA256 checksum over the whole vault */
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _vault_header_t { struct _vault_header_t {
uint8_t fileid; /**< File id, proprietary. Marks the vault as a vault */ uint8_t fileid; /**< File id, proprietary. Marks the vault as a vault */
uint32_t version; /**< File version */ uint32_t version; /**< File version */
byte checksum[32]; /**< SHA256 checksum over the whole vault */ byte checksum[32]; /**< SHA256 checksum over the whole vault */
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _vault_item_header_t { struct _vault_item_header_t {
uint8_t type; /**< Item type (secret key, public, key, keysig, \see _PCP_KEY_TYPES */ uint8_t type; /**< Item type (secret key, public, key, keysig, \see _PCP_KEY_TYPES */
uint32_t size; /**< Size of the item */ uint32_t size; /**< Size of the item */
@@ -174,7 +172,7 @@ struct _vault_item_header_t {
byte checksum[32]; /**< SHA256 checksum of the item */ byte checksum[32]; /**< SHA256 checksum of the item */
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_buffer { struct _pcp_buffer {
char *name; /**< just for convenience in error messages and the like, so we know which buffer cause trouble */ 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 */ uint8_t allocated; /**< marks the buffer as allocated */
@@ -186,7 +184,7 @@ struct _pcp_buffer {
void *buf; /**< the actual storage buffer */ void *buf; /**< the actual storage buffer */
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_stream_t { struct _pcp_stream_t {
FILE *fd; /**< The backend FILE stream */ FILE *fd; /**< The backend FILE stream */
Buffer *b; /**< The backend Buffer object */ Buffer *b; /**< The backend Buffer object */
@@ -206,21 +204,21 @@ struct _pcp_stream_t {
size_t pos; /**< remember i/o position */ size_t pos; /**< remember i/o position */
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_rfc_pubkey_header_t { struct _pcp_rfc_pubkey_header_t {
uint8_t version; uint8_t version;
uint64_t ctime; uint64_t ctime;
uint8_t cipher; uint8_t cipher;
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_rfc_pubkey_0x21_t { struct _pcp_rfc_pubkey_0x21_t {
byte sig_ed25519_pub[32]; byte sig_ed25519_pub[32];
byte ed25519_pub[32]; byte ed25519_pub[32];
byte curve25519_pub[32]; byte curve25519_pub[32];
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_rfc_pubkey_sigheader_0x21_t { struct _pcp_rfc_pubkey_sigheader_0x21_t {
uint8_t version; uint8_t version;
uint8_t type; uint8_t type;
@@ -229,13 +227,13 @@ struct _pcp_rfc_pubkey_sigheader_0x21_t {
uint16_t numsubs; uint16_t numsubs;
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_rfc_pubkey_sigsub_0x21_t { struct _pcp_rfc_pubkey_sigsub_0x21_t {
uint32_t size; uint32_t size;
uint8_t type; uint8_t type;
}; };
/*** ./gencffi.pl: from ../../include/pcp/structs.h:382 */ /*** ./gencffi.pl: from ../../include/pcp/structs.h:380 */
struct _pcp_ks_bundle_t { struct _pcp_ks_bundle_t {
pcp_pubkey_t *p; pcp_pubkey_t *p;
pcp_keysig_t *s; pcp_keysig_t *s;
@@ -552,18 +550,21 @@ int pcphash_countpub(PCPCTX *ptx);
/*** ./gencffi.pl: from ../../include/pcp/keyhash.h:153 */ /*** ./gencffi.pl: from ../../include/pcp/keyhash.h:153 */
pcp_keysig_t *pcphash_keysigexists(PCPCTX *ptx, char *id); pcp_keysig_t *pcphash_keysigexists(PCPCTX *ptx, char *id);
/*** ./gencffi.pl: from ../../include/pcp/keysig.h:50 */ /*** ./gencffi.pl: from ../../include/pcp/keysig.h:52 */
pcp_keysig_t *keysig2be(pcp_keysig_t *s); pcp_keysig_t *keysig2be(pcp_keysig_t *s);
/*** ./gencffi.pl: from ../../include/pcp/keysig.h:50 */ /*** ./gencffi.pl: from ../../include/pcp/keysig.h:52 */
pcp_keysig_t *keysig2native(pcp_keysig_t *s); pcp_keysig_t *keysig2native(pcp_keysig_t *s);
/*** ./gencffi.pl: from ../../include/pcp/keysig.h:50 */ /*** ./gencffi.pl: from ../../include/pcp/keysig.h:52 */
Buffer *pcp_keysig2blob(pcp_keysig_t *s); Buffer *pcp_keysig2blob(pcp_keysig_t *s);
/*** ./gencffi.pl: from ../../include/pcp/keysig.h:50 */ /*** ./gencffi.pl: from ../../include/pcp/keysig.h:52 */
pcp_keysig_t *pcp_keysig_new(Buffer *blob); pcp_keysig_t *pcp_keysig_new(Buffer *blob);
/*** ./gencffi.pl: from ../../include/pcp/keysig.h:52 */
void pcp_dumpkeysig(pcp_keysig_t *s);
/*** ./gencffi.pl: from ../../include/pcp/mem.h:58 */ /*** ./gencffi.pl: from ../../include/pcp/mem.h:58 */
void *ucmalloc(size_t s); void *ucmalloc(size_t s);
@@ -609,6 +610,9 @@ json_t *pcp_pk2json(pcp_pubkey_t *pk);
/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:294 */ /*** ./gencffi.pl: from ../../include/pcp/mgmt.h:294 */
pcp_ks_bundle_t *pcp_import_pub_json(PCPCTX *ptx, byte *raw, size_t rawsize); pcp_ks_bundle_t *pcp_import_pub_json(PCPCTX *ptx, byte *raw, size_t rawsize);
/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:294 */
pcp_ks_bundle_t *pcp_import_pub(PCPCTX *ptx, byte *raw, size_t rawsize);
/*** ./gencffi.pl: from ../../include/pcp/mgmt.h:294 */ /*** ./gencffi.pl: from ../../include/pcp/mgmt.h:294 */
pcp_ks_bundle_t *pcp_import_binpub(PCPCTX *ptx, byte *raw, size_t rawsize); pcp_ks_bundle_t *pcp_import_binpub(PCPCTX *ptx, byte *raw, size_t rawsize);
@@ -841,11 +845,11 @@ uint8_t *zmq_z85_decode (uint8_t *dest, char *string);
char *zmq_z85_encode (char *dest, uint8_t *data, size_t size);''' char *zmq_z85_encode (char *dest, uint8_t *data, size_t size);'''
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ZFILE_HEADER = "----- BEGIN Z85 ENCODED FILE -----" PCP_ZFILE_FOOTER = "----- END Z85 ENCODED FILE -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ASYM_CIPHER = 5 EXP_PK_CIPHER_NAME = "CURVE25519-ED25519-POLY1305-SALSA20"
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
@@ -853,51 +857,7 @@ EXP_SIG_SUB_SIGEXPIRE = 3
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_SIG_CIPHER_NAME = "ED25519" EXP_FORMAT_PBP = 2
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ASYM_CIPHER_SIG = 24
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_SIG_HEADER = "----- BEGIN ED25519 SIGNED MESSAGE -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ENFILE_HEADER = "----- BEGIN PCP ENCRYPTED FILE -----\r\n"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_SIG_START = "----- BEGIN ED25519 SIGNATURE -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_SK_FOOTER = "----- END ED25519-CURVE29915 PRIVATE KEY -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_BLOCK_SIZE = 32 * 1024
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_PK_HEADER = "----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_SIG_SUB_KEYEXPIRE = 9
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ASYM_CIPHER_ANON = 6
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ZFILE_FOOTER = "----- END Z85 ENCODED FILE -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_FORMAT_NATIVE = 1
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
@@ -905,7 +865,7 @@ EXP_PK_CIPHER = 0x21
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ENCRYPT_MAC = 56 EXP_PK_HEADER = "----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
@@ -913,15 +873,15 @@ PCP_ME = "Pretty Curved Privacy"
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_CRYPTO_ADD = (32 - 16) EXP_SIG_CIPHER_NAME = "ED25519"
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_SIG_SUB_KEYFLAGS = 27 EXP_SIG_SUB_KEYEXPIRE = 9
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_HASH_CIPHER = 0x22 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:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
@@ -933,47 +893,51 @@ PCP_SIGPREFIX = "\nnacl-"
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_FORMAT_PBP = 2 PCP_RFC_CIPHER = 0x21
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_PK_FOOTER = "----- END ED25519-CURVE29915 PUBLIC KEY -----" EXP_HASH_CIPHER = 0x22
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_PK_CIPHER_NAME = "CURVE25519-ED25519-POLY1305-SALSA20"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_SYM_CIPHER = 23
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ENFILE_FOOTER = "\r\n----- END PCP ENCRYPTED FILE -----\r\n"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_SIG_CIPHER = 0x23
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_SIG_TYPE = 0x1F
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_SIG_END = "----- END ED25519 SIGNATURE -----" PCP_SIG_END = "----- END ED25519 SIGNATURE -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ENFILE_FOOTER = "\r\n----- END PCP ENCRYPTED FILE -----\r\n"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_SIG_TYPE = 0x1F
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_PK_FOOTER = "----- END ED25519-CURVE29915 PUBLIC KEY -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_HASH_NAME = "BLAKE2" EXP_HASH_NAME = "BLAKE2"
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_VAULT_ID = 14 EXP_SIG_CIPHER = 0x23
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
PBP_COMPAT_SALT = "qa~t](84z<1t<1oz:ik.@IRNyhG=8q(on9}4#!/_h#a7wqK{Nt$T?W>,mt8NqYq&6U<GB1$,<$j>,rSYI2GRDd:Bcm" PCP_ASYM_CIPHER = 5
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ZFILE_HEADER = "----- BEGIN Z85 ENCODED FILE -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_CRYPTO_ADD = (32 - 16)
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_SIG_START = "----- BEGIN ED25519 SIGNATURE -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
@@ -981,8 +945,48 @@ EXP_SIG_SUB_NOTATION = 20
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_RFC_CIPHER = 0x21 PCP_SIG_HEADER = "----- BEGIN ED25519 SIGNED MESSAGE -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_BLOCK_SIZE = 32 * 1024
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ENCRYPT_MAC = 56
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ENFILE_HEADER = "----- BEGIN PCP ENCRYPTED FILE -----\r\n"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_FORMAT_NATIVE = 1
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_VAULT_ID = 14
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_SK_FOOTER = "----- END ED25519-CURVE29915 PRIVATE KEY -----"
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ASYM_CIPHER_ANON = 6
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_ASYM_CIPHER_SIG = 24
# ./gencffi.pl: from ../../include/pcp/defines.h:172
PCP_SYM_CIPHER = 23
# ./gencffi.pl: from ../../include/pcp/defines.h:172 # ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_SIG_SUB_CTIME = 2 EXP_SIG_SUB_CTIME = 2
# ./gencffi.pl: from ../../include/pcp/defines.h:172
EXP_SIG_SUB_KEYFLAGS = 27

1
man/options.pod
View File

@@ -66,6 +66,7 @@
Currently supported: pcp and pbp. Currently supported: pcp and pbp.
-j --json enable JSON output. Can be used with info -j --json enable JSON output. Can be used with info
output (-t) and key export (-p and -s). output (-t) and key export (-p and -s).
and import (-K).
Encryption Options: Encryption Options:
-e --encrypt Asym-Encrypt a message. Read from stdin or -e --encrypt Asym-Encrypt a message. Read from stdin or

2
src/usage.h
View File

@@ -30,7 +30,7 @@
"-K --import Import a secret or public key.\n" \ "-K --import Import a secret or public key.\n" \
"-F --export-format <fmt> Specify exportformat, either 'pbp' or 'pcp'.\n" \ "-F --export-format <fmt> Specify exportformat, either 'pbp' or 'pcp'.\n" \
" 'pcp' is the default if unspecified.\n" \ " 'pcp' is the default if unspecified.\n" \
"-j --json Enable JSON output (with -t, -p and -s).\n" \ "-j --json Enable JSON output (with -t, -p, -s and -K).\n" \
"\n" \ "\n" \
"Encryption Options:\n" \ "Encryption Options:\n" \
"-e --encrypt Asym-Encrypt a message. If none of -i or -r\n" \ "-e --encrypt Asym-Encrypt a message. If none of -i or -r\n" \

2
src/usage.txt
View File

@@ -28,7 +28,7 @@ Keymanagement Options:
-K --import Import a secret or public key. -K --import Import a secret or public key.
-F --export-format <fmt> Specify exportformat, either 'pbp' or 'pcp'. -F --export-format <fmt> Specify exportformat, either 'pbp' or 'pcp'.
'pcp' is the default if unspecified. 'pcp' is the default if unspecified.
-j --json Enable JSON output (with -t, -p and -s). -j --json Enable JSON output (with -t, -p, -s and -K).
Encryption Options: Encryption Options:
-e --encrypt Asym-Encrypt a message. If none of -i or -r -e --encrypt Asym-Encrypt a message. If none of -i or -r