From f182c64796e124881e5cf783bdf280edd71266c4 Mon Sep 17 00:00:00 2001 From: Thomas von Dein Date: Fri, 21 Oct 2016 10:23:01 +0200 Subject: [PATCH] regen --- ChangeLog | 1 + TODO | 4 - bindings/py/pypcp/raw.py | 249 +++++++++++++++++++-------------------- man/pcp1.1 | 4 +- man/pcp1.html | 4 +- 5 files changed, 128 insertions(+), 134 deletions(-) diff --git a/ChangeLog b/ChangeLog index 865b4f2..b6d5b4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ Removed endian conversion stuff. see util.c for details. + Fixed: use key signatures for vault checksum calc as well. 0.3.0 Changed publuc key signature storage, previously diff --git a/TODO b/TODO index add6bf1..027c73e 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,3 @@ -keysig to vault: use sig2blog and blog2sig, just like we do with keys - pcpstream.c: use static tmp buffers, avoid alloc mem during each iteration detach keysig generation from pub key export, so that an existing @@ -13,8 +11,6 @@ malloc() new pointers in functions only if not NULL, e.g. pcp_gennonce() check pub key count in pcp.c before calling verify signature, croak if count==0 -vault checksum: add keysigs as well - Add newlines to headers in define.h, so strlen() later catches the whole length. c++ destructor double free mess diff --git a/bindings/py/pypcp/raw.py b/bindings/py/pypcp/raw.py index f2070c2..129c083 100644 --- a/bindings/py/pypcp/raw.py +++ b/bindings/py/pypcp/raw.py @@ -575,19 +575,16 @@ int pcphash_countpub(PCPCTX *ptx); /*** ./gencffi.pl: from ../../include/pcp/keyhash.h:153 */ pcp_keysig_t *pcphash_keysigexists(PCPCTX *ptx, char *id); -/*** ./gencffi.pl: from ../../include/pcp/keysig.h:52 */ -pcp_keysig_t *keysig2be(pcp_keysig_t *s); +/*** ./gencffi.pl: from ../../include/pcp/keysig.h:50 */ +void pcp_keysig2blob(Buffer *b, pcp_keysig_t *s); -/*** ./gencffi.pl: from ../../include/pcp/keysig.h:52 */ -pcp_keysig_t *keysig2native(pcp_keysig_t *s); +/*** ./gencffi.pl: from ../../include/pcp/keysig.h:50 */ +Buffer *pcp_keysigblob(pcp_keysig_t *s); -/*** ./gencffi.pl: from ../../include/pcp/keysig.h:52 */ -Buffer *pcp_keysig2blob(pcp_keysig_t *s); +/*** ./gencffi.pl: from ../../include/pcp/keysig.h:50 */ +pcp_keysig_t *pcp_blob2keysig(Buffer *blob); -/*** ./gencffi.pl: from ../../include/pcp/keysig.h:52 */ -pcp_keysig_t *pcp_keysig_new(Buffer *blob); - -/*** ./gencffi.pl: from ../../include/pcp/keysig.h:52 */ +/*** ./gencffi.pl: from ../../include/pcp/keysig.h:50 */ void pcp_dumpkeysig(pcp_keysig_t *s); /*** ./gencffi.pl: from ../../include/pcp/mem.h:58 */ @@ -897,63 +894,7 @@ uint8_t *zmq_z85_decode (uint8_t *dest, char *string); char *zmq_z85_encode (char *dest, uint8_t *data, size_t size);''' # ./gencffi.pl: from ../../include/pcp/defines.h:185 -EXP_SIG_TYPE = 0x1F - - -# ./gencffi.pl: from ../../include/pcp/defines.h:185 -PCP_VAULT_ID = 14 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:185 -EXP_SIG_SUB_KEYFLAGS = 27 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:185 -PCP_ASYM_CIPHER_ANON = 6 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:185 -PCP_SIGPREFIX = "\nnacl-" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:185 -EXP_PK_CIPHER_NAME = "CURVE25519-ED25519-POLY1305-SALSA20" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:185 -PCP_ZFILE_HEADER = "----- BEGIN Z85 ENCODED FILE -----" - - -# ./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 +PCP_ASYM_CIPHER = 5 # ./gencffi.pl: from ../../include/pcp/defines.h:185 @@ -961,75 +902,127 @@ 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,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 +EXP_SIG_TYPE = 0x1F # ./gencffi.pl: from ../../include/pcp/defines.h:185 EXP_SIG_CIPHER_NAME = "ED25519" +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +PCP_ASYM_CIPHER_SIG = 24 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +PCP_RFC_CIPHER = 0x21 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +PCP_SYM_CIPHER = 23 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +PCP_ZFILE_HEADER = "----- BEGIN Z85 ENCODED FILE -----" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +PCP_SIG_START = "----- BEGIN ED25519 SIGNATURE -----" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +EXP_SIG_SUB_KEYEXPIRE = 9 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +PCP_VAULT_ID = 14 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +EXP_SK_FOOTER = "----- END ED25519-CURVE29915 PRIVATE KEY -----" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +PCP_SIGPREFIX = "\nnacl-" + + +# ./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_SIG_SUB_SIGEXPIRE = 3 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +PCP_SIG_END = "----- END ED25519 SIGNATURE -----" + + # ./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 +PCP_ZFILE_FOOTER = "----- END Z85 ENCODED FILE -----" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +EXP_FORMAT_PBP = 2 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +EXP_PK_CIPHER = 0x21 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +EXP_SIG_SUB_KEYFLAGS = 27 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +EXP_SIG_SUB_CTIME = 2 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +EXP_HASH_CIPHER = 0x22 + + +# ./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_ENFILE_FOOTER = "\r\n----- END PCP ENCRYPTED FILE -----\r\n" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +PCP_ASYM_CIPHER_ANON = 6 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +EXP_SK_HEADER = "----- BEGIN ED25519-CURVE29915 PRIVATE KEY -----" + + +# ./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,rSYI2GRDd:Bcm" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +EXP_SIG_CIPHER = 0x23 + + +# ./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_ME = "Pretty Curved Privacy" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +EXP_PK_CIPHER_NAME = "CURVE25519-ED25519-POLY1305-SALSA20" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +PCP_BLOCK_SIZE = 32 * 1024 # ./gencffi.pl: from ../../include/pcp/defines.h:185 @@ -1037,4 +1030,8 @@ EXP_SIG_SUB_NOTATION = 20 # ./gencffi.pl: from ../../include/pcp/defines.h:185 -EXP_SIG_SUB_SIGEXPIRE = 3 +PCP_ASYM_CIPHER_ANON_SIG = 7 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:185 +PCP_SIG_HEADER = "----- BEGIN ED25519 SIGNED MESSAGE -----" diff --git a/man/pcp1.1 b/man/pcp1.1 index cbb9af4..ac4146d 100644 --- a/man/pcp1.1 +++ b/man/pcp1.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "PCP1 1" -.TH PCP1 1 "2016-10-20" "PCP 0.4.0" "USER CONTRIBUTED DOCUMENTATION" +.TH PCP1 1 "2016-10-21" "PCP 0.4.0" "USER CONTRIBUTED DOCUMENTATION" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/pcp1.html b/man/pcp1.html index 9c9a814..3c5f9f8 100644 --- a/man/pcp1.html +++ b/man/pcp1.html @@ -4,10 +4,10 @@ - + - +