rewrote z85 stream decoder (again), using hyphens again. clearsig doesn't work yet, a newline problem...

tests/bart.pub

@@ -1,8 +1,8 @@
-~~~~~BEGIN ED25519-CURVE29915 PUBLIC KEY~~~~~
-22+[E/=.$41#M]-p3Z*%mJukC}Az}B1oy^NZQodOb+b/v<qySc6H5d^=p/Ue@6[.W=ZtoIf
-rE+un7tFVW$#33:XcMgzw3&PZ)7ekwL}7Eqd1d[NpaMnHj@&9s0p6!?cy46bo^9)000040-
-GFA*5I9M1oRS&QfmJ%00AQc)4NR.000Gy00SAaB7GxavqLtPY&$Ep01xRx1POWzCwZ#jlsB
-[R0000i6Awmo3t<i=y*{*[Bu<UXv{%fN0003s01<4EQ*G9>pHh6fA/A944@{IMelG{62mGJ
-m9=#BHf}C+wnm]q@Ts>0&wN0UDH>Rm7+]8@<[fYHG>Em7026*4BOF5#qVZBr+RPvPrmFy:#
-v5khdlw:Ym>>*%uPeej4FJk^>lj{byzcNiGCk#%?ht]4ni@+5PJxsHLFb/MH
-~~~~~END ED25519-CURVE29915 PUBLIC KEY~~~~~
+----- 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
+----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/key-alicia-pub

@@ -1,8 +1,8 @@
-~~~~~BEGIN ED25519-CURVE29915 PUBLIC KEY~~~~~
-22+[E!fex*BR+=DXNjIW*d]B9yhJyNrMg0#a!%V*Xbws>g4<g1]xVgVHyJne2T@q.hh[Vvc
-Y}(Imx2$E?B:U2pl.@^*{KGDffo*GcI+^eyGIhZ&MZCAPR.Pxmd?(^s1sp[bo^9)000040-
-GFA!C]NH1oRS&Qe.f[00AQc)4NCV000Gy00SAaB7GxavqJja2djBh01P+z1PO:BCwZ#jl2p
-mBx<*#w02caE1on<EvqfK^y?Wx[vl!TEv{%fN0003s0e-H.xJaP(BoT*HH[-oOFqW7(I>J+
-iHwx}-&tG+bR-@GioqlzuJq[GE*3My.aX]SmgU:zaB%=y].Owpf1Al4i0FCA>lF<{mMi$2>
-s=p/)jfQgIX:Qi:EGr6&^d)R2%a/@Th!*(Uhi>$WMI+l}oi%=1Yj[(RwQ{deEe<lE
-~~~~~END ED25519-CURVE29915 PUBLIC KEY~~~~~
+----- 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&
+----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/key-alicia-sec

@@ -1,8 +1,8 @@
-~~~~~BEGIN ED25519-CURVE29915 PRIVATE KEY~~~~~
-b)<0bbd}YplZUMB5il+5:yT5rzgMmfMGzVsol@fivj)]6gVuEx.rgTm.XgQcQmP&>bOo(6V
-d5=Wl5FnFQ{.7iH(:rE?Yjnxx*H#Vx*qH5H1zGu-x9OgK.aqgH+k[aID6Qef^.98y=X(Umu
-zUH0tlM6TJ/Egz./:3/^QtOu?Cv<Dt$d}LElYm)QZKM&pcUnglDSXO=(X)zAh2BqUQQqV9#
-UDsKhBI73?dDNd(CqiO@v7nz!a3kbm0R:3h?M!T){&(1p9VQkzNFq%z:cmGStwV0zn-b?xh
-&tMcN8[Qe$}UsV>SBC>6[gto2J&gQhxFhOir4qen:9QXK)y]q80zoP6L^eBLW^%Rk4T3ex%
-M[UiZ6c:4)PaZfE+$QZWql}6F:AYon<iUKU?Fc#LeZxeHt($]S=FrmV]3}wKQ=5hM
-~~~~~END ED25519-CURVE29915 PRIVATE KEY~~~~~
+----- 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
+----- END ED25519-CURVE29915 PRIVATE KEY -----

tests/key-bobby-pub

@@ -1,8 +1,8 @@
-~~~~~BEGIN ED25519-CURVE29915 PUBLIC KEY~~~~~
-22+[E!/&)#+yclyjgq?Y9P}g0]H-<!R<eYon.0^c57IQQ.Iot>5>PqR?^-neRWuv(BqUQ0q
-wUX:VK[pL!I6viWj2ubRztI:1pwzz9!Kc*H53+pMJIjUfHMo@]qo%0yI:7]bo^9)000040-
-GFA/8L^J1oRS&Qe}r{00AQc)4NIX000Gy00SAaB7GxavqE8AG8U/J01GXy1POZACwZ#jlt{
-sxC(N*A6bgAH01iTLx(4l%vQ:QFy&r/(yYBCn0uh2*MY}4Ts:6[Y!T3<eBBjcwSVzlrE/${
-D!+fvhY>tzq-D:XF-Dq*srnDc^)ed+.9wMS76]gnTr+Chj!dz%]vUIqNK)IH+Y.}tzSp4dx
-O9$ZdRB[0N5QD#hgeq:29t9${Mmoyhkd=1.vK6]i<B>PGRk*enlj:zE=ZU:J
-~~~~~END ED25519-CURVE29915 PUBLIC KEY~~~~~
+----- 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
+----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/key-bobby-sec

@@ -1,8 +1,8 @@
-~~~~~BEGIN ED25519-CURVE29915 PRIVATE KEY~~~~~
-s/Kxk/+qqBnP!erxq{]ai6+BkWc{nC=Xy+i9}+LSR)ZfN5Cm*4[N?Ra!JFm]*POClYeTcw)
-q[juqJ-}Pi1ht!j8l$IM8nLKaIfY/JuITR:J5#j/#H3dFY=YWW%AhfyCm2@+nzd12SL(]i$
-#Za6b%^GyG[U.qS%tHb5YvVQg/4KvdEEoM!}Cxk[ci3sRA$aeSngGa6Slj5z&u7/^kNX2h*
-(*yV15+HfdwcE&H/k<5*Ih2Iik+1F^WJJIK@7jE>jmQS0P5)sZi#ZaLOI>-q-ShW$%i(h>V
-Th(wzVmBnjg2a32wZ5xyf?PkbNmh!oza-3PL2$itvb)ih/yK!%HP}*iaS@+CPSJdjb.q-iG
-+MIh1CxgeRL*Scd+e&F%o.pMf2p>LMHYtBH0]SuWZJ3f:6(&%TgAW&05e1}3
-~~~~~END ED25519-CURVE29915 PRIVATE KEY~~~~~
+----- 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
+----- END ED25519-CURVE29915 PRIVATE KEY -----

tests/keys.cfg

@@ -1,6 +1,6 @@
-bartid = 0x81E0427F3EE40B39
-bartserial = 0xEDCCBD5B
-idbobby  = 0xEDF476444C8B5721
-idalicia = 0xD467BA4B3187236F
+bartid = 0x4EF5795E2874AD8D
+bartserial = 0x1B4ED012
+idbobby  = 0x969D5931D7B409C6
+idalicia = 0x629AFD2418EFA3BA
 mailbobby = bobby@local
 mailalicia = alicia@local

tests/pipetest.c

@@ -50,11 +50,9 @@ int main(int argc, char **argv) {
   void *buf = ucmalloc(rblocksize);
 
   while(!ps_end(in)) {
-    fprintf(stderr, "=== read:\n");
     got = ps_read(in, buf, rblocksize);
     if(got > 0)
       ps_write(out, buf, got);
-    fprintf(stderr, "======= got: %ld\n", got);
   }
 
   ps_finish(out);

tests/static.h

@@ -1,33 +1,33 @@
 size_t secret_a_len = 32;
 unsigned char secret_a[32] = {
-0x48, 0x59, 0xdb, 0xdb, 0x16, 0xfe, 0xa0, 0x17, 
-0xc8, 0x34, 0x38, 0x32, 0x29, 0x41, 0x56, 0xf1, 
-0x35, 0x5d, 0x20, 0x52, 0xa2, 0x54, 0xeb, 0x67, 
-0xb2, 0xd9, 0x5d, 0xa2, 0x90, 0xbc, 0x19, 0x55
+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
 };
 
 size_t public_a_len = 32;
 unsigned char public_a[32] = {
-0xfd, 0x9e, 0x3b, 0xe5, 0x99, 0x13, 0x22, 0xf6, 
-0xc8, 0x42, 0x10, 0x6e, 0x75, 0xd5, 0xe4, 0xcd, 
-0x1d, 0x69, 0xbf, 0x31, 0xbc, 0xfc, 0x2c, 0x27, 
-0xb7, 0xd2, 0x0f, 0xcc, 0xa6, 0x6e, 0x92, 0x38
+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
 };
 
 size_t secret_b_len = 32;
 unsigned char secret_b[32] = {
-0x88, 0x06, 0xfd, 0x5d, 0x6f, 0x45, 0xd0, 0x0e, 
-0xea, 0x66, 0xc9, 0xdc, 0xda, 0x38, 0xd4, 0xa8, 
-0x06, 0x81, 0xd9, 0x31, 0x9b, 0x22, 0x2d, 0xef, 
-0x4e, 0x69, 0x00, 0xc4, 0x8c, 0xdf, 0x4e, 0x44
+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
 };
 
 size_t public_b_len = 32;
 unsigned char public_b[32] = {
-0xdc, 0xc2, 0xcf, 0xe2, 0xc9, 0x3e, 0xe0, 0xf7, 
-0x33, 0x6f, 0xb8, 0xab, 0xe4, 0xb4, 0xe1, 0x6d, 
-0x82, 0xcb, 0xcc, 0xfa, 0x83, 0xc4, 0x8d, 0x09, 
-0x6f, 0x24, 0xec, 0xe0, 0xf3, 0x93, 0xce, 0x73
+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
 };
 
 size_t message_len = 12;
@@ -38,16 +38,16 @@ unsigned char message[12] = {
 
 size_t nonce_len = 24;
 unsigned char nonce[24] = {
-0x5e, 0xa0, 0xbd, 0x53, 0x16, 0xbf, 0x91, 0x2d, 
-0xfc, 0xe7, 0x1c, 0x0d, 0x4c, 0x9f, 0x79, 0xd1, 
-0x4d, 0x98, 0x3c, 0x2b, 0x1e, 0x47, 0x35, 0x0d
+0x1f, 0x54, 0xb8, 0x13, 0x86, 0x6c, 0xc4, 0x8b, 
+0xd1, 0x92, 0x27, 0x5e, 0x40, 0xc2, 0x91, 0x2a, 
+0x96, 0x1a, 0xed, 0x57, 0xa1, 0xda, 0xcd, 0x41
 };
 
 size_t cipher_len = 28;
 unsigned char cipher[28] = {
-0xac, 0x06, 0x36, 0x4d, 0xd0, 0xa7, 0x58, 0x4e, 
-0x18, 0x35, 0x99, 0x29, 0x2b, 0x1e, 0x4a, 0x08, 
-0x1e, 0xcd, 0xd3, 0xc7, 0xce, 0x4a, 0xd1, 0xa7, 
-0x3e, 0x78, 0x94, 0xe9
+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
 };
 

tests/streamtest.c

@@ -18,8 +18,11 @@ int linetest() {
   byte data[9] = {0};
   while(!ps_end(pin)) {
     if((got = ps_read(pin, data, 8)) > 0) {
-      fwrite(data, 1, got, stdout);
+      fprintf(stderr, "######## <");
+      fwrite(data, 1, got, stderr);
+      fprintf(stderr, "> ##### %ld\n", got);
     }
+    else break;
   }
 
   ps_close(pin);

tests/unknown1

@@ -1,8 +1,8 @@
-~~~~~BEGIN ED25519-CURVE29915 PUBLIC KEY~~~~~
-22+[E*94)L5kvZrVv&2kb@a+ka?%vr7IZ=d{$(<%-=#gX8ADWg*Hk+Am.OW&C&JDg]N*z:O
-M:v9Sk$22F$*)4g3fMPo*O$G+1Wf>8TwQm[E)pySYiO(:W7k9Rj=R]njrL3bo^9)000040-
-GFA*w?iN1oRS&QfvP$00AQc)4NU-000Gy00SAaB7GxavqI(09ThPA01Y?A1PO^CCwZ#jpha
-oRvqYPQ000-F00Aohzddc{zFrW0vqYQvy&r/(yYBCn0uh4nIbbY<J$hS3Vd@.<={RKId!5Q
-Q:.jVm=(w?ef]i%]3xH<b&PbUM(K8{bC9Q1ll)OmBJvbDPVvQ7fc0gxCR$anVHbnBXFXHJZ
-jh3yx*Rv.dLFUjhk<]<KF/=e6vZ*RJ:OlmQm0kA/?bp^mzPB-uTV8l&S[AOJ8Xb7j
-~~~~~END ED25519-CURVE29915 PUBLIC KEY~~~~~
+----- 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*
+----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/unknown2

@@ -1,8 +1,8 @@
-~~~~~BEGIN ED25519-CURVE29915 PRIVATE KEY~~~~~
-4Bs0#CKTjpx5[Xz(V:e9CN(HNl}X%Q+#6u9qDaba=EpllyA!cI)k-(wM<2TB}y7Ze3zUjTG
-/GH7NBGFP0d#084T-Nk8cnp&W:(@QUg/]4[ih&QAZ++!QtHC:dW{^tfMz@j&0^BYeHYzL)!
-O/YRSn-)06FoVHt$Ef1i%rhMZAI4(%jc-:+FHPXB3qYZ{JIz^rcb+XE%WerZ6st{Uj5$.Zn
-q@Yt-2NIM^]3)sc8VkaDWk60mV-{.iEy]7s:b15xt#0lE}ybXRKc8{FLv!bM*pPw^#a.GRe
-1uh/pUocpnHaky66.LX?}:&V<F2[W-cAoO<{V1b@jdH4y]f$UDWd54}?XNz-QO6@K?E#(A-
-(m!j<i$Hv@45zMCKLrLr(kBml31aFT0)&ot!j%1NBVwzy>xW/.=N[6vnsJJhx*o5<
-~~~~~END ED25519-CURVE29915 PRIVATE KEY~~~~~
+----- 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#(
+----- END ED25519-CURVE29915 PRIVATE KEY -----

tests/unknown4

@@ -0,0 +1 @@
+7YQnZ?kK]LGI?Z4Yof:=q{igA@WHz5fwy*Hiv}wb)d-+*F*2Q=F9zm@ufg?Y