From f51d753a3ef63716521ca34e2da8c9ab1f70ec6c Mon Sep 17 00:00:00 2001 From: TLINDEN Date: Sun, 10 Nov 2013 14:32:48 +0100 Subject: [PATCH] tuned yaml and dump functions to the new key format, re-generated the testkeys --- src/keyprint.c | 7 +++++- tests/bart.pub | 52 +++++++++++++++++++++--------------------- tests/key-alicia-pub | 48 +++++++++++++++++++-------------------- tests/key-alicia-sec | 42 +++++++++++++++++----------------- tests/key-bobby-pub | 54 ++++++++++++++++++++++---------------------- tests/key-bobby-sec | 42 +++++++++++++++++----------------- tests/keys.cfg | 8 +++---- 7 files changed, 129 insertions(+), 124 deletions(-) diff --git a/src/keyprint.c b/src/keyprint.c index 08e1430..aacd66c 100644 --- a/src/keyprint.c +++ b/src/keyprint.c @@ -198,6 +198,10 @@ void pcp_dumpkey(pcp_key_t *k) { for ( i = 0;i < 32;++i) printf("%02x",(unsigned int) k->edpub[i]); printf("\n"); + printf(" edsecret: "); + for ( i = 0;i < 64;++i) printf("%02x",(unsigned int) k->edsecret[i]); + printf("\n"); + printf(" nonce: "); for ( i = 0;i < 24;++i) printf("%02x",(unsigned int) k->nonce[i]); printf("\n"); @@ -326,11 +330,12 @@ void pcpexport_yaml(char *outfile) { if(s->secret[0] == 0) { fprintf(out, " encrypted: yes\n"); fprintf(out, " nonce: "); pcpprint_bin(out, s->nonce, 24); fprintf(out, "\n"); - fprintf(out, " secret: "); pcpprint_bin(out, s->encrypted, 48); fprintf(out, "\n"); + fprintf(out, " secret: "); pcpprint_bin(out, s->encrypted, 80); fprintf(out, "\n"); } else { fprintf(out, " encrypted: no\n"); fprintf(out, " secret: "); pcpprint_bin(out, s->secret, 32); fprintf(out, "\n"); + fprintf(out, " edsecret: "); pcpprint_bin(out, s->edsecret, 64); fprintf(out, "\n"); } fprintf(out, " edpub: "); pcpprint_bin(out, s->edpub, 32); fprintf(out, "\n"); } diff --git a/tests/bart.pub b/tests/bart.pub index d92c8b3..b211f37 100644 --- a/tests/bart.pub +++ b/tests/bart.pub @@ -1,36 +1,36 @@ ----- BEGIN PCP PUBLIC KEY ----- - Generated by: Pretty Curved Privacy Version 0.1.3 + Generated by: Pretty Curved Privacy Version 0.1.4 Cipher: CURVE25519-ED25519-SALSA20-POLY1305 Owner: Bart Mail: bart@local - Key-ID: 0x6C0EEA95E11E2533 - Public-Key: 1kz.R2FXS+})++h8W3LR3ope+k8<3jYfckF&!vrcyn+==/LNQPp -!/XgHRQ?p6vsX!+h(r -yl:?7Tcf}^o8P1kjS5i&x.V!7[en?^8d5^YwSj<3nY+Mkt@gON=6^^@QuVQ4SP][scxx?^z -5CG6ZiB<4^rXZOsdA(hOS6$hD%@5Pz&%6}n4+1vQTq0kX$vGvqC@vk?b^xKBcE.e -[D4QWWjWEk!{A}^}{QI)OAn<%N:ZS+3GaQwEmwRy=%EX&L6l4X2WP -G:u$N*zc@kjSs(sDq4oAv7G0+sB6}alyacoNX=.61BqbFeQkg0^y9ewu8W(Pk@/i6 -C@-:!9XXH%KQ6sN.m[&(cRapHUtpok.CFaEcI@kQhtJ3--[cU+XKB!Pr1Pn!jo -W=w}@pzKx$lOH}$k@*!>f!(9Lh8v2*M&E9^08!r69SMfu0*mSYc@]LR(/(R4w -Z)G/o=C2W9Pv7hkPcSZXMc#>J{A^N6u6+Z}Eh$L]t2VI)h=$sZe2W{6eFL+T]FC4 +1bm}!!r%)*BFZGzmlW^ojoLwt^p-bht=dU+mvB}{A.yN@mhdzFmtoItFs>l]lakB}@ngQX2 +}bgmScV2t}:a.iBo88QkFs@ZVa!*=AKG486@yg:e7%$GrIQc+u$H$*5fHm?6^UFE&UP!&Bf +Lsg+SN$}xoEDZzGQ+{^y0#o7hLZT(jL9wt^kNEi$t+5+tzNtvlJGYCE5>kHb}-l.KLGr85A@qIzxk]cXg?LSmu}4UFM>Nr&7WWUWZHlj>[wQP4 +tuxYl4Qi%0XTFGI5Ec=L=(*kMPT/G#v=6g:C(RL?RhWI4vQTq0kX$vGvqC]+as)XppQX1Sq +2*v7pmDp@}Ds+k!Zv)XQb60[R=!+U%J&qI)k1jaw+6pJ+{E5]ZX%pH57^T7x6YsDAot^o5ZqO +P[i[QlI>0%LT.^CU.QhpXSqvV8FUIy<7&S*](-5RBLn3SZY/kS/IedxC^0d@hV]86*BjDSg +.N@!3@6Vj)LHqq#J>O7va7zVWbC] -==4ds.SPlT3HMov}/uKjG(9PFKZ#0bxXY9ikVC1Vj=rJ2x]WB=FVbYKaI$ZqR)W$MFrUgYB -nTZ[eMC!NPQcYtZQpVSfRMBgY>2dZAL?[rMVVKuOj+tF5=bOEpR=<@dVls=Nvu.GxAEi%cjEK2d*^w=dN:?/!Z{b(bCuB@!U8pDs-[zxTCcjM:9=1VP -2BR@6ZIuv)v!=FH*!vh1Xu82c?UDR]nIrYi-Y{>.9vt](x^P}q(bf&em34)TYgBacIl4oA8n6vqGT/x<$zUOv>G2E -]Ls})!aN47]1tg=>$N)+=4TrMAicEk)bS5ARyrD6[oIwc6:?^^kNMwE[sMAI^k7ZM[P0Ru0 -m:})s*:3)=.XTGv22aW-04j?-.evZd%j:gd8n$hQPRstGfr^S+)^2s(?S[AR7.zBP7[>]18 -rQ{C3/oEZKhaxt&gbH{Uh8m9WiwJC(aohxw08!r69SMfu0@6^GO=!+-*en&SNdU3QPjyQ&Pe#Uqg6 +B-%wS-KXGHcYS&v}/uKpuWY.&P5qRm0AYLFW@S(h^C@cp545=hq@3zfNA5jNjIx +HCNQlDrewiacrQs4ytf$8p:l-jby*Ul^j2rk?^qQ7@Ck@c5J5mtzpP0TP(1R2eKT8W.LGuy +4/hYs]ayI%o6QQp!OtLVNjdj#ia]2AbC0GHjZ>/nSsnV0vqGT/x<o.p-u^{/]H&rJ)}ch72 +!kQtc):/I6+tF-geqP)H8]*-b<#GC[bm}CsBLSf^1mX.fTM-8g$YM]BRO3/x2ErJ4=^INv3pSmJ[>iYH1n/Upaz[7OeB.z{X]N]Ok/PDW:6f$(}faF}2xSk6U?#yhEm9#/I&36AuD+pVgwC[muk/Cv:s/7$y +By&x1K0Q$?mMr>6g+*Wxg^J(Pl{%3nEGfuF08!r7^eTdD17IY=/-P<^<9-Q4{Wgx:-)+QP& +0j[DSOa[-*W-4-rwqq2OKXQ{3L5#:yhbD*(*BHgP+WGsr-DZRVV#l!Ddg[!I2WIQ ------ END PCP PUBLICKEY ------ diff --git a/tests/key-alicia-sec b/tests/key-alicia-sec index 6467686..e03267a 100644 --- a/tests/key-alicia-sec +++ b/tests/key-alicia-sec @@ -1,25 +1,25 @@ ----- BEGIN PCP SECRET KEY ----- - Generated by: Pretty Curved Privacy Version 0.1.3 + Generated by: Pretty Curved Privacy Version 0.1.4 Cipher: CURVE25519-ED25519-SALSA20-POLY1305 - Key-ID: 0xD5F2E247E527F925 - Creation Time: 2013-11-10T14:24:46 - Serial Number: 0x33E31A89 - Key Version: 0x00000002 + Key-ID: 0x8F8FA41064A26DD9 + Creation Time: 2013-11-10T14:32:01 + Serial Number: 0x3DD4C6B2 + Key Version: 0x00000003 -1dO5d*+#bkj0vJNuNQxo&T}daphtuDw^?27XbA02z2*K-*A51(A!tigjW3i$*o:@bI*[3y^ -&B@[FOM6UE+RUqOtx^7nQ)i?^}@>>O7va7zVWbC]==4ds.SPlS@Q4)4%4&u1L@xzbj7P{(F%s/UfO)vn1[Od?-}BbZ$#-)Cs$ -/evVI+AxP@x/UJCJ8%!V2/:}u#qAzTO{feeua-B)JLpOd2dZAL?[r -MVVKuOj+tF5=bOEpR=<@dVls=Nvu.GxAEi%cjEK2d*^w -=dN:?/!Z{b(bCuB@!U8pDs-[zxTCcjM:9=1VP2BR@6ZIuv)v!=FH*!vh1Xu82c?UDR]nIrY -i-Y{>.9vt](x^P}q(bf&em34)TYg -BacIl4oA8n6vqGT/x<$zUOv>G2E]Ls})!aN47]1tg=>$N)+=4TrMAicEk)bS5 -ARyrD6[oIwc6:?^^kNMwE[sMAI^k7ZM[P0Ru0m:})s*:3)=.XTGv22aW-04j?-.evZd%j:g -d8n$hQPRstGfr^S+)^2s(?S[AR7.zBP7[>]18rQ{C3/oEZKhaxt&gbH{Uh8m9WiwJC(e=U> -K08!r69SMfu0YejyQ&Pe#Uqg6B-%wS-KXGH5+{p{HqkpIo9#3g3H#:GL +Br7P2rMx-7x#I.66I:fT{b8L[RFQPAQ# +ojH]q24H![cp83GL/CG08![me}81f+3Efhocc{oy>yabjkqw:QHXNE5hOSjypdHs/7vh#FO +ebUgaW?SH$XoVDFTX97nuGQ?@KjDs2r1%DCw1F/@eRg9J81vl=hq@3zfNA5jNjIxHCNQlDrewiacrQs4ytf$8p:l-jby*Ul^j2 +rk?^qQ7@Ck@c5J5mtzpP0TP(1R2eKT8W.LGuy4/hYs]ayI%o6QQp!OtLVNjdj#ia]2AbC0G +HjZ>/nSsnV0vqGT/x<o.p-u^{/]H&rJ)}ch72!kQtc):/I6+tF-geqP)H8]*-b<#GC[bm}C +sBLSf^1mX.fTM-8g$YM]BRO3/x2ErJ4=^INv3pSmJ[>iYH1n/Upa +z[7OeB.z{X]N]Ok/PDW:6f$(}faF}2xSk +6U?#yhEm9#/I&36AuD+pVgwC[muk/Cv:s/7$yBy&x1K0Q$?mMr>6g+*Wxg^J(Pl{%3n9SMf +u08!r7^eTdD13LeNVh]r7ZYMI1/*8=i0seV90000000000004Km0seV9000000000000000 +0000000W{r0seV901Ybg05bK-{Y7o] ------ END PCP SECRET KEY ------ diff --git a/tests/key-bobby-pub b/tests/key-bobby-pub index 1e0a66d..9f83eb9 100644 --- a/tests/key-bobby-pub +++ b/tests/key-bobby-pub @@ -1,36 +1,36 @@ ----- BEGIN PCP PUBLIC KEY ----- - Generated by: Pretty Curved Privacy Version 0.1.3 + Generated by: Pretty Curved Privacy Version 0.1.4 Cipher: CURVE25519-ED25519-SALSA20-POLY1305 Owner: Bobby Mail: bobby@local - Key-ID: 0x80F52DB08164A533 - Public-Key: 1ibutw@MLx1y%B6nt5N-j1p9RrIJA!5?aMj/NV/DjPCDZ - Creation Time: 2013-11-10T14:24:46 - Checksum: 17:D9:B5:1E:2B:B5:1E:9A:EE:01:68:CB:5E:E5:80:F0 - 49:80:62:61:F4:DB:D4:7F:05:67:92:73:60:63:86:A5 - Serial Number: 0xEC29D88E - Key Version: 0x00000002 + Key-ID: 0x50CC932B329F821F + Public-Key: 1drr$j45{Cr0VU+U*f5iE(n{Ah$Tala1(CE2xGyEbldYz + Creation Time: 2013-11-10T14:32:01 + Checksum: 9F:41:DB:46:33:D0:C0:B6:3E:52:18:36:8B:5E:13:12 + 61:CA:CB:B8:7B:5C:EF:E9:34:BE:AA:2D:0C:12:32:84 + Serial Number: 0xF69A2C91 + Key Version: 0x00000003 Random Art ID: +----------------+ - | . . | - | . = . | - | = * | - | o B . | - | = o | - | . | - | | + | .oo| + | . . | + | + . | + | . * . | + | O o | + | o + | + | . | | | +----------------+ -1ibutw@MLx1y%B6nt5N-j1p9RrIJA!5?aMj/NV/Dj(4dT!OMC={yChgS9Bm:p*{/RW@&mq4 -hPA1/hb&6<3EV[vTd@IEDCn1gh?O*AO]Pp]T[*2/n#SSc:SPVDlb$h(:z6cmqt0DUIc(hU) -IfufJgG1em4]/KdB$SF$R1fu0Uyj:AiYb-ET]kItj[a^i94(:P$GWj!s!h9$7ve^NBsb)415Dj^Z9//]G*z=pA))x+{zp4< -V4R37FSAuNYF@L!50FILb.ikdYR9QjY#[SCLuE6:WvoI8vSbZ+C%Dg:v{%fN-Ev6Bg.s8Se -L&x#naZ8r7R@zd5j2DFn^WcqCB(F&2[C8d^lKzsEhXnpTH-s[RUK-b-Z7DKC)rQ@8=w1VnxG$6=^C.h -(U3>LYD!!H3s^ -+(ZbyD3yO]fH^]Pl{-N!f/y25y?Q=(YO^sy=Rgk$+#[GxtS&GB/mTh$(@bereI-eo*2pGrbaTSZWR^fTOD5S& +1drr$j45{Cr0VU+U*f5iE(n{Ah$Tala1(CE2xGyEboRpo:QUG4&.]bC=KD8FvWea][}G*(X +aELeumiAJ&ZdM)vTd%((gc+@4k(>rf>wcXUCRV+oL9PX{{$PIPTg23DS&?y2=QVz6F%*%8yho#b/lLD8GOxTjg!$DRHSd}AuoA#2)#}Pd4B:$lSe:Dp:/% +)pRrCqoGq$xqFvW.g.wY][rv{ipNsPb6@wqoeqWVr[a->}CioBvaf#cWS:f8V5JJi{eJ:X= +k:GTcsE^aP.ipGFwLDwwMy1{-Hs3dx1AKv]Lk)v-oBT/GvSbZ+C%Dg:v{%fN5LySCie9LTC +rKpjHunCL9$P]-F0Nleu[@aS6!4$Ycd+ePiY(k&p?r8$dnjE.Mvb[mw+C%T6X7{VwMQ{M?l +-h+ETnP)/A0^sS2C^*M<2m8HGzq:F2bJ6ZO6alYdU)nzTCuB1T*VGh=@l9R7eU(DS?+W]}fK)VNt)@]&AZ0H=8b]E +DXc9do=sQ3fHFh/gCRoMgc4/-gbhk#=J0}B08!r7^eTdD1nnfmKPQCf4#FQb>W($-{RAk>O +ct4nVp*YZ:r57Y>*1NK)XLXfdTVfmfJRkB]j24JoZBe[UckP3A8eco1JnJ%BPqyw ------ END PCP PUBLICKEY ------ diff --git a/tests/key-bobby-sec b/tests/key-bobby-sec index d84b1a8..5600a43 100644 --- a/tests/key-bobby-sec +++ b/tests/key-bobby-sec @@ -1,25 +1,25 @@ ----- BEGIN PCP SECRET KEY ----- - Generated by: Pretty Curved Privacy Version 0.1.3 + Generated by: Pretty Curved Privacy Version 0.1.4 Cipher: CURVE25519-ED25519-SALSA20-POLY1305 - Key-ID: 0x80F52DB08164A533 - Creation Time: 2013-11-10T14:24:46 - Serial Number: 0x9CFF1DC6 - Key Version: 0x00000002 + Key-ID: 0x50CC932B329F821F + Creation Time: 2013-11-10T14:32:01 + Serial Number: 0x470F1FEF + Key Version: 0x00000003 -1ibutw@MLx1y%B6nt5N-j1p9RrIJA!5?aMj/NV/DjPIjyxhLO1q@:+$7?)D][S+0rvTd@IEDCn1gh?O*AO]Pp -]T[*2/n#SSc:SPVDlb$h(:z6cmqt0DUIc(hU)IfufJgG1em4]/KdB$SF$R1fu0Uyj:AiYb- -ET]kItj[a^i94(:P$GWj!s!h -9$7ve^NBsb)415Dj^Z9//]G*z=pA))x+{zp4^WcqCB(F&2[C8d^lKzsEhX -npTH-s[RUK-b-Z7DKC)rQ@8=w1VnxG$6=^C.h(U3>LYD!!H3s^+(ZbyD3yO]fH^]Pl{-N!f/y0ldv0seV9004yi0seV9004Wq0seV9000000000000000 -0000000X6v0seV901Ybg02=5[JSo4V +1drr$j45{Cr0VU+U*f5iE(n{Ah$Tala1(CE2xGyEblm6lI<<@YTf&zijcH=/Z9IcsZn>D8@ +i.$H*3K#cWif=0:QUG4&.]bC=KD8FvWea][}G*(XaELeumiAJ&S6=H&iC:UD62(@}Os(Rtc +{D>OZRC-p!j-?F2Dss*l$IF3jA^y.GiwLvhJi9K!ZDi{rf>wcX +UCRV+oL9PX{{$PIPTg23DS&?y2=QVz6F%*%8yho#b/lLD8G +OxTjg!$DRHSd}AuoA#2)#}Pd4B:$lSe:Dp:/%)pRrCqoGq$xqFvW.g.wY][rv{ipNsPb6@w +qoeqWVr[a->}CioBvaf#cWS:f8V5JJi{eJ:X=k:GTcsE^aP.ipGFwLDwwMy1{-Hs3dx1AKv +]Lk)v-oBT/GvSbZ+C%Dg:v{%fN5LySCie9LTCrKpjHunCL9$P]-F0Nleu[@aS6!4$Ycd+eP +iY(k&p?r8$dnjE.Mvb[mw+C%T6X7{VwMQ{M?l-h+ETnP)/A0^sS2C^*M<2m8HGzq:F2bJ6Z +O6alYdU)nzTCuB1T*V +Gh=@l9R7eU(DS?+W]}fK)VNt)@]&AZ0H=8b]EDXc9do=sQ3fHFh/gCRoMgc4/-gbhk#S@Jb +108!r7^eTdD14J>z)/DlDFR/wT3Qy{^0seV9004yi0seV9004Wq0seV9000000000000000 +0000000X6v0seV901Ybg0h[Ltmf0q/ ------ END PCP SECRET KEY ------ diff --git a/tests/keys.cfg b/tests/keys.cfg index ca6008b..93e445e 100644 --- a/tests/keys.cfg +++ b/tests/keys.cfg @@ -1,6 +1,6 @@ -bartid = 0x6C0EEA95E11E2533 -bartserial = 0x9273DE28 -idbobby = 0x80F52DB08164A533 -idalicia = 0xD5F2E247E527F925 +bartid = 0x18D6E9A19F3A2864 +bartserial = 0x705FA77F +idbobby = 0x50CC932B329F821F +idalicia = 0x8F8FA41064A26DD9 mailbobby = bobby@local mailalicia = alicia@local