fit latest changes

tests/bart.pub

@@ -1,8 +1,9 @@
 ----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----
-22=cP^iizk/S(7@mlSgf@6nh%u@zErhpi[-k6q<YR.>jn6%ok*g5#O]e.QB3MuuWrixpn12
-2n4nKEzxTj8xsVxIq[Zy?5q0?AVs^G$%P8DW#AkLv6l5E6vUi0R*9FJb5Cobo^9)000040-
-GZL^eTdD1oRS{qbEq[00AQc]heu+000Gy00SAaB7GxavqD(T=>lrU01xRx1POWzCwZ#jlsB
-[R0000i6Awmo3t<i=y*{*[Bu<UXv{%fN0003s0b@::z?jG/>x*3M*i@UAy.o5#svC=hxAbY
-xhb5hzpC7b6=IE5cD9H@b!fWP{2pbLNtYH8+-n0Yj=vzBX2T>[lMq-q5i*2l)PdG:BIPA2B
-D4^a6a@jiPj@$B.!^!{]aAy))63hk{cXx}mn51fTD6^]V{p9p-sQ6ahG-z8M
+1][S608)M?oD<3BoQn[bA5Y.x9f]x:Sl$G(amCxNK9.4<AUVAh{bC%Q]WXHAI.e)OD][P?h
+RA(gmAjC2{VkI%*03%1StS$-h(D2UHwzzKk4AXcEba29&08a-jh/<LL?u)GH!4K*bo^9)00
+0080SSi208)M?o-Ld[2M>5b0031<ZrDST00&(h00010nXSyG000Gy00SAaB7GxavqIGS)#E
+CG01xRx1POWzCwZ#jlsB[R0000i6Awmo3t<i=y*{*[Bu<UXv{%fN0003s01TKGP}7W&50b}
+O1++lYGAq>t3nfctQ1tNuPtmJ!({r/O&2P[Ma]).MjeakB/faP7m3/ey.XHv1?:eZv50}CB
+(iTB/MG}TKO4u}S(-J6mn2RAhRj6<-3-7Ci60-ig!G-tkF/-eD:(9chVwfOyWVna[k6&C6y
+0Mdk@qV/$
 ----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/cpptest.cpp

@@ -51,11 +51,13 @@ void test0(PcpContext &ptx) {
   CIPHER = _openwr("testcpcipher", ptx);
   CLEAR = _openrd("testcppclear", ptx);
 
+  cerr << "A=>B encrypt using " << PB.get_id() << endl;
   if(A2B.encrypt(CLEAR, CIPHER, false)) {
 
     CIPHER = _openrd("testcpcipher", ptx);
     DECRYPTED = _openwr("testcppdecrypted", ptx);
 
+    cerr << "B=>A decrypt using " << PA.get_id() << endl;
     if(B2A.decrypt(CIPHER, DECRYPTED, false)) {
 
       DECRYPTED = _openrd("testcppdecrypted", ptx);
@@ -151,9 +153,9 @@ void test4() {
   }
 
   if(b.size() == 32 * 10)
-    cout << "3 ok" << endl;
+    cout << "4 ok" << endl;
   else
-    cout << "3 failed" << endl;
+    cout << "4 failed" << endl;
 }
 
 int main(int argc, char **argv) {
@@ -192,5 +194,8 @@ int main(int argc, char **argv) {
   catch (pcp::exception &E) {
     cerr << "Catched exception: " << E.what() << endl;
   }
+
+  ptx.done();
+
   return 0;
 }

tests/key-alicia-pub

@@ -1,8 +1,9 @@
 ----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----
-22=cP=lrd7n!C:!XGq^$9<CK>Y}+=ZwmlP)g)@xo9^e/o*Inh/D$%Byb76oY5FWb{*A)%P+
-)ZLI]woam72W7o+2/0jlexvmVD$M@D@AkVO{ifxYN+3nlzTKbo^om]kmdAkbo^9)000040-
-GZL=J0}B1oRS{qbme(00AQc]hel.000Gy00SAaB7GxavqF>%B3xT801P+z1PO:BCwZ#jl2p
-mBx<*#w02caE1on<EvqfK^y?Wx[vl!TEv{%fN0003s0oJoQH4mRgO=rD%ZM>6]>5bo+9J*O
-AOZK#pb[R/]4Ioj#%g-^K&wXGZo%RVL-krtAo2KlE5+mZwVYEq42qBn%fbgnj!xKjo0K]]z
-f!ons/5<$-FV9)<fSBp:2u):0FbRZqnojp3Io^LJ+EI%!!Q%NGCS[jr<.PP@[=eT&
+1][S608)M?n*eqKkH?l++@(u0.LHh*tkldO3Ihr{AcL}WsD*kTjhV:vP:(GSDY*}tc!*NG*
+#^{JV%!mWkveUa-b#Br5[]X)U+1=UkFl)HHU8Hx+h?Y12&mZs}/PGIT{c3xWK81%bo^9)00
+0080SSi208)M?n=O?>2M>5b0031<ZrcAQ00&(h00010nXSsE000Gy00SAaB7GxavqJ]t!.{
+Gd01P+z1PO:BCwZ#jl2pmBx<*#w02caE1on<EvqfK^y?Wx[vl!TEv{%fN0003s08B.BcYFb
+*5S0QQCzg!q&?l.40Rb#mQY?F>rbYic]}e8iE#EyH5pAv+q3(o0KRay}KED($B1D03v+85y
+59qPN[EyDzWq<i?4!8dGJ.o<$8k2YeMuH^[E6nS/SqC%R/yM+Yo=Vu*Wd(46YjiGKKM#]b&
+X4$Vd7Nk-W/uyd
 ----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/key-alicia-sec

@@ -1,8 +1,8 @@
 ----- BEGIN ED25519-CURVE29915 PRIVATE KEY -----
-2?zCUY*E>8w-Tb=o8lvmo/rgn8B)7/d->8iP(}dS8:{t5uV@rp9F0MYzVSgf}Gc634x[9-.
-POiO2U@x?M.]-wh&(AZs/?fl+9VjZ6rG[83B{R2ea46qKluMru0Y69SJEhRMiQ->e)O(^+a
-D[o:v+-Ar6pN14lCcuT^z@-+<ea^?:3D*Oq6qXer}iNor84ukt:Bt*eZ?$<v=3dIh[nHT7&
-+SfiHBlqQhq{N@<YDw=</3:2b>sc1ThHsoyM@g3Kq2CcBV7mfCQku]hBJ]6[dc[15h([VK/
-vbO}-9sLnK8<qMH3s?AaB(<Osda.l=qiqAbi8%Zb7mi84plx]UXq2=I]dtS6b/Dz!bs+$@V
-YG8u}Vd[:iYK9VKFam{:juJ^0*TWOg%5!^Z+2a>)7$d.?ktw>dV:@TF*&.zW3a*fq
+5u%W6TXtCe8k^+2Y]Ov7koRK.YAroCq[EmPF[K?P7CtUefzQ=N.Jxt99?IBqLU(abi3Lgt}
++$&lBkEf>bPS.6XWm&6WVVp(KQgNKyiPobLty-BijM[$4knaVW=R*6cHK/TZq7!DYcq?jH0
+Wp:+clTXG.Cly<^]Y2:fyuT25j6uS{gucVJt[pO4:B*M/a-2PnrkuL]/ylISU(H!4X9@HI6
+^5nhIO}SC)i#rsn8J&g0>3^-$8C5+[{VdJO$wKOUB9&j>h4B=>{PW<<-9T.eyu4muM]sy*9
+g3H)}CAPe5eV8O:.h1FBx&YEw{j98mlAbD:XZBTcNM)aAD=jNM+4HK]..A?rCums*Jl6mDa
+Fz7)/3cn$mJuK85&GqKB1yxBT13QamcJ:3Z68wpUNIOVZ8MG^:g&}50A-Mq5z$<qj
 ----- END ED25519-CURVE29915 PRIVATE KEY -----

tests/key-bobby-pub

@@ -1,8 +1,9 @@
 ----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----
-22=cP=MQ@$kcRI7M[87Bi==H8)/6i=N4ii}CC6f1>{n#*c$?20!?rH/53vrzKE7yrSPozm?
-f{MwT-aHF0Mf)!G9ru!SWUY%EnzqN/*RW0rYJpZs4W4+fdpxm/}VwG9!1bibo^9)000040-
-GZL=&s4C1oRS{qbvk)00AQc]heo-000Gy00SAaB7GxavqLXYcBr:M01GXy1POZACwZ#jlt{
-sxC(N*A6bgAH01iTLx(4l%vQ:QFy&r/(yYBCn0uh1IMK+J*Y9:&N>]?bs[A(E<S/xr7-#)[
-HrH-:{W42?DJxl/@+p3B%>rLawU^uC6AN8aYdY+YLx%v&Jwf?Fc{SdDtM)SQ!TKSP?+9#Xz
-]YmYNEeK=yWu^5p.!!gxhWZ[.vlJFb)%iL&FvJ*/&#yG:dAKBY0Y7UdjTiM0
+1][S608)M?ocD^MIYWu4O02j^^^{jxl]&BnaC8?@Nxg1HY5^nBUEKrq&*.x.!!Hfxh*bz81
+i(UN7@yB&ZBQz+BXG]KmpAk4u^y7}wnh?abgr!xFtiJaaOry#}Q2cd(}HmES-Pozbo^9)00
+0080SSi208)M?o8[}(2M>5b0031<ZrlGR00&(h00010nXSvF000Gy00SAaB7GxavqDG^w9:
+f}01GXy1POZACwZ#jlt{sxC(N*A6bgAH01iTLx(4l%vQ:QFy&r/(yYBCn0uh1PE:!(ia(}o
+Vmt*m9ZW@+sQ:^O6HV][YFXlN}V!4Eh+CvGxiJO7W463t7CaCy9d0g6[)&OyerHo)UFm]fj
+}2MxCbxJ(o-+KnLr2MFF*)E<&TjmGqD}>rWY$%*#E{0F$@^c&])9EKG@Gj:2c3jKx9zgD.]
+j)u?@cwCB
 ----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/key-bobby-sec

@@ -1,8 +1,8 @@
 ----- BEGIN ED25519-CURVE29915 PRIVATE KEY -----
-S^GIheT!sgshqj^LryKM]Y7vR@.o(u6[%F7(He@*uc(2<Cd3LR7WbRF+{S(=h$Bv}X3q^xf
-<ERpa{l>%5kjiz*pd^A}^(8Q/f2^l*SJ@IGsq#{M7pZvDry*NrYj7qAE+?tAxv62smKN/=4
-P^n<f1pb=b%}[B)W>)3zfJ+:u3/)((]zF/8Bk82}TwRjx3uSMoV8lNA6yi][L4[(TU56VZi
-8Inn$F2jF-qDee{q}p3E<XvyrPm&J}=K)$bEfUPBras[YLIp5K6aXE0RRVicVv/wwXR8Ls/
-Zy%xE3yr>0b{W^2%r?8zSFfXj[?&bXJ6)]@^qlM)w)kH+@ejn+$]vh(92L9EW&Ny(R=+/r2
-ej.gJ(1ll3+D5m&KQyEkC+W{vn!u>1+6rNd1Yv$%+z0#d!J3:lC-hASAA9JS
+=OJ[EglpH!]AK8Wtm$+L/kTBGSr&YBRl3$rmsD}>O6YmJW-(WevNA7]]J{5ii1.Q.r1[lp)
+z5*9uKH&3b*DlG:?T4OHyLp@gSOfDHGCU*&Ph8KYeY#-=zg}d=08p$VPh1%@^RZj8B7LS^/
+wU]vOz%DJKO&kEN)-V1tP=+1/L$HJ/*lf:t[FybaBR62.WG+Fi/E=8Iu}D0%UL?8q3N8lUx
+$uktDv.2{hi[oxl#ajyrcaP5:CC0$H:Qo]ti10rO-6{MJ9SLmh$i3RwIlem8[hrB8-b=[[&
+q8HAEvfoJG+DETVCC>DZuxKHkP[19DRTkL3.aC}{WhapK4awVY(JgwruXppNjVHdUU2)z!)
+cy?oCdI/1SnJx9f+X<x&o<0%K[->>8evejVbWfX]X%1k-fBe:Qh1L3^m[KD5
 ----- END ED25519-CURVE29915 PRIVATE KEY -----

tests/keys.cfg

@@ -1,6 +1,6 @@
-bartid = 0x4EF5795E2874AD8D
-bartserial = 0x1B4ED012
-idbobby  = 0x969D5931D7B409C6
-idalicia = 0x629AFD2418EFA3BA
+bartid = 0xB389A718C85E3A64
+bartserial = 0x9D75EF8F
+idbobby  = 0x1B0B4712982982C8
+idalicia = 0x32092E3EDBA01044
 mailbobby = bobby@local
 mailalicia = alicia@local

tests/static.h

@@ -1,33 +1,33 @@
 size_t secret_a_len = 32;
 unsigned char secret_a[32] = {
-0xd0, 0xb0, 0x71, 0x2c, 0x3f, 0x08, 0xc2, 0x74, 
-0x55, 0x72, 0x32, 0xb0, 0x12, 0x9b, 0x5b, 0x88, 
-0x96, 0x38, 0xf8, 0xa4, 0xca, 0x4b, 0x0f, 0xc5, 
-0x0c, 0xd0, 0xd1, 0xd7, 0xbe, 0x83, 0x31, 0x75
+0x88, 0x7c, 0x08, 0x37, 0xed, 0x3b, 0x72, 0x0f, 
+0x5c, 0xc1, 0x1c, 0x83, 0xe4, 0x04, 0xbe, 0xca, 
+0xff, 0x23, 0x7c, 0x32, 0xf3, 0x2b, 0x03, 0x9c, 
+0x6e, 0x1c, 0xd5, 0xdb, 0x19, 0x3b, 0x3a, 0x5b
 };
 
 size_t public_a_len = 32;
 unsigned char public_a[32] = {
-0xdd, 0x1a, 0xc0, 0xcf, 0xb2, 0xb9, 0x69, 0x7b, 
-0x60, 0x31, 0x98, 0x12, 0x9e, 0xe4, 0x5c, 0x6e, 
-0x3b, 0xe4, 0x91, 0x98, 0x26, 0x67, 0xd4, 0x75, 
-0xb7, 0x2f, 0xb3, 0xdf, 0xb6, 0x9d, 0x0a, 0x60
+0x7a, 0xa9, 0x18, 0x30, 0xf1, 0xab, 0xca, 0x88, 
+0x14, 0x7b, 0x72, 0x8a, 0x4f, 0xc0, 0x09, 0x37, 
+0xa6, 0xd6, 0x74, 0x24, 0xc5, 0x06, 0x5f, 0x5a, 
+0xf7, 0x15, 0x0c, 0xb7, 0x2c, 0x0c, 0x45, 0x7a
 };
 
 size_t secret_b_len = 32;
 unsigned char secret_b[32] = {
-0x18, 0xc9, 0x0f, 0xcd, 0xa7, 0x76, 0x0a, 0x5b, 
-0xc2, 0x8a, 0x3a, 0x06, 0xf6, 0xfe, 0xbd, 0xbb, 
-0x7b, 0x99, 0x63, 0x4c, 0xf6, 0x5e, 0xf8, 0x2c, 
-0x1e, 0x53, 0x16, 0x2e, 0x75, 0xba, 0x16, 0x53
+0x28, 0x19, 0x3f, 0x07, 0x66, 0xc8, 0x1c, 0x60, 
+0xf5, 0x56, 0x48, 0xa2, 0x8e, 0x74, 0xd1, 0x0c, 
+0xe6, 0x9f, 0x16, 0x06, 0x9b, 0x04, 0x6d, 0xe9, 
+0x0f, 0x7c, 0x2a, 0x36, 0xee, 0xad, 0xb4, 0x59
 };
 
 size_t public_b_len = 32;
 unsigned char public_b[32] = {
-0x70, 0xb6, 0xe2, 0x75, 0x4d, 0x30, 0x3f, 0xef, 
-0x01, 0xd8, 0xfe, 0xe2, 0x83, 0x62, 0xda, 0x8f, 
-0x53, 0xb2, 0x35, 0xa6, 0x23, 0x39, 0xca, 0x3c, 
-0xb9, 0x81, 0x34, 0x2b, 0x5f, 0x5b, 0xe8, 0x45
+0x62, 0xa7, 0xad, 0xce, 0x41, 0x45, 0x49, 0x5e, 
+0xc9, 0xb0, 0xe9, 0xc9, 0x45, 0x82, 0x79, 0x9e, 
+0x47, 0x1b, 0x71, 0x7c, 0xbd, 0x2d, 0xda, 0x8d, 
+0x8a, 0xb8, 0xc5, 0x5e, 0x14, 0x2d, 0x35, 0x7e
 };
 
 size_t message_len = 12;
@@ -38,16 +38,16 @@ unsigned char message[12] = {
 
 size_t nonce_len = 24;
 unsigned char nonce[24] = {
-0x1f, 0x54, 0xb8, 0x13, 0x86, 0x6c, 0xc4, 0x8b, 
-0xd1, 0x92, 0x27, 0x5e, 0x40, 0xc2, 0x91, 0x2a, 
-0x96, 0x1a, 0xed, 0x57, 0xa1, 0xda, 0xcd, 0x41
+0xa6, 0x53, 0x14, 0x2a, 0x7c, 0x31, 0x53, 0xc9, 
+0xcb, 0x44, 0x83, 0x1e, 0xf3, 0x15, 0xa5, 0x81, 
+0x2b, 0x1f, 0x10, 0xb6, 0x31, 0x68, 0x2c, 0x88
 };
 
 size_t cipher_len = 28;
 unsigned char cipher[28] = {
-0xca, 0x76, 0xac, 0x81, 0x94, 0x06, 0x52, 0x45, 
-0x5e, 0xa6, 0x15, 0xd5, 0xda, 0x5a, 0xef, 0xf9, 
-0x7b, 0x32, 0x2c, 0x5d, 0x7d, 0x3d, 0xd5, 0x3a, 
-0xba, 0x03, 0x67, 0x73
+0x7a, 0x4f, 0x59, 0x9b, 0x27, 0x3c, 0x22, 0x6c, 
+0x5f, 0x25, 0xd0, 0x01, 0x17, 0x61, 0x6e, 0x6c, 
+0xf0, 0x62, 0x0c, 0x81, 0x6c, 0x58, 0x57, 0x2b, 
+0x0b, 0x38, 0x48, 0x12
 };
 

tests/unittests.cfg

@@ -332,6 +332,10 @@ temporarily disabled
   cmd = $pcp -V vb -c -d -I testsig -x b
   expect = /Verified/s
 </test>
+<test check-verify-decrypt-from-alicia-determine>
+  cmd = $pcp -V vb -d -I testsig -x b
+  expect = /Verified/s
+</test>
 
 #
 # yaml export test

tests/unknown1

@@ -1,8 +1,9 @@
 ----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----
-22=cP^JFY@k?PU>bli}YJqFx*f&5(&p]*s$+m?0k>MX[/@M?w(&Jj&%XwQuNd@xjgj0E:5f
-a+QYbckn^v%JYx?zn!?r6s=^[YD=@=&tdePs33mqP?27*z[G7D?AZ=K#-Q=bo^9)000040-
-GZL^F%mE1oRS{qbNw]00AQc]hex=000Gy00SAaB7GxavqF-?7ovGo01Y?A1PO^CCwZ#jpha
-oRvqYPQ000-F00Aohzddc{zFrW0vqYQvy&r/(yYBCn0uh1/YcqT!v.kt618SvO+4etVdRS:
-R?.g@uS82E}:k@-9.%zQ?.(#NDzTXmy2>kX4H$!/3lCchFQ:<O].}1@703Tk=u6Bzj^ccgr
-Y/Zwmx%vl-GrSE:sENwTADx%TJ!9NHC^3)uSW.Y+Cf%#!oL6jjI[0Y[+rtrl<1]u*
+1][S608)M?o^bg=DTHr&HDQ5Mh#oh$WhV!KxwM}<9O<?nhj1eRZ=ih*2ZasEg=/(#lC}GnB
+3mCFxO.KVo3No)A4:e<oy}H-iAXt4i]SyR7O!G&einwun9dW.@m-}(>G&*Ls26^#bo^9)00
+0080SSi208)M?p5>m]2M>5b0031<ZrMYU00&(h00010nXSBH000Gy00SAaB7GxavqDD15([
+#j01Y?A1PO^CCwZ#jphaoRvqYPQ000-F00Aohzddc{zFrW0vqYQvy&r/(yYBCn0uh3ncv:q
+amE.-Ce{OV2w:{/F65Nh#h0nM9i/iHLWG+rRzO2(2m@Q2RDnPBI^Jk4xC7:jGEe]kk[>Y3-
+jKBN$o)!WM2@+zcuO?{a.G[ioHP^t4MHXKS=uFuFPAZ^l]VC3byZ{nY*sYGvW:rZ(zRb-E0
+a3X57iYnuonC?k
 ----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/unknown2

@@ -1,8 +1,8 @@
 ----- BEGIN ED25519-CURVE29915 PRIVATE KEY -----
-e/x3zay4]W1sjBNZ^>rtpjy&2>%u3*(rRZ<DnKf9@/mu<Sv-4+seR:$/ILZe+eWPE][/g*j
-{KR4<jE.&20rl[>oSUGJjv>.C3J92f(9q9st5Ul*y^1jzS.dxMTgkN3u)D+6Vq/DwI(6.H^
-Gy+I&&=*4G9zD.ywRMkk[[[S^QiXSgQ$&l[^w{Z41$[9NwxiR0XISj0RH&qnJoPu96m3eaT
-odtIGYU.U36qL5=bU00rQnSJ.3cQcx&GgIAWeMO0>$/-kTyw1C*cYd-bX)^Qjr)Bw(?@VD%
-z.2DH)v3yJ/<LqM-D??RX:u[E+2ue?+S09Xu6q6jQhsR1f{3YT.=75k7T?!oI.NQtMjUDbg
-jGsn<>$Bd[LlTg=wKp0w*&i]VZAcCpL3Zx8d{+CiGLeT:zgByrh2VxthFA)xj&A#(
+EP/%i!6ESr71u5+RyT8-CTsyS>ZYG@lX8CE87qJWszsUR@XW-}Z88Mk@!Yh[:Us:o=QUK[.
+K:#uxC68?fFU/iRhje]ZxCrrK]6L5G>IoYrmR&tnoMxC12EaeSGDWn[!<^a8&d}xxyNx$6^
+(Q4(@N?CtUYz{w(<aFsG%Kz>=aF^VD+Xf.Uz4=WseXMZ.srl}[=u8vUjlpT)VLI/<7K4bdr
+&i>3J^&=Q$H]6](BO-u{^tlzdv{/kCRgx}%h?sBHX^s^pDO&OLRZcY@VXSSrb%-#o]RX]1c
+3*xxx0@Dn)ND[5BL+fek-uztY{%dsUfxUjr!+u(kes$i]#dzZLOS?Y5Y:Bf-AN?/>+W6%AM
+b{AQ4vmV[:tFp#Vi]=I=hFke]lnTS.(I!YG(.ypG{]SRcB144m0kD5]Ne}H)f5)O3
 ----- END ED25519-CURVE29915 PRIVATE KEY -----

tests/unknown4

@@ -1 +1 @@
-7YQnZ?kK]LGI?Z4Yof:=q{igA@WHz5fwy*Hiv}wb)d-+*F*2Q=F9zm@ufg?Y
+7HzAIQmHj@B+wh@0m%9a.l+/hvKBi:QqeyL*%NRjALYqs]mk*xEy=D5[1ja<