modifications to match recent changes. that's just preparation of more changes towards PBP-Compatibility. Current state is UNSTABLE. See TODO for details whats left to do.

2025-12-17 03:50:57 +01:00 · 2014-01-19 23:58:53 +01:00
parent e20a0683c6
commit 05db2f1204
35 changed files with 1034 additions and 1843 deletions
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
--- a/tests/bart.pub
+++ b/tests/bart.pub
@@ -3,33 +3,33 @@
        Cipher: CURVE25519-ED25519-SALSA20-POLY1305
         Owner: Bart
          Mail: bart@local
-        Key-ID: 0xC8F4F6CD7CA2E952
-    Public-Key: 0$E&2YLiH[z:PMtYIbvdU-$NKXb1&w(x#NxV2^/OzVx+q
- Creation Time: 2014-01-16T15:23:18
-      Checksum: 5B:FC:E9:D2:0E:6E:FB:84:8A:99:12:47:FA:03:F2:8A
-                AE:53:C1:53:C8:72:14:67:94:62:E5:74:4B:A2:D5:8D
- Serial Number: 0xA106090E
-   Key Version: 0x00000004
+        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 Version: 0x00000005
 Random Art ID: +----------------+
+                |      . +=.     |
+                |       .o++     |
+                |        ...o.   |
+                |       .   +    |
+                |        o . .   |
+                |         .      |
+                |                |
                |                |
-                |         o      |
-                |        =       |
-                |     . = .      |
-                |      * o o     |
-                |       B .      |
-                |      + .       |
-                |     .          |
                +----------------+

-0$E&2YLiH[z:PMtYIbvdU-$NKXb1&w(x#NxV2^/Oz^1n/BwNkv=*4z7QuGvvK{n*i>D=+in
-V8Enhd=ll{+s5Bo4PJ>E0gi*mD%z182VHzP>abuT=DNmVn3}L9Am#uS*46f5%d2S*gU?qk
-nv1C+k-+.#oc4-.K]z!d^xJeflt{Wzd/T()R^Xxi#YrK3^V@gUY>0<3yM&wyy!sq/N=D<K^
-7DrolX!PfT%4DsG48*iU7niLHTq71U=rV1a>Ppa2OhKqNIlgtB={n0TiN>z9/U0VSM/lu5=
-Zx)xGG.u>%IdCgpe>zpl]o*{Jy9twHqeeY:]PfQ2[I][p=0(05Q-<QMkxm(^{Da?CFB4fcb
-W)Qx*u)-8E>6GQTD?[qBXK3(E+Xpno1O6B6qk#ZkZfq:0vQTq0kX$vGvqC]]Rj-vK]h${+q
-%JFk{mfDHPv>*6}Kl9:hK-=OC7*(O3+(4x:w%D=mTLVl}CoQOYWi&sJ=/z}PSLM>&u4sO-j
-X8o-LyX!dlLRG*2+Trjywulk!0jsUgkucG}.u=TfJvv?FR.BG[ef/!Xe16NnXs8BNJV]!HX
-9pYT1AxBs[^=e(o7Duaf-@T%}&L3#fPqL8wNT7WU$sb/I}Vc!(kiW/EgOtKk=(}GqAxM{=q
-(Irvm[!YdZUd*Dx=[7^(JKl+}=Pn{0Uw5yU]*?MWu{ra.!K:6X3Ks.kB9?Yt*bX<-Y.-A.^
-OnMv>(f4[gi7t.]hBx>>lQrE@iw&L(0@@r308?CmrSAa11FD2a4GDFe
+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
 ------ END PCP PUBLICKEY ------
--- a/tests/key-alicia-pub
+++ b/tests/key-alicia-pub
@@ -3,33 +3,33 @@
        Cipher: CURVE25519-ED25519-SALSA20-POLY1305
         Owner: Alicia
          Mail: alicia@local
-        Key-ID: 0xD65571D97AD62340
-    Public-Key: 1l04k^wOno{Gb/vuQ@vq^q=3h<mkwPg6au>[0lL#CMmZz
- Creation Time: 2014-01-16T15:23:17
-      Checksum: 74:02:7B:F0:14:A6:05:D4:01:C2:B1:65:8B:5A:97:97
-                CD:B6:8A:8F:32:A4:8C:40:B7:0C:28:C6:87:8D:28:F4
- Serial Number: 0x8F3E4F43
-   Key Version: 0x00000004
+        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 Version: 0x00000005
 Random Art ID: +----------------+
                |                |
                |                |
-                |        .       |
-                | .     + .      |
-                |. . . o + .     |
-                |.  . o o +      |
-                |. . . o . .     |
-                | . .            |
+                |            .   |
+                |       .   + +  |
+                |        o o + . |
+                |         o   .  |
+                |       .. ..  . |
+                |       .o...o.  |
                +----------------+

-1l04k^wOno{Gb/vuQ@vq^q=3h<mkwPg6au>[0lL#C*QCMc(0^V-{1V339HHb]:?T-F)}&&A
-n::om#4.IaWG{Uv}/uKG.c8VB$!TzGR$o(cxJ{Wd[.in&DkPZwBPVu>Yt>Q?TU0jq1P&y-K
-t/R).!(vf5jS6&8Vlf6*p7rKi767MvB=*-:sDy+NxI}(gG2=]pCV%d1$n.lFFa]t7J9PQ{3
->nZHNW0l(Srib%(INR!w.l^?}r=cq3DHlTj-FmkGd67@S@!41d^bV1OE}FbEfz/@?r3-@.4
-=YJ!]6Tf6Vu@bJ{c@zCJje:(y<ZEZb7a@NQ+u]}5Ra?Ju]c&4F2&:wwK+J8nJB9jxeltbaO
-GdZ]3(nlOZHdz9(T6(c:qo*#Tptw}.g5vBdWEL^W!2TDGvqGT/x<<nyz!0i(05/!N67=rFb
-2b<&j{YVd=aOHgnOC:.>0a+@pZ{MOW<nj?(nu=<hYeeSCYhp7mC#a@omS.>[-CpCHShNBOA
-:PxEvD^xauUrzZ9QvB7Fl2OM1h&FzWJ9m&S$7!eNnfJO2>oBH7iua7k@EZ=.RqE3HV9BAc9
-v+0{hpfRAA8@K]nwPMhI}eVPa(fRtZ@3?ugeUfyRd]^bYQ[?n>HxuuKLJTVrxpuf*ARnTLd
-Zj[O(>.7/g*mhTAqV-waQ8OG*?xR7W#/-SU=Zr$E>R:!c%8i2qF0>k>:E{Pb1ekc3ABHu0q
-xN3y9/NdE5hz)uJf*[2Xk$0Q^gC*==0@@r308?Cmrr9101DL-xlJv8^
+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
 ------ END PCP PUBLICKEY ------
--- a/tests/key-alicia-sec
+++ b/tests/key-alicia-sec
@@ -1,24 +1,24 @@
 ----- BEGIN PCP SECRET KEY -----
  Generated by: Pretty Curved Privacy Version 0.1.5
        Cipher: CURVE25519-ED25519-SALSA20-POLY1305
-        Key-ID: 0xD65571D97AD62340
- Creation Time: 2014-01-16T15:23:17
- Serial Number: 0x8F3E4F43
-   Key Version: 0x00000004
+        Key-ID: 0x7A96E7F11E3A92FC
+ Creation Time: 2014-01-19T19:23:31
+ Serial Number: 0xCCFEA718
+   Key Version: 0x00000005

-1l04k^wOno{Gb/vuQ@vq^q=3h<mkwPg6au>[0lL#CMuQ#cM6#o=Cetrqd&M@k[wLIgQ)#yy
-FdX9Mt2yIHTy3-c(0^V-{1V339HHb]:?T-F)}&&An::om#4.IaPQR]MAb/t+lzt.C!%=x:4
-mxD:gyP!x4DGUAM%4iVFMT@n/4W77]e0FJ3hgYClFiapHmY.NuDkO2*G3jIi2mlIj]]%ePl
-9#>r&w-u2Z@vA@C*hWyx16^t6JYORCl>hxTtsE(}ze>:.bxI0ybM]Klcam&uV0QLrJfBPB?
-0cQx<ArcEhY=G$Z7j//$N3S.H$0%fA4-7!fgcd8LsD]i}?7Eq>Kv}/uKG.c8VB$!TzGR$o(
-cxJ{Wd[.in&DkPZwBPVu>Yt>Q?TU0jq1P&y-Kt/R).!(vf5jS6&8Vlf6*p7rKi767MvB=*-
-:sDy+NxI}(gG2=]pCV%d1$n.lFFa]t7J9PQ{3>nZHNW0l(Srib%(INR!w.l^?}r=cq3DHlT
-j-FmkGd67@S@!41d^bV1OE}FbEfz/@?r3-@.4=YJ!]6Tf6Vu@bJ{c@zCJje:(y<ZEZb7a@N
-Q+u]}5Ra?Ju]c&4F2&:wwK+J8nJB9jxeltbaOGdZ]3(nlOZHdz9(T6(c:qo*#Tptw}.g5vB
-dWEL^W!2TDGvqGT/x<<nyz!0i(05/!N67=rFb2b<&j{YVd=aOHgnOC:.>0a+@pZ{MOW<nj?
-(nu=<hYeeSCYhp7mC#a@omS.>[-CpCHShNBOA:PxEvD^xauUrzZ9QvB7Fl2OM1h&FzWJ9m&
-S$7!eNnfJO2>oBH7iua7k@EZ=.RqE3HV9BAc9v+0{hpfRAA8@K]nwPMhI}eVPa(fRtZ@3?u
-geUfyRd]^bYQ[?n>HxuuKLJTVrxpuf*ARnTLdZj[O(>.7/g*mhTAqV-waQ8OG*?xR7W#/-S
-U=Zr$E>R:!c%8i2qF0>k>:E{Pb1ekc3ABHu0qxN3y9/NdE5hz)uJf*[2Xk$0Q^gC*==0rr9
-108?Cmrr9101DL-xlJv8^
+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
 ------ END PCP SECRET KEY ------
--- a/tests/key-bobby-pub
+++ b/tests/key-bobby-pub
@@ -3,33 +3,33 @@
        Cipher: CURVE25519-ED25519-SALSA20-POLY1305
         Owner: Bobby
          Mail: bobby@local
-        Key-ID: 0x7B8D298F82FE30FB
-    Public-Key: 1kwx=)3f<[z$G%dAyqGMDHiU1fk1E?ff{Beb>:DK0@@r3
- Creation Time: 2014-01-16T15:23:17
-      Checksum: 55:8C:D5:F8:E2:AD:BE:10:AA:AC:AD:21:DA:7D:57:37
-                49:82:60:BC:8E:9F:D5:E0:89:4E:E7:75:D7:9A:9F:A8
- Serial Number: 0x3B7D8E3F
-   Key Version: 0x00000004
+        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 Version: 0x00000005
 Random Art ID: +----------------+
-                |       .+       |
-                |       . o      |
-                |        . o     |
-                |     . o =      |
-                |      o * .     |
-                |     . . o .    |
-                |      . . .     |
                |                |
+                |                |
+                |                |
+                |   .            |
+                |. o     .       |
+                |=+     . .      |
+                |=...  . .       |
+                |+oo...          |
                +----------------+

-1kwx=)3f<[z$G%dAyqGMDHiU1fk1E?ff{Beb>:DK15!qzj6cEirtl35VdQ}BQhLydYBFCg*
-#GBSMN^epAyaOMvTd%73M89n2/5.rZOH7OF@!B{[Jb@BvX9w*a<MkU-TQO>XO/{9s?exp-9
-OzK-yHrV<xc@&<i{{35Qnvr8>dU?%8AT#AQ^rrh*C95bQ[AVPDXrRKO=lpG(SdPX4:a{h5o
-*t:0(Gnp4^NPQd6QJL*lV1JESB]mgmgjUi:gUSAndW+#$<8LRXs@n%fl1nXS7:<9lA[CG@S
-gBsXD%RxN*D(Dr$rfC04o[.X+I2SIUYl%%Tt2]JE0ZL]?@-#H/*<1}ryDnAy$JOg*f)W@NG
-DmA}6k-4cY}iV.V@P2.>=z=!c@Yx1Y9Ua75=N/U$SCJrYvSbZ+C%Dg:v{%fN4P)[jlU-gmX
-{OJIYv^N*?%t%}/[3PE.FX*H(VIo?}PJcq+QieKd38Gs0L90V3?TsI*Wu!-OQTI6D!t%^/z
-Zv8hJb.:E9F0/waiAxn{hxN=?k)Ou:$<()SO<0O=*!S^[3tZF7l=s(JrG0Xr@?f]vPHci&s
-YGbjDjhoA[4yT/8NtGhdbw]Nvv1<J(69h[5L[!9!O6I>G66F-n/5=Rom.{Ks00<+F:U!q&4
-RFG*{^Hc}Luey1Cm4uI[UO9&%0NkoMzQ4%71!!>CMCzF}l=JeKCt]aL=tFsqLC2?+1K8le8
-F/MEHJxk6rlo4v*ixfF/gdBX*fH!we0@@r308?Cmrr9101uR3(kl7V-
+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
 ------ END PCP PUBLICKEY ------
--- a/tests/key-bobby-sec
+++ b/tests/key-bobby-sec
@@ -1,24 +1,24 @@
 ----- BEGIN PCP SECRET KEY -----
  Generated by: Pretty Curved Privacy Version 0.1.5
        Cipher: CURVE25519-ED25519-SALSA20-POLY1305
-        Key-ID: 0x7B8D298F82FE30FB
- Creation Time: 2014-01-16T15:23:17
- Serial Number: 0x3B7D8E3F
-   Key Version: 0x00000004
+        Key-ID: 0x78FBD073AC12DDDC
+ Creation Time: 2014-01-19T19:23:32
+ Serial Number: 0xE7096F3B
+   Key Version: 0x00000005

-1kwx=)3f<[z$G%dAyqGMDHiU1fk1E?ff{Beb>:DK0%0RsA}*LOS&hj!ynJ^EAY<xad!haKo
-%$Eca%S{rvP8wJj6cEirtl35VdQ}BQhLydYBFCg*#GBSMN^epAr9{wwvYK0DpU.5D6qH[(L
-ZQ-/e>yY=DvfJIg<b3w*Xw$*)&j3+3Y?KFXrk+u?Dwe!8c8R)a}<#BGMP%JXC=Co9n1?=h=
-0TgVTk8fz5(b25jFQPIF/F%mYpe@%e#U7JFmq6?MS!Kqh?+y8nyYnlv/PZp5NF]KiQueJn?
-.[STEe)1kJhbqY-=FlSV>g<Sc6BE%dl}Lwc(SuadkpClna{D&!cvTd%73M89n2/5.rZOH7O
-F@!B{[Jb@BvX9w*a<MkU-TQO>XO/{9s?exp-9OzK-yHrV<xc@&<i{{35Qnvr8>dU?%8AT#A
-Q^rrh*C95bQ[AVPDXrRKO=lpG(SdPX4:a{h5o*t:0(Gnp4^NPQd6QJL*lV1JESB]mgmgjUi
-:gUSAndW+#$<8LRXs@n%fl1nXS7:<9lA[CG@SgBsXD%RxN*D(Dr$rfC04o[.X+I2SIUYl%%
-Tt2]JE0ZL]?@-#H/*<1}ryDnAy$JOg*f)W@NGDmA}6k-4cY}iV.V@P2.>=z=!c@Yx1Y9Ua7
-5=N/U$SCJrYvSbZ+C%Dg:v{%fN4P)[jlU-gmX{OJIYv^N*?%t%}/[3PE.FX*H(VIo?}PJcq
-+QieKd38Gs0L90V3?TsI*Wu!-OQTI6D!t%^/zZv8hJb.:E9F0/waiAxn{hxN=?k)Ou:$<()
-SO<0O=*!S^[3tZF7l=s(JrG0Xr@?f]vPHci&sYGbjDjhoA[4yT/8NtGhdbw]Nvv1<J(69h[
-5L[!9!O6I>G66F-n/5=Rom.{Ks00<+F:U!q&4RFG*{^Hc}Luey1Cm4uI[UO9&%0NkoMzQ4%
-71!!>CMCzF}l=JeKCt]aL=tFsqLC2?+1K8le8F/MEHJxk6rlo4v*ixfF/gdBX*fH!we0SSi
-208?Cmrr9101uR3(kl7V-
+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
 ------ END PCP SECRET KEY ------
--- a/tests/keys.cfg
+++ b/tests/keys.cfg
@@ -1,6 +1,6 @@
-bartid = 0xC8F4F6CD7CA2E952
-bartserial = 0xA106090E
-idbobby  = 0x7B8D298F82FE30FB
-idalicia = 0xD65571D97AD62340
+bartid = 0x45AE802C2C338179
+bartserial = 0x7F7EF76B
+idbobby  = 0x78FBD073AC12DDDC
+idalicia = 0x7A96E7F11E3A92FC
 mailbobby = bobby@local
 mailalicia = alicia@local
--- a/tests/static.h
+++ b/tests/static.h
@@ -1,33 +1,33 @@
 size_t secret_a_len = 32;
 unsigned char secret_a[32] = {
-0x90, 0x14, 0xe7, 0xb5, 0x90, 0x04, 0x4f, 0xc0, 
-0xc6, 0xdf, 0x87, 0xe6, 0xbd, 0x87, 0xc8, 0x56, 
-0x64, 0x07, 0xfb, 0xb3, 0x3a, 0x25, 0x7c, 0xb9, 
-0x3f, 0xbc, 0x04, 0xd1, 0xd2, 0x2a, 0x56, 0x4e
+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
 };

 size_t public_a_len = 32;
 unsigned char public_a[32] = {
-0x55, 0xfd, 0x89, 0xe6, 0xbd, 0x57, 0x49, 0x4b, 
-0x24, 0xaf, 0x07, 0x07, 0x81, 0xd7, 0x82, 0x8b, 
-0x33, 0x80, 0x60, 0x08, 0xf9, 0x56, 0xe2, 0x04, 
-0xe3, 0x1c, 0xf7, 0x5b, 0x1e, 0x1c, 0x74, 0x3d
+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
 };

 size_t secret_b_len = 32;
 unsigned char secret_b[32] = {
-0x30, 0x4c, 0xaf, 0xb4, 0x6f, 0x09, 0x17, 0xa7, 
-0x9a, 0x2d, 0xe3, 0xa8, 0x56, 0xff, 0x13, 0xac, 
-0xbc, 0xc7, 0xa2, 0x56, 0x5d, 0xfd, 0x39, 0x88, 
-0x1b, 0xe0, 0xaa, 0x85, 0xfe, 0x15, 0xba, 0x40
+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
 };

 size_t public_b_len = 32;
 unsigned char public_b[32] = {
-0xcb, 0x8b, 0x3e, 0x3f, 0xca, 0xff, 0x0d, 0xdd, 
-0x6c, 0xe3, 0xc9, 0x28, 0x2c, 0xe8, 0x06, 0x94, 
-0xc5, 0x63, 0x63, 0xa0, 0x66, 0x85, 0x28, 0x72, 
-0x5a, 0x5b, 0xff, 0x5f, 0x06, 0xa1, 0xa4, 0x69
+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
 };

 size_t message_len = 12;
@@ -38,16 +38,16 @@ unsigned char message[12] = {

 size_t nonce_len = 24;
 unsigned char nonce[24] = {
-0xa9, 0x22, 0x83, 0x39, 0x47, 0x80, 0x30, 0x04, 
-0x37, 0x38, 0xd0, 0x34, 0x97, 0x6c, 0x52, 0x8e, 
-0x6a, 0xe3, 0xcd, 0x4c, 0x8d, 0xdd, 0x74, 0x5a
+0xc6, 0x26, 0x8c, 0xa8, 0x17, 0xb3, 0xb4, 0x99, 
+0x14, 0x12, 0x30, 0xd1, 0x11, 0x93, 0x36, 0x09, 
+0xe0, 0xb7, 0x3f, 0x16, 0xe0, 0xd1, 0x0c, 0x0d
 };

 size_t cipher_len = 28;
 unsigned char cipher[28] = {
-0x2a, 0x93, 0x39, 0x8d, 0x84, 0x69, 0x99, 0x5d, 
-0x61, 0x9c, 0x19, 0x80, 0x2f, 0x18, 0x16, 0x38, 
-0x5c, 0x1d, 0x08, 0x5e, 0xcc, 0xed, 0xed, 0x48, 
-0xe8, 0x0d, 0x47, 0x92
+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
 };

--- a/tests/unittests.cfg
+++ b/tests/unittests.cfg
@@ -174,7 +174,7 @@ dxmorg@florida.cops.gov

  <test check-crypto-bobby-decrypt>
    cmd = $pcp -V vb -d -O testdecrypted -I testencrypted -x b
-    expect = /from ${idalicia} successfully/
+    expect = /successfully/
  </test>

  <test check-crypto-alicia-encrypted-file>
@@ -183,51 +183,6 @@ dxmorg@florida.cops.gov
  </test>
 </test>

-#
-# same, now with derived keys, keypairs:
-# alicia                       bobby
-# secret: derived for bobby    secret:primary
-# bobby's public: primary      alicia's public: derived for him
-#
-# derived by name
-<test check-dcrypto-init>
-  <test check-dcrypto-alicia-export-derived-byname>
-    cmd = $pcp -V va -p -r Bobby -x a -O testpub-forbobby-name
-    expect-file = testpub-forbobby-name
-  </test>
-  <test check-dcrypto-bobby-import-byname>
-    cmd = $pcp -V vb -P -I testpub-forbobby-name
-    expect = /added/
-  </test>
-  <test check-dcrypto-bobby-encrypt-byname>
-    id = grep Key-ID testpub-forbobby-name | sed 's/^        //g' | cut -d' ' -f2
-    cmd = $pcp -V vb -e -i %{id} -I testmessage -O testencrypted-name -x b
-    expect = /success/
-  </test>
-  <test check-dcrypto-alicia-decrypt-byname>
-    cmd = $pcp -V va -d -I testencrypted-name -x a
-    expect = /success/
-  </test>
-
-  # repeat, but now use derived keys in both directions
-  <test check-dcrypto-bobby-export-derived-byname>
-    cmd = $pcp -V vb -p -r Alicia -x b -O testpub-foralicia-name
-    expect-file = testpub-foralicia-name
-  </test>
-  <test check-dcrypto-alicia-import-byname>
-    cmd = $pcp -V va -P -I testpub-foralicia-name
-    expect = /added/
-  </test>
-  <test check-dcrypto-bobby-encrypt-byname-both>
-    id = grep Key-ID testpub-forbobby-name | sed 's/^        //g' | cut -d' ' -f2
-    cmd = $pcp -V vb -e -i %{id} -I testmessage -O testencrypted-name -x b -r Alicia
-    expect = /success/
-  </test>
-  <test check-dcrypto-alicia-decrypt-byname-both>
-    cmd = $pcp -V va -d -I testencrypted-name -x a
-    expect = /success/
-  </test>
-</test>

 #
 # check usage of unencrypted secret key
--- a/tests/unknown1
+++ b/tests/unknown1
@@ -1,11 +1,11 @@
-0#B%]Dwej74e/:?9?y.aITSgR{crR@K+V$MjQlZ966qVbxJ8Iq6t9[)!LtTh+=iGlR$sQ=Z
-V)5}WAU!I+Uz>-zddr)0i.<!3HpEIvt9mNUT?dI(<H1RnUCQ&cAE=r(z3I6!KACU=pKmGT8
-4})FO7^FOnvE=D%4cSfRQlO@)]JUn#sMKF*t3w0hk0P^2iZc=8+poK^woRlu#P#C=T:sjT8
-rKmSx6SBHzL3a]eC$ec&J3Pr){EZI!Tjc$z@CrPpph+ZeI0n?xKH2e2ZOschWU!FiN}VQg-
-RfeA&V*NZmYNC7q(0yl)vI&NYdMyi@20?E{i(FCmO^:sQqJJ)e2GiY/!0G5u.a/ct#dCa2%
-?ZNTaM1f>k7kjJ$d)?6#]Xt<g[BXJxw{p$z0JB)<M!tSmzFrW0vqYQvy&r/(yYC}?6Ng#3[
-{6!c{4A1>S?0Jg5kMaRF+3lq!^9Ta&N=m9WBqzPbMS?V0(38RI&lUz3>u=Ex97bV1>GG?:]
-}!Wbl7/[QLx>d}1abB&&<Q<.*>28d>en{+a9]MVP5&$R)a[q]H1V[aamjBARL>^13Q1[*sT
-3bj+$9qrZc5cp0v}XUdX1TNw*M$^N%(+=4mG7OSBdo>[jq$-VH24T20B-k1ASX]0jm{@U}p
-BI^@GeGfA.-HM9MR4ruqFJsMZEL7bb9&:gSmzqX*L4WF-rq=Iad-2%lN1iG3ZRmi>Z?+/2
-}euk/J3OA.lp0vXl]WK[g=mlLi5Aq?0@@r308?CmrSAa11w$96fAq7M
+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
--- a/tests/unknown2
+++ b/tests/unknown2
@@ -1,15 +1,15 @@
-0#B%]Dwej74e/:?9?y.aITSgR{crR@K+V$MjQlZ95=?<i*oFB8f9yBYg-?8mKwjQXxBo)CF
-iV0]r<^JNSPDV[xJ8Iq6t9[)!LtTh+=iGlR$sQ=ZV)5}WAU!I+M6SKV?c:3JEK.G/JUkr9z
-tpfp6[rQo##w^BMRG.i%s{z.!8aU]^h&n!$pBg6O71S>FMZ@3N)}@q>9*ti}7y<iyZR)CL4
-BO?IlYCy:k!k:rV.*7Z<WVxGyTvoD92W8<!3fo+>O=(48NJgpb^7t>]C/O9l9K7+lS%&5j1
-7EG+Z*vWp*Do[aBBeI$J6H%TH(EfMJ#bxiKf-rZE1qlEpQ98piVzddr)0i.<!3HpEIvt9mN
-UT?dI(<H1RnUCQ&cAE=r(z3I6!KACU=pKmGT84})FO7^FOnvE=D%4cSfRQlO@)]JUn#sMKF
-*t3w0hk0P^2iZc=8+poK^woRlu#P#C=T:sjT8rKmSx6SBHzL3a]eC$ec&J3Pr){EZI!Tjc$
-z@CrPpph+ZeI0n?xKH2e2ZOschWU!FiN}VQg-RfeA&V*NZmYNC7q(0yl)vI&NYdMyi@20?E
-{i(FCmO^:sQqJJ)e2GiY/!0G5u.a/ct#dCa2%?ZNTaM1f>k7kjJ$d)?6#]Xt<g[BXJxw{p$
-z0JB)<M!tSmzFrW0vqYQvy&r/(yYC}?6Ng#3[{6!c{4A1>S?0Jg5kMaRF+3lq!^9Ta&N=m9
-WBqzPbMS?V0(38RI&lUz3>u=Ex97bV1>GG?:]}!Wbl7/[QLx>d}1abB&&<Q<.*>28d>en{+
-a9]MVP5&$R)a[q]H1V[aamjBARL>^13Q1[*sT3bj+$9qrZc5cp0v}XUdX1TNw*M$^N%(+=4
-mG7OSBdo>[jq$-VH24T20B-k1ASX]0jm{@U}p-BI^@GeGfA.-HM9MR4ruqFJsMZEL7bb9&:
-gSmzqX*L4WF-rq=Iad-2%lN1iG3ZRmi>Z?+/2}euk/J3OA.lp0vXl]WK[g=mlLi5Aq?0SSi
-208?CmrSAa11w$96fAq7M
+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
--- a/tests/unknown4
+++ b/tests/unknown4
@@ -1,2 +1,2 @@
-0w</Ehs1#BA3k=>/-oUq9GivcM)-GCF]mc8k*mvSJ2zoa}UiF3VD[>Tqb+M7Jq#o!uC9?4q
-n%aBuKb{ex.8-j9^T611j!.plUbqXG]Gl&P@L#d5cgteSu}?wC*rH/X@3GX0qgslBm+B(
+0Ji3}dGK/Q*@=EAXCkzw)M9pdfSm9+xZZX]Bt9K$%cTFQ8EUj3pK(}T6aYdesz#XiCvFwdj
+M0N)yB]@2g)T-EmJZ10wjEkV>u&/v
--- a/tests/unknown5
+++ b/tests/unknown5
@@ -1,2 +1,2 @@
-1f{Fy[cZFK+pp.B7>.v5Wen(2]6hjnTVi!yM&0jWr9@fI&@<90-GudZ]zJl%DITeE}LSTwz
-G4fdyX#cd1W>mah8^lTix6k(hzN6BfAq7M000000000008?Cmr@-j20SSi200000
+15H8sSn+vmg.g0JlKFtJg%P3OYMOCt7NAgDR%zP]xY33$zKh$mqrCsdce)7NO[+60NK:^OW
+$G-:j&Cwk3o7mhhBPL]f!(9Mk@*X&lJv8^000000000008?O?c&:kE0SSi200000