switched to sodium scrypt(), which should be more portable

libpcp/scrypt.c

@@ -23,25 +23,23 @@
 #include "util.h"
 
 byte* pcp_scrypt(PCPCTX *ptx, char *passwd, size_t passwdlen, byte *nonce, size_t noncelen) {
-  uint8_t *dk = smalloc(64); /*  resulting hash */
+  byte *dk = smalloc(64);
+  byte *salt = malloc(crypto_pwhash_scryptsalsa208sha256_SALTBYTES);
   
-  /*  constants */
+  crypto_generichash(salt, crypto_pwhash_scryptsalsa208sha256_SALTBYTES,
-  uint64_t N = 1 << 14;
+                   nonce, noncelen, NULL, 0);
-  uint32_t r = 8;
-  uint32_t p = 1;
-  size_t buflen = 64;
 
-  if (crypto_scrypt((byte *)passwd, passwdlen, (uint8_t *)nonce, noncelen, N, r, p, dk, buflen) == 0) {
+  int status = crypto_pwhash_scryptsalsa208sha256(dk, 64, passwd, passwdlen, salt,
-    _dump("nonce", nonce, noncelen);
+						  crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE,
-    _dump(" pass", (byte*)passwd, passwdlen);
+						  crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE);
-    _dump("   dk", dk, 64);
+
-    fprintf(stderr, "N: %ld, r: %d, p: %d\n", N, r, p);
+  ucfree(salt, crypto_pwhash_scryptsalsa208sha256_SALTBYTES);
+  if (status == 0) {
     return dk;
   }
   else {
-    fatal(ptx, "crypto_scrypt() failed\n");
+    fatal(ptx, "crypto_pwhash_scryptsalsa208sha256() failed\n");
     return NULL;
   }
+}
 
-  return NULL;
-}

tests/bart.pub

@@ -1,9 +1,9 @@
 ----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----
-1][S608}PxJV?5A[Wwp%=4UFF0I1o]]>&tIIBzr3%nx$4=*4{8i#6aJtj/@VxJwiF5I9{Zl
+1][S6097-%&#]c=V(%sWNt}-r6LMx$@@an<T6mz>3&K8{65fN}tfPsN+9oKbfm9/=PXA{S^
-kaN)/[j#0H-IW7vAaR2lGb&u{eyD*Wb*pFTDUZ{3NjaZ&+K/2Z*qRV:oCmKZBfa8bo^9)00
+la=*sAv38NRiJO0aJS4rmx?mypA$TROMAp>vnWxqulxBM?Zyz@u[Noobvdm/Jwj%bo^9)00
-0080SSi208}PxJSo4V2M>5b0033hD>3bR00&(h00010Yl>7*000Gy00SAaB7GxavqD.=Hr6
+0080SSi2097-%&@x5V2M>5b0037krBV1e00&(h000125(&Aw000Gy00SAaB7GxavqGsKG}e
-t{01xRx1POWzCwZ#jlsB[R0000i6Awmo3t<i=y*{*[Bu<UXv{%fN0003s0beQl1D}jIQx3>
+hz01xRx1POWzCwZ#jlsB[R0000i6Awmo3t<i=y*{*[Bu<UXv{%fN0003s0dgX9k.t1Y4]E.
-!sze+H<WYV%Bxs*Z>EAMv{o]@Bn8y:fx]fDY)]3tXc]DE30b<tolU/.%Ha-GAOq&1A0<w<$
+wJqps<VO=l+TY?Cn*FU72QK@@o*Qy]-cSK>[B}O^{C#D)!/>X^8XOnk&j2YmXVJ.{X2bXp[
-NmW3vKI<bBRq8%&c*{eJHzE[8dtXoL<xkSFQr#fIhsC=(L8Xxz}^Q9@(WbUq8vk(fLdV$X}
+YQ(E[Fgaa2UFf>x&j1=9e.nNOhhE13iI2CiHS=PRD.0YP2c$wabl3.ATFlqe8Zriz*trfz8
-dkg8Jq@}U00003
++%^.mf0q/ek(&S
 ----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/key-alicia-pub

@@ -1,9 +1,9 @@
 ----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----
-1][S608}PxJuHxvv>P+rA6Q-eDxXMO?G/{bOUdC(izVt8x*5MjEcaq9>E8p$YS1J9n#>tnD
+1][S6097-%&#$gM?n.Qw]CtmmZ)(d5)^&#x)F*^2UDWe3ojbSby>gHT?EUjk&pI3cxE*gE*
-6Cd$3dT0*1h9h1h-ng@K?slf6y2(32y7y#L8je>zu^KLbhUDv(C?j[ja%7DGeAVKbo^9)00
+R=K^->HL{Y*A**S:A($8dtQsZI:TI01m@D6l3U^%1sZjSCbM+IT[.CVMalMW*&AXbo^9)00
-0080SSi208}PxJq@}U2M>5b0033hD<{5Q00&(h00010Yl>4/000Gy00SAaB7GxavqLm=j5(
+0080SSi2097-%&@x5V2M>5b0037krBV1e00&(h000125(&Aw000Gy00SAaB7GxavqK5azs^
-mX01P+z1PO:BCwZ#jl2pmBx<*#w02caE1on<EvqfK^y?Wx[vl!TEv{%fN0003s0c0J7y-Bj
+/d01P+z1PO:BCwZ#jl2pmBx<*#w02caE1on<EvqfK^y?Wx[vl!TEv{%fN0003s0kNeq4oyJ
-YLoZ9SoZ]zK-Qe1K}EfCYlU>d8K&s3O*hED>I+d%S&?OYIOaKl7JgH}0Go#pwA]KB(kaxr%
+%r{ezyIoB(@YnLW$d64oZtgGiBE]1c[{@U#ssHEGm6wh7=sO1&PM?Gs%%mD4([^xGwyWQF]
-3.-h$:}>pn8zqF]laLMCoq/jZnyh+Z7f5(kEHwA#lyfj67EznX:PRrNTu0XlpiwUpup![rV
+4nC!>Hp>0=^)$.G5d:Ls***6SV1E(Zp1iSY59=}{.(N)q6gTYN33<i!*f]vWzFhl9n0KzZe
-.F^+[nU{v(&m1=00003
+*B.6=&Q.Puh%%9[uTkt
 ----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/key-alicia-sec

@@ -1,8 +1,8 @@
 ----- BEGIN ED25519-CURVE29915 PRIVATE KEY -----
-l*hbuk#Y3g53P1k!cmMJrXmbAO)PC3Ne5x)&OvW&{fpvkoxL=)T<p)FDfM3S9O8==1%3iB&
+&xDEz1XK>dFo{10qP!ibe28hORn6ZEi1qc=oPF4<7Ci>Cd^eLqL42nhv/H:Yv<hu#5:x(a1
-ZL:Id:6/K9>W57h-6xX4O=EauF73+Y)s#SWP-vfNGqt<18MmZp=dmbD13#96U7U(8?}71F<
+Ykg20+K2s]!!^W^0@^6J0)a!/<Lx@duF8]sU*S?[(ZdExqiPYco0xzgt/[Fs&)rJV#ySF%d
-e@#bBNiKv<.[B%27N4t%@E05b&Bk9:JBx2n]Zh5?tWwS@Pr0gvYQbID:9bA^[?5*Z9[z1*Y
+NHTbN@GPI1GZkX<I)(iCBe{5XSF.4b+&5vdLDmTh]j=>6#%e3fe?#*LLl6yt%n7CIdVR1a!
-f+um^M+@Hha[f@>X36r?Heh*uL4AAmFhf9Y)Lx9Ur[*C(t*L59UJV%B1CCZrG=.6A!wse#V
+h/]p%UYSHekL{T/^S:<(0Kpie=oBQED#M1gpf0O7l}e6au!sk<DZd*@}Ndvp^H{symo{4@I
-+GsM-r4tTzhayYCnFrs0$s}FsoNI@}ozO[ZkG>*!Kw5JVZ6ZTyIJgXnGXt-I}?OROV-y<7c
+lqhs&Qvhg(YTR6!p^bti)Kq=)pR%Pqz9Pys}h(S3gj8#&piWQ@)x8/[HaB$9-AO<R1Feo@C
-f6tR^W}2DHxYjoiJK.p2.D4>nA^H{ruZ?Yj.Zsvti25XJ3Z}IyFN*nBgX!g)-rukw00002
+Mn9e2WSi$?lFHkb:tpwn7F6UUjmg9pUJ9Y.U4:aV^=!?jdu<:b%9esKvk]b.CKtChXPQpv
 ----- END ED25519-CURVE29915 PRIVATE KEY -----

tests/key-bobby-pub

@@ -1,9 +1,9 @@
 ----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----
-1][S608}PxJuH!P!yF7tGbRlwH]L{{yE{N.yU?cE7PfXsOtbOb3wLt)*n5fmZ(u.!{[[m3+
+1][S6097-%&#}QgWB7(bso^-@]H&)M*?I88J7z<M7bxi$[Y8KjKTwRx]^D>wQhA%%EbhlBZ
-mR[x6>?1v4e%d5A$jE5:%u0zJP94M[FkdkBc/*EPOaX(mmK{>bC&+qxOxf[UQ6q(bo^9)00
+LmNh1=03<0>3Sor8?vo2poRSNJukSM*v2^mDWoW:(!Q+/2:3p7i>^Gt$yR7L4$7ubo^9)00
-0080SSi208}PxJSo4V2M>5b0033hD>3bR00&(h00010Yl>4/000Gy00SAaB7GxavqFFeUsw
+0080SSi2097-%&@x5V2M>5b0037krBV1e00&(h000125(&Aw000Gy00SAaB7GxavqDv=Fk3
-M)01GXy1POZACwZ#jlt{sxC(N*A6bgAH01iTLx(4l%vQ:QFy&r/(yYBCn0uh3qSXng*N(7P
+1z01GXy1POZACwZ#jlt{sxC(N*A6bgAH01iTLx(4l%vQ:QFy&r/(yYBCn0uh3]inVjYs)@0
-DZissLHR2T5SD#[/&2m+Iwkc6!S/rgDIgKsrtSDuB.VZA{QD}ShyggUo@0eWE8}(#TDDupu
+geL6aUo^iV<eszj.BK:#y]:?&t@-!s^vEun#B>}S}[7Nd23jb9v.*Bd:IEStfX4QUzFrf>*
-&J6IU.1EtQjwF=jG4{S6h2epu39BiqS5xoLyxfT4NOi}Gm*Sd@v8@Q=uFGi3dnB5kJj!}1h
+CIXx@Y(Xt.j+.q$WkU1(&h4<.@-tC0iNYZBwUH^^Bl{Jr1LV<c^zh[C+FO7LUy7SGZ4oKK+
-87y7{(@#500001
+9ebp]03EvZ{CG<
 ----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/key-bobby-sec

@@ -1,8 +1,8 @@
 ----- BEGIN ED25519-CURVE29915 PRIVATE KEY -----
-oIme#QsTbLK!{=GqE{LPyinNkS9@}AuxhKunBEm%aAL7BDnu^iuF-jx?7$0M@!LL+j&Y>wo
+sR$x!+Q+gdp>NvV]$zhGa)Wol.+mx1slD]$5Z&En}WJ.x+R2=^HzEhD0Z0Qk0$tH7BXo00b
-sBb)jNY)uR)#?fQMB)37KL5a{9aImj8>e&%2JzR[xAIt^3TCO3xpvrJpc&7X#Q4y!Avzv@4
+[w}x6>)nWlm7zG1U]hUt<L030+A/Sc/-SvT53<MkRYgYu(JG:8G(z#-yoIb5n4$t7K=SGq-
-oQG)$0/6W.5/]i&lx?gyeV&lg+4^XgXv6UR9bb[ufq!xalrcnaLrlk%y>x5}<zMRSoBFkgl
+KGlV[gV#4![&u0GDS%JE>h-k7dJ71e3G#pOPZruZJx}0$&It<=h*o8}i:^C7[$rP-<yDkVm
-.qQ?XlWjosDFA:s<5JDKfrX[n$UrN)T<rz#>$>]1.^si6EBL$(h#}gS9Wn{GXUqgO4sAs6W
+NiNVb<AEym]8U8dkycAfiaCVlIUtsQTnd2%yZil57mrjk:G]F(-V/NvfeYoaiQAxXpSnB<4
-I*o^RucnR]B((HTV/1-tUW&^qv+8*@IS%nraQ?kK4nsmHsS]&imY.vI@W?JtPlNhaQ:T]jK
+L)x9XygJu!(R0T!2HYv<$QE%P+F7pw-/{F])[HdUAnQS-.sh.QGpZZDR>DlWBNj3Iey28l%
-9Bn0+wi>EP)wa{Kx&1)@E}9EjgjL^s-)ztQ}os^TO6TsS(E9iw^j+%nDFY&T00000
+A<rn0djBxIOfMb01{!8pg^E@sI+1}G+tEaMAx$1wt(LcuV%Ox1<a[CD5S&@e{k$<B
 ----- END ED25519-CURVE29915 PRIVATE KEY -----

tests/keys.cfg

@@ -1,6 +1,6 @@
-bartid = 0x7A88E19429C196D8
+bartid = 0xF1F82C95B113F29D
-bartserial = 0x170886C8
+bartserial = 0x6055859D
-idbobby  = 0xAE1098607B00C2B8
+idbobby  = 0x616BDDA58845987B
-idalicia = 0x437A76EDE40D67EC
+idalicia = 0x16F7B3374FE25F40
 mailbobby = bobby@local
 mailalicia = alicia@local

tests/static.h

@@ -1,33 +1,33 @@
 size_t secret_a_len = 32;
 unsigned char secret_a[32] = {
-0x58, 0x08, 0xc7, 0x3b, 0xfb, 0xc5, 0x85, 0xe2, 
+0x58, 0x92, 0x0b, 0xc3, 0xb6, 0xc9, 0x84, 0xcc, 
-0x00, 0xbb, 0x75, 0x31, 0x05, 0xb1, 0xed, 0xb9, 
+0x9f, 0x7f, 0x9a, 0xc7, 0x12, 0xc9, 0x90, 0xf2, 
-0x8b, 0xc8, 0xf5, 0x05, 0x23, 0xf5, 0xda, 0x8d, 
+0xb3, 0x6a, 0xa6, 0x41, 0xf4, 0x34, 0x93, 0x95, 
-0x46, 0xca, 0xb1, 0x3c, 0xb4, 0xe2, 0xaa, 0x65
+0xfe, 0xbf, 0xfa, 0xda, 0xab, 0x0d, 0x36, 0x76
 };
 
 size_t public_a_len = 32;
 unsigned char public_a[32] = {
-0x5d, 0x55, 0x3b, 0xf1, 0xa9, 0xf9, 0xaa, 0x69, 
+0x22, 0x07, 0xf0, 0xf7, 0x22, 0x37, 0xb3, 0x87, 
-0x2c, 0x21, 0x9f, 0x90, 0x02, 0xd7, 0xab, 0x3d, 
+0x6d, 0xed, 0xa6, 0xf4, 0xcc, 0x60, 0xb0, 0x12, 
-0x6c, 0xce, 0xa3, 0xb3, 0x5a, 0x23, 0xd9, 0x92, 
+0xc3, 0xca, 0x0c, 0x24, 0x90, 0x71, 0xdf, 0x4d, 
-0x9f, 0x0a, 0x6c, 0xee, 0x8c, 0x59, 0x7a, 0x3a
+0xef, 0x44, 0x85, 0x9c, 0x54, 0x0b, 0xda, 0x4b
 };
 
 size_t secret_b_len = 32;
 unsigned char secret_b[32] = {
-0xa8, 0xce, 0x93, 0x86, 0xff, 0xa9, 0x16, 0xdc, 
+0x78, 0x2c, 0xbf, 0x98, 0x20, 0x9e, 0x8a, 0xab, 
-0x88, 0x2a, 0xd3, 0xab, 0x30, 0x25, 0x9c, 0xf0, 
+0x7b, 0x26, 0x71, 0x4d, 0x06, 0x70, 0x27, 0x0b, 
-0x6e, 0x5e, 0x4e, 0x83, 0x7d, 0x96, 0xa1, 0x08, 
+0x18, 0xd9, 0x4a, 0x5d, 0x1c, 0x12, 0xb3, 0xc1, 
-0x18, 0x44, 0x30, 0x68, 0x9b, 0xb7, 0xd0, 0x5f
+0x5c, 0x43, 0x69, 0x6a, 0xd1, 0x40, 0x6a, 0x41
 };
 
 size_t public_b_len = 32;
 unsigned char public_b[32] = {
-0x71, 0xb3, 0x81, 0xa1, 0x16, 0xfd, 0x37, 0x3d, 
+0xa3, 0x24, 0x7a, 0x84, 0x38, 0x90, 0xbe, 0x91, 
-0xff, 0xd6, 0xb3, 0xb3, 0xd3, 0x8e, 0xe0, 0xaa, 
+0xee, 0x5f, 0x6b, 0xe6, 0x04, 0x08, 0xa6, 0xba, 
-0xb6, 0xf9, 0x01, 0xf8, 0xe7, 0xfc, 0xc3, 0x6a, 
+0x9e, 0x16, 0x3b, 0x66, 0x92, 0x3c, 0xf6, 0xc1, 
-0x7a, 0xfe, 0xab, 0x09, 0x52, 0x22, 0x45, 0x63
+0x10, 0xa8, 0xaa, 0x7e, 0x30, 0x4f, 0x2b, 0x3b
 };
 
 size_t message_len = 12;
@@ -38,16 +38,16 @@ unsigned char message[12] = {
 
 size_t nonce_len = 24;
 unsigned char nonce[24] = {
-0xf9, 0x40, 0x18, 0xd2, 0xdc, 0xf6, 0xab, 0x80, 
+0x68, 0x0f, 0x5f, 0x72, 0x33, 0xbb, 0x24, 0x29, 
-0xfb, 0xe0, 0x77, 0x59, 0x21, 0xaa, 0xd5, 0xa6, 
+0xab, 0x06, 0xd5, 0x70, 0xea, 0x27, 0x74, 0x0e, 
-0xd3, 0xe1, 0x8b, 0xc4, 0xbd, 0x22, 0xee, 0xbc
+0x91, 0xf9, 0x0b, 0xda, 0x2f, 0x50, 0xc3, 0xd9
 };
 
 size_t cipher_len = 28;
 unsigned char cipher[28] = {
-0x74, 0x81, 0x08, 0x7c, 0xf6, 0x45, 0xd0, 0x99, 
+0x36, 0xb9, 0x2c, 0xc4, 0x02, 0x38, 0xae, 0xbc, 
-0x58, 0x79, 0xbb, 0x84, 0x40, 0x0a, 0x13, 0x8a, 
+0x6a, 0xb8, 0x21, 0x4c, 0x30, 0x1d, 0xac, 0x6c, 
-0x73, 0x1a, 0x2b, 0x4f, 0x13, 0x57, 0x15, 0xfb, 
+0x14, 0x2d, 0xfc, 0x2a, 0xb6, 0x9b, 0x6c, 0x20, 
-0x07, 0x7e, 0x06, 0x88
+0x95, 0x3e, 0xe3, 0x73
 };
 

tests/unknown1

@@ -1,9 +1,9 @@
 ----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----
-1][S608}PxJV>G/!8Vhi)6Yjo!DqLQW5^vbPD}hvgBgfIFYGdsF77eJBiMBwyG&+-To2i}B
+1][S6097-%&#%s9D*[RVp:%rAl!evYxQ7<h9yTfqgG!sj=&3GmsrH]at9-x2nn2^O@G{1u&
-gL#xzQ2xNoQbS-@TJ#x*^T-MRClOblFE]jR?lEgVR$y7Q[L>z5EUww{J=kA+%IHNbo^9)00
+<$hyGP4mePZaZ[?1CxLQi$fUHo>I4C5*B00^e2rhV/-XKN+Aw4F0PT6t8qS[b@+lbo^9)00
-0080SSi208}PxJ@PdW2M>5b0033hD>chS00&(h00010Yl>7*000Gy00SAaB7GxavqHsVvL!
+0080SSi2097-%<nYeW2M>5b0037krB=7f00&(h000125(&Aw000Gy00SAaB7GxavqD5e/R5
-5+01Y?A1PO^CCwZ#jphaoRvqYPQ000-F00Aohzddc{zFrW0vqYQvy&r/(yYBCn0uh2cID>+
+oB01Y?A1PO^CCwZ#jphaoRvqYPQ000-F00Aohzddc{zFrW0vqYQvy&r/(yYBCn0uh2!.O?*
-C0tc$Ga.-{JG^nWb+c)h6dy{}!p(HtZ/X28Vr{%rAl73K1KU-cUF(&!lXL^itwL^l)gNRM1
+XJ$:1%==@=R7{:wD{CzQ[1]-2k5P:K5=@EM@h1?[9Yigq3Bsr=:O?Cjw!1gq=%i..Tf4Xk<
-B/C<=9Ysfd@hKyQ0$g(f+=%dOD.zeUGy#[j@Kt:srRjF<hY)Ma6{Er4+tD#[AG[ImXf^ke@
+X7.mYD{R1[lTkTa2qc^xu1&6z8ECuigL@C!mT&vgD1TCgf9/)(6En?^OCZhRKw&<mLTPBc>
-8aZ[g(jL55=QkV00001
+pI3zkiaG>bsHt/@d%.v
 ----- END ED25519-CURVE29915 PUBLIC KEY -----

tests/unknown2

@@ -1,8 +1,8 @@
 ----- BEGIN ED25519-CURVE29915 PRIVATE KEY -----
-7z!4XlTnE<{pyNIUPKRe)c/&(C*69HiE.2HEUvk}.{wei49/gs&i?h<M#dSaAZfFPoU/{o4
+k?.94xGjnQjK&1E]du2^aqzGt00=MS(BW^@1sWBErpH0CmaP1L1f//1Yl01v&li$iv>G06I
-5LN:4E!J{r0!p[A3PfY3Zn%S?@)lNZVE+f{?l6[hDHdFo2?u6LmtJAq+BK[(D[<sP9rt@AP
+74-AC2C5u>x]c4T5g[yPhUs?SaHMW9f{LNrsr@n^db?cJt(L(TFzeV{p}Nv5?R*6mo/TC)0
-a-!LU#u?.i(]Ic.sb.O&8UcWHf@*:n2-:M/HZb&7[?HK4}/lZL?7RFQB>dkbpwbVT6z[=*a
+@PBItOguyj6YTKBRLdsuaUxfYk.*LGcH(1gf&#}j--1n(ewi!$izcClGTuKt1tRWXiuYYE7
-)f?0y3>Ccx1rtWn>jkD*#fz{so-a]r+KxOyNf0.+![hraO(]D9EC+]i@T=G1WinO?I>n[lo
+6o@hV%?y{{:3j5It%N+]B8w*P#C.*N^*S0Z2p)vszkF3hyE*1(Fj5bDheH/KnTDCKqoLs.2
-hqW&W/FvEHflDY73Ww)Q6[3w7oT)woNhZEa^^G1baNKF[?pLg)=-UJ.1hRVf1B]LZon$W{n
+3!=^SFytRDMEfJDH.n:&sPoQW?E<g9t?69uo4+Lw[dpQ4PL$LAnnokWOKoX*HdHkvW1WqoH
-Ra[hEp4lT)8?DfO[a^%TPGNJSu5y?mbJvcmQ5?i.)B8qe0:Hy@jxWYbr(![Wrkz.{00000
+Sj*09.eu*oPr4&%Cd7WodrgX(%9g6W^s*l-96y5P.?8yUCj>iJ({-eP+aSRq2dB&>T*O9c
 ----- END ED25519-CURVE29915 PRIVATE KEY -----

tests/unknown4

@@ -1 +1 @@
-7PsEP4u#Q3RHx+3j*qzsPG*m5FRmq9YAVXA!>h^si9SJ4%ma3oPM]j+-Z}MU00001
+7xBKNd@2v[N-5aot3DW1)P}.#QtXBYNqN5F]/#IQ6^9lJZ?zHM^l5}rTJ:ckwO&1W