re-generated unittests check files due changed z85 padding

This commit is contained in:
TLINDEN
2014-02-08 20:36:40 +01:00
parent da8f40b596
commit 5bbe95f6fe
24 changed files with 2178 additions and 185 deletions

View File

@@ -19,6 +19,7 @@ PCPEXPORT = pcp.h \
pcp/zmq_z85.h \
pcp/ed.h \
pcp/base85.h \
pcp/buffer.h
pcp/buffer.h \
pcp/mgmt.h
nobase_include_HEADERS = $(PCPEXPORT)

View File

@@ -7,6 +7,7 @@ extern "C" {
#include "pcp/base85.h"
#include "pcp/buffer.h"
#include "pcp/config.h"
#include "pcp/crypto.h"
#include "pcp/defines.h"
#include "pcp/digital_crc32.h"
@@ -17,6 +18,7 @@ extern "C" {
#include "pcp/keyhash.h"
#include "pcp/mac.h"
#include "pcp/mem.h"
#include "pcp/mgmt.h"
#include "pcp/pad.h"
#include "pcp/platform.h"
#include "pcp/plist.h"

View File

@@ -30,6 +30,6 @@ libpcp1_la_SOURCES = mac.c mem.c pad.c version.c \
vault.c fatal.c jenhash.c digital_crc32.c \
crypto.c ed.c keyhash.c scrypt.c \
scrypt/crypto/sha256.c scrypt/crypto/crypto_scrypt-nosse.c \
base85.c util.c buffer.c
base85.c util.c buffer.c mgmt.c
include_HEADERS = ../include/pcp.h

View File

@@ -1,35 +1,35 @@
----- BEGIN PCP PUBLIC KEY -----
Generated by: Pretty Curved Privacy Version 0.1.5
Generated by: Pretty Curved Privacy Version 0.2.1
Cipher: CURVE25519-ED25519-SALSA20-POLY1305
Owner: Bart
Mail: bart@local
Key-ID: 0x45AE802C2C338179
Public-Key: 1aoiXG/sSsaV]E-WH/#GVl*Jh79V.&=rXRqkI05DzVx+q
Creation Time: 2014-01-19T19:23:33
Checksum: 1F:CC:95:EB:21:AD:44:9B:F2:5C:69:79:4D:C8:15:5E
FD:30:52:81:07:91:A8:1A:A1:3A:C5:DF:FE:E5:B4:20
Serial Number: 0x7F7EF76B
Key-ID: 0x1AAAC77510D883C9
Public-Key: :FbOC%c<k{cn<Cios]S<9<?0>R$8DkWh1PZW12.G
Creation Time: 2014-02-08T20:17:55
Checksum: 8A:AB:90:72:98:EE:3F:76:BE:9C:66:38:9F:1B:CF:A8
9D:5C:81:92:90:F7:06:19:DB:DA:2C:BE:FA:DB:6F:58
Serial Number: 0xD716902C
Key Version: 0x00000005
Random Art ID: +----------------+
| . +=. |
| .o++ |
| ...o. |
| . + |
| o . . |
| |
| |
| . |
| |
| |
| . . . |
| ...o . |
| .... |
| o. . .. |
|o o+.+o |
+----------------+
1aoiXG/sSsaV]E-WH/#GVl*Jh79V.&=rXRqkI05Dz.ocVE}GuwKiCaY.FgW>a^1jBkLk!$S
59:?6wqSA.A}WKBo4I-labfz?:bQ{Xo!NL6Z7tG/VWl0RuqnXn8JMO-?*q2cpK9Js:-Suoy
4-lIi=B+y](bA0Jhd#4<</wSh<STTtlA4!-8U(o8g@M[.4UG?$OAG-epcCJcZmR5>[rlyvL
A.Eo7)h>87eXC*WnPnq+sdYkvArnnKn[Z41{K>N#hvk#dFzzX:<M-5Q0kgX1n#>D1j(3=Xg
e5dm.erB?!a)hbD7LQ7W7^KWuj/N-!u0K?FJs13#qsG.fdh4{N^A7UjZ/<FYBv{N0X7@8[p
Yb@y/jH9qYEZ(K3PD!o-(:OS&]mjOz{+mVskifkWwCg=fvQTq0kX$vGvqC{4Dy$C3boBn80
FflSbT=}szGExYLdEl8@e3G!s6RL)GSFgB&!m2P/T:a5UE0w:akZyskX>6pm.%tDa[Hu[!F
Qgmf.%uzUT]doM3u+Rrku+ruq=VOHos/Dpdzv=Kf+<9ztlR8hwei{0q3WCMDTbkl0-c-xCU
uk/a}6X<>CYLhz1#g5Ho2f[W<Cu3b%F[+0LT#h&0zvV>x{}L.CNdR$yyF^jSotPS@D.A&Y]
@cq/t=y/(Q1>9bd7/P4a0Pe{s@4KxYc&48rN5=cz:b6B1^2=/DTigC4=MZipgg/qk<KUyy]
3.6mBa=&JTh9<U<fFV0JlO*ITf/I8)0@@r308?O?b(^]B1+h0}yxatm
:FbOC%c<k{cn<Cios]S<9<?0>R$8DkWh1PZW12.GTWVNd>TPIvWwa/eM!Q7Y29%(:o%<V1N
Ou^fim26rlsB[R0bgg^]BnSNf#@Ez+9:{n0p+4eO7N}?6gH{?7Tl-{k.DJDgxm40kHvNcAM
Bi-}t:zOJy=2%yheapP9(yDH+dhgF}wpU-x7yP}a3(ytvGyxCz[JWi9X.Z3jhjZSrO!bT1w
]Mwpod*?ciN:]5aUaFY1VtvUq=?reF.s}.?Sk.3gg^Cl&hB@=B3#mENRXQvwza1i3pRy<Q3
ONDfm.-c5EyNWQ34HotB=im50uYv&fFc[}IQy7^t#G@lehL=q25(]x{yj^tpxxcKcMJkQeK
YqzvQKqbUA8tsu+A$sJD9V*dw3$rcOP:jJvg{V*IZqg^#vrcDPy&r/(yYDYXtej$<IspX6^
uG1qTlb$Wc}.ABE1dO$>s787P}?zw+S2?CF{9A7^}gY*O+!somv<SLBSiRXizr&$SDc*J(r
kns&VA$&wPZbxcY#YHUMMD4GMM(I[^^jNi]zzUK%t&ai:@kHwtV5sLtlpLL02ni+6H71r&6
Y{dUgdK/F5I35x0-7tR!#66X3!Hg<ykMy&OE>3jXe)C$y[oSy5xtuBVvr:h(KC=8fN4q8%&
jZag:lz8MH5v6HJ]Cq>CSyW6>YifUv]e34qfjb(WoI>(e!AHXX.6^UdcPr8=34vLS@:LkFj
OaA--.&DJrk%W<%h-irzl]WdZlPCbG00000qUC.500005/a%D0
------ END PCP PUBLICKEY ------

View File

@@ -34,7 +34,7 @@ int main() {
for(x=0; x < bs; x+=32) {
fprintf(stderr, "before get\n");
buffer_info(test);
if(buffer_get(test, g, 32) > 0) {
if(buffer_get_chunk(test, g, 32) > 0) {
fprintf(stderr, "after get\n");
buffer_info(test);
_dump("got", g, 32);

1
tests/env/share/alice.pbp vendored Normal file
View File

@@ -0,0 +1 @@
Hcw%wikuo`2xB^Eg3|A&jn`iC^8L`huRTz&$8JABJ~yzSdqgF?@J}LM5=-Pi$uYUKi7H6RfN|AyW(Xn)8X~?h^h^15?{A1GN3}61h?H6<D~K0}eKpkLPBC9>8X~?h^h^15?{A1GN3}61h?H6<D~K0}eKpkLPBC9>3>;bI)5h)TD_YZpLg)Shh5XPTRuFS@W?Nk7FaBvFGB7bTEif`IFg8>%IXX2sIxsmdFfcGMFfbq>ARr(hGB7bTEif`IFg8>%IXX2sIxsmdFfcGMFfbq>ARr(hL2PMbX<+~W

1
tests/env/share/bob.pbp vendored Normal file
View File

@@ -0,0 +1 @@
8)hNsm5fgZv#P5AhByrYDp3=8ssB14Ld!M);KP*~-NII#9R&>44-BBfb4w`*yuC~dsPd57h1gd<vJbTjRFsTM7O-fV{y66PHIYW^m=pQv%Pao`){J-dA(2nieTMoI66~~e2c2%NEap(xw*zy1lTrA6t#mWewiHhLzFEUX4<Rf+R)BjF5Hdb5$#a_!Sf)7fN<NF$s(*V9GB7bTEif`IFg8>%I65^rIx;sdGC4RfF*qO~ARr(hGB7bUEif`IFg8>%I65^rIx;sdGC4RfIXEC7ARr(hLT_RK

BIN
tests/env/share/encrypted vendored Normal file

Binary file not shown.

1
tests/env/share/msg vendored Normal file
View File

@@ -0,0 +1 @@
HALLO ALICE, KNUTSCHI

View File

@@ -44,7 +44,7 @@ ser=`grep Serial bart.pub | awk '{print $3}'`
gen Niemand niemand@local n y unknown1 unknown2
$pcp1 -V unknown3 -l
echo hallo | $pcp -e -x a | egrep -v "^ " | egrep -v -- "----" | grep . > unknown4
echo hallo | $pcp -e -x a -z | egrep -v "^ " | egrep -v -- "----" | grep . > unknown4
echo blah | $pcp -g -x a | egrep -v "^ " | egrep -v -- "----" | grep . > unknown5
echo "bartid = $ids

View File

@@ -1,35 +1,35 @@
----- BEGIN PCP PUBLIC KEY -----
Generated by: Pretty Curved Privacy Version 0.1.5
Generated by: Pretty Curved Privacy Version 0.2.1
Cipher: CURVE25519-ED25519-SALSA20-POLY1305
Owner: Alicia
Mail: alicia@local
Key-ID: 0x7A96E7F11E3A92FC
Public-Key: 1n[zBNEfpry!7cdZ.k&Pv6[iPY=n94&{yiWjsb8Vg5}pO
Creation Time: 2014-01-19T19:23:31
Checksum: AD:C5:D4:D0:ED:4A:74:B3:C5:0D:3F:A3:F1:7F:41:38
07:FE:91:41:D0:43:29:89:E6:23:42:9D:FD:3F:E0:0B
Serial Number: 0xCCFEA718
Key-ID: 0x82BE660E56313C52
Public-Key: <YC%-[:{}X{Y<%lI}:2c@bPACZU!8?*eT}/d?(x3
Creation Time: 2014-02-08T20:17:52
Checksum: 90:7F:68:A9:6D:A1:5D:61:63:D4:CD:1E:C0:30:24:63
BD:AA:1C:65:6C:9C:C1:3C:81:1A:AA:4F:2A:00:7B:37
Serial Number: 0x39DBF8EF
Key Version: 0x00000005
Random Art ID: +----------------+
| |
| |
| . |
| . + + |
| o o + . |
| .+ . .o|
| . o +.=|
| o . .+|
| = |
| o . |
| .. .. . |
| .o...o. |
| |
| |
| |
+----------------+
1n[zBNEfpry!7cdZ.k&Pv6[iPY=n94&{yiWjsb8VgdNhhTxXVw5cnTb]M0-6nTf^K.(d@!n
TVN6*2tAUi6?v{v}/uK5^*HKF)IKEgT+S>q0W]YxirTdE=?ii@{0![FQdK%A+>?P+iClzgO
<.SQvl%)J?Q2e1re#c}=S$5d+fWWaSH=q{6GZ1RO}4Hctjh1!2FCHPJ<&C/K5{OUI6q6mFf
0EGB:2Ga5fG[y^]7+!cTG9SX:AWy326yHW>Dn?U0(C:y$VPS8Da=&mMR?g#009J7GM/D*3M
O>zfA2hXl1E-40VfMaKi@Z{x[@?Yjd)e[GEfWH{L!G.9YNmLi=Gxrpf@DqWT(@72t?EH+A1
xL354SJYBI255Srl.e@r*6[2v]4)p:7NQNyd&Ne<s/)V0vqGT/x<<nyz!0i(0l&]nLf][7D
jCE<)<us83^Tdlelq8k1mI=yV=sjNA+GorXg5jc)UV{MLO1T{Ek&b^Yo7tCeHhfU?>/#l>O
pWn5D0HM&LLtadF#m2ohYM4QvHu/3oKBRPbv/W>Pc@7uiqgtV&vry9yj!<N)U!jUgo{}oV4
(O=PayFEu[Q4Ml9%J[BaLUrJl)I=4f<bwFWzyd[j?*A{J5@W]0=.zA0:zn>O(V=r(>02Hb7
0m=jGmNwwn]8H.V+LOqg.SJNHxy4tJuP>I^<u^ht[IoJRH-9ayjfP7d4Fux%d0q.BwXAJ(u
Q^]5Isb.hVk@*?(h+2IRmkEj&gdBRh0@@r308?O?bldYz1<D$z7YTKo
<YC%-[:{}X{Y<%lI}:2c@bPACZU!8?*eT}/d?(x31mmjuar!VFZm}-5Y7:Rbg!5an8#t7zh
f{/xM)R86l2pmBx<?1eYRjS{+x5Q<9OJ)}dbKsR4X{U})KyYu8}n1)<XFop1Eb/0>u0]q:m
@[2LIusbbJ?gf7@AQ2mw{#Gkds1j^ZO8y07BNsW:Zp#E4?Uj{xUBkj5y(j*e]v&BazdPD-c
FC!R?QG(%[7jCVV*6UWCyqqE?WY>CJcsZ0jc5Bmgoy?.JWC>HEn.o[>ypFA5uxl>tKSOpO*
uC<An7NW-&)gu^D%J[yCz)2(H7]ETxXruM}hPM-lwP%kp<f]o2esm/4]JP?V]L$u@QZdDd8
vTk0Y]g@FF]^3jZ2Li{-moGs:58fF)RInEzg/-k>i/rSty?Wx[vl!TEv{%fNcjpS#us)?2V
A!0dE$/PJ6St)QRnr34OI-+7XBAb&eTc^L01Gmh12*z(=}:94Kd!M}Sx#j&cfm6:lnABwXx
Znf3*9#}0ISXRF3%Sj]=t9xh-J2[U[Ez2]#uz5y@^h0@A!<!k@>&R3&yD?{tfL=zhMdXXau
RgJ{NC(LY^GSX&6&kY)k%vuTb2*]nHnm?]3WFGf0}obKOY}Vdn#Y(wZ<HcLJ/^*k<N+p^R1
dOEp&o98.Rq.fb%RuQTznpJV^E/uU^[YOS!FMr6tZUZ1HLYPZ]namoSZxzW>jK^A93qX#n)
NV]x+g@?NhlpA^<fHW&SgCHWMh8kdl00000qUC.200005iOTt$
------ END PCP PUBLICKEY ------

View File

@@ -1,24 +1,24 @@
----- BEGIN PCP SECRET KEY -----
Generated by: Pretty Curved Privacy Version 0.1.5
Generated by: Pretty Curved Privacy Version 0.2.1
Cipher: CURVE25519-ED25519-SALSA20-POLY1305
Key-ID: 0x7A96E7F11E3A92FC
Creation Time: 2014-01-19T19:23:31
Serial Number: 0xCCFEA718
Key-ID: 0x82BE660E56313C52
Creation Time: 2014-02-08T20:17:52
Serial Number: 0x39DBF8EF
Key Version: 0x00000005
1n[zBNEfpry!7cdZ.k&Pv6[iPY=n94&{yiWjsb8Vg5$AFEex!FCg:*!MZM2:]1?OT=rLN0B
QjDJl0STiIBSJkTxXVw5cnTb]M0-6nTf^K.(d@!nTVN6*2tAUh#]W0HJSi([7./}.>l)wiv
yjfR#pMyTD><L}{!X[s*R2^OvdYBGxYT07YW9dHY<YQfu[#c/>k+T:j>J4xnmv]<v*t-@Yk
)S9#FUZEhaVJi&!Ps3Rt^UuVjN.o)m6#3=1hrRjyw:+qrJ%[BFCUx$c3#}kuL#.:Mx[?NaV
W..rw??4ZP>OLCX+7Yyz6qs^3mOnOcC83p#Ku+R(JuN?P!poAGy1sfhser2olC!Oz]}VRz9
zWroSz-IE!wxavQ*^b:<v}/uK5^*HKF)IKEgT+S>q0W]YxirTdE=?ii@{0![FQdK%A+>?P+
iClzgO<.SQvl%)J?Q2e1re#c}=S$5d+fWWaSH=q{6GZ1RO}4Hctjh1!2FCHPJ<&C/K5{OUI
6q6mFf0EGB:2Ga5fG[y^]7+!cTG9SX:AWy326yHW>Dn?U0(C:y$VPS8Da=&mMR?g#009J7G
M/D*3MO>zfA2hXl1E-40VfMaKi@Z{x[@?Yjd)e[GEfWH{L!G.9YNmLi=Gxrpf@DqWT(@72t
?EH+A1xL354SJYBI255Srl.e@r*6[2v]4)p:7NQNyd&Ne<s/)V0vqGT/x<<nyz!0i(0l&]n
Lf][7DjCE<)<us83^Tdlelq8k1mI=yV=sjNA+GorXg5jc)UV{MLO1T{Ek&b^Yo7tCeHhfU?
>/#l>OpWn5D0HM&LLtadF#m2ohYM4QvHu/3oKBRPbv/W>Pc@7uiqgtV&vry9yj!<N)U!jUg
o{}oV4(O=PayFEu[Q4Ml9%J[BaLUrJl)I=4f<bwFWzyd[j?*A{J5@W]0=.zA0:zn>O(V=r(
>02Hb70m=jGmNwwn]8H.V+LOqg.SJNHxy4tJuP>I^<u^ht[IoJRH-9ayjfP7d4Fux%d0q.B
wXAJ(uQ^]5Isb.hVk@*?(h+2IRmkEj&gdBRh0rr9108?O?bldYz1<D$z7YTKo
<YC%-[:{}X{Y<%lI}:2c@bPACZU!8?*eT}/d?(x302Gc-<zb7oTb&Rw4JsaO<?t?h0w4-OA
A$&3gXYlY1mmjuar!VFZm}-5Y7:Rbg!5an8#t7zhf{/xM)R860e%0/nR+0>37lqW?#go{?3
Ji4f/YwyTk-q*njE<>JPOM7?1e2&LCFWJyi8nBnGPpC({6#{21RwSPOj8O3lP973<cqR*eU
JkV-ru^h5MJ+w9Gva=R)aspI<%W45IY@XonDBsfrsjr[{S[4@}1{2bzUad%jp6s([Ea.qap
NUynXgFd{@s*[6*B3k+4]Qc+se{thN[[pN5/kY*&lPypbR(#yqDl*z[:7dS6^*?u9lbQq%[
)o*eRmj(jao6)dol2pmBx<?1eYRjS{+x5Q<9OJ)}dbKsR4X{U})KyYu8}n1)<XFop1Eb/0>
u0]q:m@[2LIusbbJ?gf7@AQ2mw{#Gkds1j^ZO8y07BNsW:Zp#E4?Uj{xUBkj5y(j*e]v&Ba
zdPD-cFC!R?QG(%[7jCVV*6UWCyqqE?WY>CJcsZ0jc5Bmgoy?.JWC>HEn.o[>ypFA5uxl>t
KSOpO*uC<An7NW-&)gu^D%J[yCz)2(H7]ETxXruM}hPM-lwP%kp<f]o2esm/4]JP?V]L$u@
QZdDd8vTk0Y]g@FF]^3jZ2Li{-moGs:58fF)RInEzg/-k>i/rSty?Wx[vl!TEv{%fNcjpS#
us)?2VA!0dE$/PJ6St)QRnr34OI-+7XBAb&eTc^L01Gmh12*z(=}:94Kd!M}Sx#j&cfm6:l
nABwXxZnf3*9#}0ISXRF3%Sj]=t9xh-J2[U[Ez2]#uz5y@^h0@A!<!k@>&R3&yD?{tfL=zh
MdXXauRgJ{NC(LY^GSX&6&kY)k%vuTb2*]nHnm?]3WFGf0}obKOY}Vdn#Y(wZ<HcLJ/^*k<
N+p^R1dOEp&o98.Rq.fb%RuQTznpJV^E/uU^[YOS!FMr6tZUZ1HLYPZ]namoSZxzW>jK^A9
3qX#n)NV]x+g@?NhlpA^<fHW&SgCHWMh8kdj00000qUC.200005iOTt$
------ END PCP SECRET KEY ------

View File

@@ -1,35 +1,35 @@
----- BEGIN PCP PUBLIC KEY -----
Generated by: Pretty Curved Privacy Version 0.1.5
Generated by: Pretty Curved Privacy Version 0.2.1
Cipher: CURVE25519-ED25519-SALSA20-POLY1305
Owner: Bobby
Mail: bobby@local
Key-ID: 0x78FBD073AC12DDDC
Public-Key: 1b<gU0**5$gt!t!wgWFdf&M^*>a4nW:2}m/2#.BaEGfuF
Creation Time: 2014-01-19T19:23:32
Checksum: 0C:49:17:C1:B7:E5:85:C0:17:C5:00:93:8F:8F:62:D9
DF:3A:25:00:3D:75:53:30:F7:61:77:D8:04:75:95:79
Serial Number: 0xE7096F3B
Key-ID: 0xFFA4A7BBD49C6181
Public-Key: u=&@%IOV2$8cB&YWh<806wSwA1g$3f2R+M:trx4[
Creation Time: 2014-02-08T20:17:54
Checksum: 24:02:E3:F4:37:4A:C2:EC:C7:29:9D:3B:3F:BC:34:EC
52:14:53:7A:64:94:F8:AF:44:FB:17:3C:65:81:48:E3
Serial Number: 0xCD42437A
Key Version: 0x00000005
Random Art ID: +----------------+
| .. . |
| o . .o . . |
| o . .. o . |
| . o |
| . . . |
| o + |
| + |
| |
| |
| |
| . |
|. o . |
|=+ . . |
|=... . . |
|+oo... |
+----------------+
1b<gU0**5$gt!t!wgWFdf&M^*>a4nW:2}m/2#.BaEXyru9j:4^XIqQxg=Tm&LeTZ(51V}<D
6nXr@XUjc@x+BivTd}YxlZ{L5%Y!Fn<Iy5OKr2ggb$c{o6m?&kjX/+ej2:[Ue.DyXcS([71
8.mK53+.U2@qG^Orz=[ia6/@ZnbZw.3dc*}O?#c$}1Hbz6GWlS2Pi1n!A}cN90gr%x)PTAG
H<?0r]XroN}2DZ1}Sy{Iq4-EZ#!!m7qP6eVoR5]uFuvdN-JF[yKQmel=WwP={k3M9ld0-Jw
^qOi/7D}j0OdjWoP&+!AxX/WvAH/@E==o=eGGFbZ{2]6@:l-7x!3<#DBN@H:+f&k[k]xUWQ
c>oDChh8:)f3u=mfllncCgQVts^T51hI^npVwG2}7<6=wvSbZ+C%Dg:v{%fNmL[ll:HHLoy
6A1]YW7%}EOh30uA/cj>>B!@sJJQAvfLr&FS)5oP6^Y7-m1Bb.&y>([?Hjnj9wR7{5<-TN<
[L{&wnaea#]IvQH=jlAbwqgDDo(W3Z{w/Rp:F3e?/IJ5fAqrtBPxnD%nt<]ciz1QxqVyE}G
}Dde)ZodMjXJm8SDdf^Pbl=HEtlWvjRbSUv%w=&wD1xwMZOZO0[jcOL!FQS94:YV4bDp+h{
iy[iM)e4pz44wWZbma:{HVATQ<MZulGZ/-u#?bBEJzJ55ohjGeb7uAGhh*.cTmy/kY5VL%:
kice&G$6Mgi7uk5fGg^NlOQt:l{%xx0@@r308?O?bME/A1)lhgi@/lX
u=&@%IOV2$8cB&YWh<806wSwA1g$3f2R+M:trx4[6J4Tm}L}ue2<.%.N6pW?0hf6]!)}fZT
oQDt2/X)jlt{sxC(OodA$5Hrp%.FW&w@gpWvX>NFX9cJp3)%xs2HQ{kvk6H!mGbO4sU@T>a
g(gWYob{dqYIPti^ITAC3>/Ijr7x<8WQPJ0hZ4Qf3P9vK-:6v]e4c*oh3gtSsla.h?kw<xg
*i9?#V@W6>ACO?h%29Y74z2-jxZaD[N+yn]@QjbTH0M.iC0@tAgVKq}%5h6pEh*ph1@78e^
6orCqP/969Ox0{A+sLj@/mfDiu!!B*7e-]}kIA+NE.vVpd=..[K/4mkppjf[1i*$-bQWTP/
yBE(SyBpV$iv3J9hCnu$gAnKbiW!HEx:CR&Bm:tVq!9yFz^)g3kX$vGvqC{aQq8yIp1^U8I
13h^uM9y[>q}9dN]xTfI07>*m=Q4l.bR7K5)h=U!-M:gv.QeR7.d9}?I]7{sLr8>42]IOrX
56+z1&:L@%g%KoLF^bG&.cFcwD]Tds846!K}7xV1<$JB7m]{jB}z-DH4/tEFA-ho(fipKGx
D<J]!*BCrsiD2/%Pw3G%t)U*q?vwf]oA.eMk[T1cx.kLC#Nw&.2/8]rlG{k62GMjKTcP%a<
I*H!Q>W^KQxzLM%Q%ld7rYOgBDmkvYWd$4#8=q44OS8[<<C^%[y99Lf-*JqgC?RI>oZpc3@
D1vDW(eLl5k@p>^lpa6%iytXVi57yn00000qUC.400005+%B^z
------ END PCP PUBLICKEY ------

View File

@@ -1,24 +1,24 @@
----- BEGIN PCP SECRET KEY -----
Generated by: Pretty Curved Privacy Version 0.1.5
Generated by: Pretty Curved Privacy Version 0.2.1
Cipher: CURVE25519-ED25519-SALSA20-POLY1305
Key-ID: 0x78FBD073AC12DDDC
Creation Time: 2014-01-19T19:23:32
Serial Number: 0xE7096F3B
Key-ID: 0xFFA4A7BBD49C6181
Creation Time: 2014-02-08T20:17:54
Serial Number: 0xCD42437A
Key Version: 0x00000005
1b<gU0**5$gt!t!wgWFdf&M^*>a4nW:2}m/2#.BaEGl0DiD2X?@5RUgq-[h9CpS]OkY15{-
5#<Mnw^-S[1BpW9j:4^XIqQxg=Tm&LeTZ(51V}<D6nXr@XUjc@qYw%6C!y/4+iAwyE/VA3Q
kc%[OHQ8e]b9PlrMvO{galf[8)XHJjReb?3Y*9r<^.VT4MsfGAX6$rW/^]m=n?LN{?EiJ1-
9&K5&{HDl/zf5qWq<A{j}@b=:dg80t804D!z>NM>dr-nYl0ARaDKhcHl(Uq&=.p]3Epnib6
/Y8qz[2B{)W>M<o{)GgM6ywEt!M*3E9)=XPd79YW(]:6FG4ysL7QWQ:ARZKd*5@O}Uhf1*J
Y/}b.LB!!=+D.*kcphSWvTd}YxlZ{L5%Y!Fn<Iy5OKr2ggb$c{o6m?&kjX/+ej2:[Ue.DyX
cS([718.mK53+.U2@qG^Orz=[ia6/@ZnbZw.3dc*}O?#c$}1Hbz6GWlS2Pi1n!A}cN90gr%
x)PTAGH<?0r]XroN}2DZ1}Sy{Iq4-EZ#!!m7qP6eVoR5]uFuvdN-JF[yKQmel=WwP={k3M9
ld0-Jw^qOi/7D}j0OdjWoP&+!AxX/WvAH/@E==o=eGGFbZ{2]6@:l-7x!3<#DBN@H:+f&k[
k]xUWQc>oDChh8:)f3u=mfllncCgQVts^T51hI^npVwG2}7<6=wvSbZ+C%Dg:v{%fNmL[ll
:HHLoy6A1]YW7%}EOh30uA/cj>>B!@sJJQAvfLr&FS)5oP6^Y7-m1Bb.&y>([?Hjnj9wR7{
5<-TN<[L{&wnaea#]IvQH=jlAbwqgDDo(W3Z{w/Rp:F3e?/IJ5fAqrtBPxnD%nt<]ciz1Qx
qVyE}G}Dde)ZodMjXJm8SDdf^Pbl=HEtlWvjRbSUv%w=&wD1xwMZOZO0[jcOL!FQS94:YV4
bDp+h{iy[iM)e4pz44wWZbma:{HVATQ<MZulGZ/-u#?bBEJzJ55ohjGeb7uAGhh*.cTmy/k
Y5VL%:kice&G$6Mgi7uk5fGg^NlOQt:l{%xx0SSi208?O?bME/A1)lhgi@/lX
u=&@%IOV2$8cB&YWh<806wSwA1g$3f2R+M:trx4[0cLto.#xOi:WYh.??-CSz0J#Io>+AfR
&<8mUU)w36J4Tm}L}ue2<.%.N6pW?0hf6]!)}fZToQDt2/X)j06RlT=7lJ+d!MbjTjJoyMr
@^g2G3mGazm@yR4QYs^Q0((vqtXA^LK}Cde{M*Aq(lh-MClt!eCoQ0osuw5pdxhqdPeQb=F
SsceD-NcS<7rRCkFdPQ9*T>JE-#u=ZP0/FT1dfqgb{g^Gq^np7o:BWSP1Qqof3d=$8/A&4&
S)4Bx%rALsLUl7xohwmM+(WBN{]:)REEIexkkZ^(w+a(eV+!9F[HN8=<a%H{Uf$-<ZWB$ko
)HIzKIyax]*4#wLlt{sxC(OodA$5Hrp%.FW&w@gpWvX>NFX9cJp3)%xs2HQ{kvk6H!mGbO4
sU@T>ag(gWYob{dqYIPti^ITAC3>/Ijr7x<8WQPJ0hZ4Qf3P9vK-:6v]e4c*oh3gtSsla.h
?kw<xg*i9?#V@W6>ACO?h%29Y74z2-jxZaD[N+yn]@QjbTH0M.iC0@tAgVKq}%5h6pEh*ph
1@78e^6orCqP/969Ox0{A+sLj@/mfDiu!!B*7e-]}kIA+NE.vVpd=..[K/4mkppjf[1i*$-
bQWTP/yBE(SyBpV$iv3J9hCnu$gAnKbiW!HEx:CR&Bm:tVq!9yFz^)g3kX$vGvqC{aQq8yI
p1^U8I13h^uM9y[>q}9dN]xTfI07>*m=Q4l.bR7K5)h=U!-M:gv.QeR7.d9}?I]7{sLr8>4
2]IOrX56+z1&:L@%g%KoLF^bG&.cFcwD]Tds846!K}7xV1<$JB7m]{jB}z-DH4/tEFA-ho(
fipKGxD<J]!*BCrsiD2/%Pw3G%t)U*q?vwf]oA.eMk[T1cx.kLC#Nw&.2/8]rlG{k62GMjK
TcP%a<I*H!Q>W^KQxzLM%Q%ld7rYOgBDmkvYWd$4#8=q44OS8[<<C^%[y99Lf-*JqgC?RI>
oZpc3@D1vDW(eLl5k@p>^lpa6%iytXVi57ym00000qUC.400005+%B^z
------ END PCP SECRET KEY ------

View File

@@ -1,6 +1,6 @@
bartid = 0x45AE802C2C338179
bartserial = 0x7F7EF76B
idbobby = 0x78FBD073AC12DDDC
idalicia = 0x7A96E7F11E3A92FC
bartid = 0x1AAAC77510D883C9
bartserial = 0xD716902C
idbobby = 0xFFA4A7BBD49C6181
idalicia = 0x82BE660E56313C52
mailbobby = bobby@local
mailalicia = alicia@local

View File

@@ -1,33 +1,33 @@
size_t secret_a_len = 32;
unsigned char secret_a[32] = {
0x28, 0xad, 0x6c, 0x7d, 0x37, 0x6b, 0xf9, 0x83,
0x9f, 0x0b, 0x95, 0xff, 0xd5, 0xbc, 0x56, 0x7e,
0x81, 0xa3, 0x11, 0x75, 0x3f, 0x94, 0x31, 0xb9,
0x98, 0x04, 0x81, 0xe3, 0xa4, 0xfd, 0xdb, 0x55
0x18, 0x6e, 0xa4, 0xc4, 0x57, 0x0b, 0xdf, 0x21,
0x46, 0xcf, 0x75, 0xd1, 0xad, 0x44, 0xe9, 0xa2,
0x98, 0x06, 0xa3, 0xe5, 0xfe, 0x51, 0x02, 0xcd,
0xe6, 0x8f, 0x08, 0xa0, 0xb3, 0x25, 0xb7, 0x65
};
size_t public_a_len = 32;
unsigned char public_a[32] = {
0x0c, 0x32, 0x80, 0xd9, 0xc5, 0x72, 0xd5, 0x3d,
0x22, 0x25, 0x92, 0x8a, 0x46, 0xab, 0xe3, 0x88,
0x71, 0x30, 0x48, 0x1a, 0xa1, 0x47, 0x36, 0xe9,
0xba, 0x7f, 0x58, 0x97, 0x7c, 0x69, 0xe3, 0x72
0x7c, 0xad, 0x50, 0xbc, 0x22, 0x47, 0x13, 0x40,
0xb9, 0xb0, 0xf4, 0x95, 0xad, 0xa4, 0x5c, 0x5f,
0xb9, 0x94, 0x4f, 0x93, 0xae, 0xf0, 0x08, 0x5e,
0xda, 0x9f, 0x32, 0x4e, 0xed, 0x11, 0x67, 0x5e
};
size_t secret_b_len = 32;
unsigned char secret_b[32] = {
0x50, 0xf3, 0xa8, 0xb4, 0x3b, 0xbb, 0x83, 0x75,
0x81, 0x50, 0xb2, 0x51, 0x2b, 0xcd, 0xce, 0x63,
0x96, 0x6e, 0xbe, 0x6a, 0x91, 0x39, 0xf2, 0x3f,
0x70, 0xe1, 0x72, 0xdf, 0xac, 0xf4, 0xe7, 0x61
0x78, 0x6a, 0xe1, 0xea, 0x51, 0x9f, 0xfc, 0xfb,
0xaa, 0xaf, 0xca, 0x46, 0xc2, 0x5d, 0x78, 0x8e,
0x8b, 0x1a, 0x6e, 0xd5, 0xe4, 0xdf, 0x5f, 0xba,
0x13, 0xc4, 0xc4, 0xc4, 0x3d, 0xb5, 0xb7, 0x66
};
size_t public_b_len = 32;
unsigned char public_b[32] = {
0x4e, 0x47, 0x89, 0x91, 0x2f, 0x69, 0x30, 0x6c,
0x0f, 0x0d, 0xf3, 0xb6, 0xa5, 0x52, 0xe1, 0xff,
0x55, 0x8d, 0x2e, 0x52, 0x88, 0x58, 0x60, 0x6a,
0x0f, 0x19, 0x40, 0xf1, 0x0d, 0xa1, 0xe9, 0x30
0x2d, 0xf3, 0xfc, 0x59, 0x65, 0xf8, 0xd9, 0xc4,
0x50, 0x65, 0x68, 0x24, 0x5e, 0x64, 0x4d, 0xa5,
0x3b, 0x23, 0x77, 0x3e, 0x00, 0xde, 0xe6, 0x7a,
0x27, 0x53, 0x28, 0x7e, 0x96, 0x31, 0xe4, 0x3c
};
size_t message_len = 12;
@@ -38,16 +38,16 @@ unsigned char message[12] = {
size_t nonce_len = 24;
unsigned char nonce[24] = {
0xc6, 0x26, 0x8c, 0xa8, 0x17, 0xb3, 0xb4, 0x99,
0x14, 0x12, 0x30, 0xd1, 0x11, 0x93, 0x36, 0x09,
0xe0, 0xb7, 0x3f, 0x16, 0xe0, 0xd1, 0x0c, 0x0d
0xc4, 0x20, 0x58, 0x86, 0x7d, 0x01, 0x26, 0xc4,
0x8e, 0xe5, 0xfe, 0xdb, 0x4a, 0xcc, 0x86, 0x27,
0x8b, 0xf9, 0x32, 0x7e, 0x2d, 0x4d, 0xbb, 0x52
};
size_t cipher_len = 28;
unsigned char cipher[28] = {
0x90, 0x9d, 0x75, 0xfb, 0xb2, 0xb1, 0x8b, 0x3e,
0x39, 0x56, 0xd3, 0x4a, 0x69, 0x52, 0xf8, 0x2f,
0x12, 0xb2, 0x4e, 0x32, 0x3f, 0x4e, 0xa4, 0x45,
0xb6, 0x5d, 0x16, 0x80
0xc9, 0x4f, 0x63, 0xb0, 0x1b, 0xbe, 0x94, 0x71,
0xda, 0x35, 0x4e, 0xd7, 0x0d, 0xd7, 0x83, 0x8a,
0x07, 0x92, 0xb0, 0x8f, 0x9b, 0xa6, 0x69, 0x94,
0xeb, 0xd9, 0x4e, 0x0a
};

View File

@@ -123,12 +123,13 @@ dxmorg@florida.cops.gov
cmd = $pcp -t -I unknown3
expect = /empty/
</test>
/*
temporarily disabled
<test check-determine-encrypted-file>
cmd = $pcp -t -I unknown4
expect = /encrypted/
</test>
*/
#
# encryption tests
<test check-crypto-alicia-init>
@@ -399,12 +400,6 @@ dxmorg@florida.cops.gov
expect = /secret key contained in key seems to be empty/
</test>
<test check-testkey-wrong-serial>
cmd = $pcp -V $vault -S -I testkey-wrong-serial
# sometimes the created key is invalid in another way
expect = /(invalid serial number|could not decode input)/
</test>
<test check-testkey-wrong-type>
cmd = $pcp -V $vault -S -I testkey-wrong-type
expect = /key type is not SECRET/
@@ -423,11 +418,6 @@ dxmorg@florida.cops.gov
expect = /(invalid key id|could not decode input)/
</test>
<test check-testpubkey-wrong-serial>
cmd = $pcp -V $vault -P -I testpubkey-wrong-serial
expect = /invalid serial number/
</test>
<test check-testpubkey-wrong-type>
cmd = $pcp -V $vault -P -I testpubkey-wrong-type
expect = /key type is not PUBLIC/

View File

@@ -1,11 +1,11 @@
1fqYjUMAgr%2@iuii(D6ORTB?v(#o}0-]/?noP(Cu>@:wrG!(hj%NXd(>&p{kTvPy:Fh%J[
4Qog7Dc3!/Ilc(zddr)0l]IzRC9e9N-I-cH2Pvg5=xGaV%0x0Jm=?KlJ/IxMB/fJxxlCJ}*
E@rCfTDUlX0SE:-<h?T@fBHl5:O?2-B#/!pxanEZI2l9@mW{.!HQVD7C5$SMnz#zWkeg0J$
pDyz^Oa1^3(z{leQP+SXJC+]:[3O}-<B0jI7nm$yVh=:ch/mT1Q[DP]PqHoXE)xzaB[UyQH
tsI*%r^uK5<<A@#dTA&8Frn+CY/w*qVBJH1qnn6Tv7PP%$c{EET!0jh^dUJp@Syoyk^uzaR
*Q9SWY^*H@X*=em^I^5uulJ#)M&z4)?syLpdN#S0f2wq}zFrW0vqYQvy&r/(yYF@:7$[by]
rf[{>97Lcp2dWcQ5@<OmWCOpm@M.hB}zmanaJj27V<TilxIgH{#Vc:YsP.-{d3Fp!?>U?0c
9@rbY)(/I.=TH5d178sKFH7UvFpIhwP8w?UHM21-uxbJ}I45(zIN=kdftEhh#lzq@!#X/YQ
LJyRVsb8Zg7oTfPe0e1cEX?cPLOo:Kb}NtGC0ZYypu:[=ft37EcvY1FiOJW3wKzefr6QtC3
.rpBO?&I!F+z10[hcITb9i]DgWegaluND+y1ZOwbuK^^C@pgqBu+>o5un3/]FT/+O:p&xz}
5}{ooTKsQFh9<R/mkm7%gCy^Rmme)i0@@r308?O?cia2C1-7F)/z>)K
]r0nw:E[VrJKGwnS6XTra+f){ir[CfTrKgma8H{M1J*fhkN+Cty{DW=FY#=!ACNCfBrLZgr
so5c0Z0iqphaoRvqYPQ&>B?$q(var)qVr#8>cltT=SjfPWnUhD}QHrlxixo/4Mf&>qI<&i}
Y3{ZCT58*A#>awHW=xML+.LL.cI3xlrY^q}wH]^!b$Qx5CI[W$Z9CJNH)mzjorqWh>ALBY=
n*hzp6/GYDKk<lH^r]m2Gg4/!*mGcO{FvA(6F>Aw%Wu[9=s}GQPhHUs[G:!Lx%P&LCAdM?S
5%aT@e8n4>)tKuyyhM$R1!c9F:epakrajl24d@LRPKSorJvs9yQeo[Nmxm{%ewpx!ztc0Md
BDbfCCF{XSHDlAa/8LL??G(i=KVMa=[X:#E!@z^hru/p$x>qc&zE=1Gz!0i(022l^AUSQ6e
3pgk*PXzUi[k/(1Uve1:p=o*Gqqz4YM*U?8:)wRi4y/!i1O9.7n&zb2KEAP!#w##Av9$uVn
^#&JEG{Dt5<D<IjpUxe!$GhIIxV.fY<+ee>)vV2SH+R1u2BL?FhH{<ZwrQkJ@6I/>E#SQqX
>qF+E4O?EA0Azz9l^LXUX7VFu/Et?COC:cgTasgD1kmkE1Im2jWe8uy{Rg42C}j^>{99-<q
Da17YVgpWN^pH3lHIoaQNoIKVJU[6)7]P[VvB{1?YemSu4Y>5rVh}dXeup00k}9BWeauL#Z
p[NL1[HN9/iw@VEg^:nWmk)K(iwyHo00000qUC.600005m0(L5

View File

@@ -1,15 +1,15 @@
1fqYjUMAgr%2@iuii(D6ORTB?v(#o}0-]/?noP(Cu&XQ9^]ZWVx6Hboz[dH2uO)*O]&N5cU
FTgW})(0pJ$}.{rG!(hj%NXd(>&p{kTvPy:Fh%J[4Qog7Dc3!/z{/w2TCh)S[He(iY/Nfh%
S{()cl$-Ow[Z[3-+em.6>}}q><V}p}Ng4-YCR4B>NhMgSL}3keiBukDeZ<tJ!}tP2Bhol/U
fvwwz81xGv{jmMKRDO]?[mzZiwlJ7Z!fNW[e5fu+CipqLv7w!M.oeyC5^j-wU)Z)DlZ:MhJ
MRH@QzEj+srpMkHKHA2{-7BgCn/j2U-4OE+&t8Jc^U3WR7%8eUqg[r>rvN^1lw#:/mef/*U
70xuz:pg%TxfGJ9O>:0hzddr)0l]IzRC9e9N-I-cH2Pvg5=xGaV%0x0Jm=?KlJ/IxMB/fJx
xlCJ}*E@rCfTDUlX0SE:-<h?T@fBHl5:O?2-B#/!pxanEZI2l9@mW{.!HQVD7C5$SMnz#zW
keg0J$pDyz^Oa1^3(z{leQP+SXJC+]:[3O}-<B0jI7nm$yVh=:ch/mT1Q[DP]PqHoXE)xza
B[UyQHtsI*%r^uK5<<A@#dTA&8Frn+CY/w*qVBJH1qnn6Tv7PP%$c{EET!0jh^dUJp@Syoy
k^uzaR*Q9SWY^*H@X*=em^I^5uulJ#)M&z4)?syLpdN#S0f2wq}zFrW0vqYQvy&r/(yYF@:
7$[by]rf[{>97Lcp2dWcQ5@<OmWCOpm@M.hB}zmanaJj27V<TilxIgH{#Vc:YsP.-{d3Fp!
?>U?0c9@rbY)(/I.=TH5d178sKFH7UvFpIhwP8w?UHM21-uxbJ}I45(zIN=kdftEhh#lzq@
!#X/YQLJyRVsb8Zg7oTfPe0e1cEX?cPLOo:Kb}NtGC0ZYypu:[=ft37EcvY1FiOJW3wKzef
r6QtC3.rpBO?&I!F+z10[hcITb9i]DgWegaluND+y1ZOwbuK^^C@pgqBu+>o5un3/]FT/+O
:p&xz}5}{ooTKsQFh9<R/mkm7%gCy^Rmme)i0SSi208?O?cia2C1-7F)/z>)K
]r0nw:E[VrJKGwnS6XTra+f){ir[CfTrKgma8H{M07G-kT$@6UJwkMRaVd!AFbB>3Dto#po
T-lg*3BPA1J*fhkN+Cty{DW=FY#=!ACNCfBrLZgrso5c0Z0iq0a{H#Gn0!$vv>@QeHT6dvC
nGRBLJ<%HQo6U4]zzwskJ-/i?+y4w$:{(v}*Hh]CP0<jg96:Q9B.qix>]7Gn/qxuuy%jOEu
1Ecn+B-ep5G1e:O<<MV3H!iR.[S!FQP/3ka0gU-K.cgP>*P>s6dBhJ6!YAz+D>vFJ}{.NDf
:?ha2cTo)#Sjo(v7b6U)JThbfsF:9ffdlwI@]AqQ!*>vHSklkiR15>N3^DEO(N).wis1?!D
/dLF+mpY%yu+^iqphaoRvqYPQ&>B?$q(var)qVr#8>cltT=SjfPWnUhD}QHrlxixo/4Mf&>
qI<&i}Y3{ZCT58*A#>awHW=xML+.LL.cI3xlrY^q}wH]^!b$Qx5CI[W$Z9CJNH)mzjorqWh
>ALBY=n*hzp6/GYDKk<lH^r]m2Gg4/!*mGcO{FvA(6F>Aw%Wu[9=s}GQPhHUs[G:!Lx%P&L
CAdM?S5%aT@e8n4>)tKuyyhM$R1!c9F:epakrajl24d@LRPKSorJvs9yQeo[Nmxm{%ewpx!
ztc0MdBDbfCCF{XSHDlAa/8LL??G(i=KVMa=[X:#E!@z^hru/p$x>qc&zE=1Gz!0i(022l^
AUSQ6e3pgk*PXzUi[k/(1Uve1:p=o*Gqqz4YM*U?8:)wRi4y/!i1O9.7n&zb2KEAP!#w##A
v9$uVn^#&JEG{Dt5<D<IjpUxe!$GhIIxV.fY<+ee>)vV2SH+R1u2BL?FhH{<ZwrQkJ@6I/>
E#SQqX>qF+E4O?EA0Azz9l^LXUX7VFu/Et?COC:cgTasgD1kmkE1Im2jWe8uy{Rg42C}j^>
{99-<qDa17YVgpWN^pH3lHIoaQNoIKVJU[6)7]P[VvB{1?YemSu4Y>5rVh}dXeup00k}9BW
eauL#Zp[NL1[HN9/iw@VEg^:nWmk)K(iwyHn00000qUC.600005m0(L5

View File

@@ -1,2 +1,2 @@
0Ji3}dGK/Q*@=EAXCkzw)M9pdfSm9+xZZX]Bt9K$%cTFQ8EUj3pK(}T6aYdesz#XiCvFwdj
M0N)yB]@2g)T-EmJZ10wjEkV>u&/v
<1B><>[t<>ޮ<EFBFBD><>ڵ<1C>^
l<EFBFBD>,t><3E>aHf\<5C>|T<>MO<4D><4F>܋<EFBFBD>

View File

@@ -1,2 +1,2 @@
15H8sSn+vmg.g0JlKFtJg%P3OYMOCt7NAgDR%zP]xY33$zKh$mqrCsdce)7NO[+60NK:^OW
$G-:j&Cwk3o7mhhBPL]f!(9Mk@*X&lJv8^000000000008?O?c&:kE0SSi200000
blah
nacl-<2D><>+fE6˲G<CBB2><47><EFBFBD><EFBFBD>Ӛ4G<34><47>&i<>g<><67>/<2F>_<EFBFBD><5F>׏<>el$<24><><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD>B <0B>`r<><72> <09>0~<7E><><05><><EFBFBD>:'<27>n(hg<68><67><EFBFBD><EFBFBD>k<EFBFBD>nnjj<6A>DF<44><06><><EFBFBD><EFBFBD>x+`4>Q<><51>PA<1C>%<25>`<60><> <20><>]W<>PK<50><14><><EFBFBD><05>X