From 0525a52127719e163bc66f9e3f26c3983244f298 Mon Sep 17 00:00:00 2001 From: Retriever <16319106+SheldonHH@users.noreply.github.com> Date: Fri, 10 Dec 2021 17:10:55 +0800 Subject: [PATCH 1/2] push original file from Dr.Duan --- .../p4p/p4p/bench/UserVector2Bench.class | Bin 11796 -> 11743 bytes .../p4p/p4p/crypto/BitCommitment.class | Bin 8179 -> 8176 bytes .../p4p/p4p/crypto/Commitment.class | Bin 2373 -> 2373 bytes .../p4p/p4p/server/P4PServer$UserInfo.class | Bin 1628 -> 1531 bytes out/production/p4p/p4p/server/P4PServer.class | Bin 8604 -> 6170 bytes out/production/p4p/p4p/sim/P4PSim.class | Bin 8518 -> 7738 bytes .../user/UserVector$L2NormBoundProof.class | Bin 4353 -> 4302 bytes out/production/p4p/p4p/user/UserVector.class | Bin 8743 -> 10082 bytes .../user/UserVector2$L2NormBoundProof2.class | Bin 8679 -> 8618 bytes out/production/p4p/p4p/user/UserVector2.class | Bin 14849 -> 13901 bytes src/java/p4p/bench/UserVector2Bench.java | 256 ++++++------ src/java/p4p/crypto/BitCommitment.java | 174 ++++---- src/java/p4p/crypto/BitVectorCommitment.java | 140 +++---- src/java/p4p/crypto/Commitment.java | 43 +- src/java/p4p/crypto/Proof.java | 12 +- src/java/p4p/crypto/SquareCommitment.java | 122 +++--- src/java/p4p/crypto/ThreeWayCommitment.java | 132 +++--- src/java/p4p/crypto/VectorCommitment.java | 148 +++---- src/java/p4p/server/P4PServer.java | 317 +++++--------- src/java/p4p/sim/P4PSim.java | 229 ++++------ src/java/p4p/user/UserVector.java | 335 +++++++++------ src/java/p4p/user/UserVector2.java | 395 ++++++++---------- 22 files changed, 1101 insertions(+), 1202 deletions(-) diff --git a/out/production/p4p/p4p/bench/UserVector2Bench.class b/out/production/p4p/p4p/bench/UserVector2Bench.class index 48a6e8e3d7308d754de35de66bdf0ef0cc090bfc..e53da2115a303348148d5ac36723597bd3ed5918 100644 GIT binary patch delta 2828 zcmcIldsLNG7T>@9o$veL%5yIF@)QU`8Nk8FG1Fl(D_R_k+-3E!M30qYu{a{LVi6 z?6c3l=lo7>(dh|}cfa4gkBEMO&sICqQZWaFQU1i_7eM~xklqxKHerHo3kaY<3IeHz ziYtqERI~>g$P$my4b?%3h?))x@eKB)PbshVRFQp2mkN1$=ZOlwo< z&m2#h9gZA#59wVOw2Gb)5I(*KPEZwzb(sSqO{qV)37C`&hRdy zd@Q8`JVixVMw79EW@05(qJ|#DDyqh6S}5F$T6zl4(lc03Yq6HrV;wy&d=oa%Hf*F_ z*i5fu6E)&R+9&(~>Zlo8=mfS?3${`#w$Z1;&!L_!;br_;XJU?m^fp)$V|KcoMw56P=E$1YymIr8c z(r)Jzt$|au{hY2HUS#y= z$B;wBIW(LKNTC38$wAemb+Pr`w#IH-Yqu?xK1V6aL?5H+O4rrQmaA0&k6fQO$c1@w zJ-s2EE|bftkzzQrn~kCc_Hdl0Q4T7^F;NSpk*E}w#9z}aJS?mqe@63dzXWY1#oDYN z-^tt+FAE)b1dmc*K8`X}p_=0O6lP(*h)TS+n3}M_E5eYVU8Xz{hJ5O$oRooul1w7s z#GTR-jc@oO7U9xt2V$3+=X)LHE!?AK<7ttzV4P4nB58(*t;nY4qUbw1s6p39)Ir01Z(ofy zIeGBdAM7T*M=u9*wIM)`2fv?%#lw7p1zfd^nXv(d=q76e~K;n@z=C2{xsvR8;W;hk#5+SuU>iw zS-qFkDo%;@_7ccfk?RF<_PQ(E?}z=z(f@Glu5hwEmAzph7reUJX{d-R{{(cggQt*6tj$J^Lr`~_^X{0C-u?e#f+!UUp&$sdK$j>|7ZgeNJ&CchWOemNPjbKcW@gWx zJu`d0Ia9EBwByk29lMC=K3rPpNFS)m3v+To7}|lD0s^T6IY2?Ox#cWYIC02RZ4;)XLy!yu}=H&XKSgm8(y_`Is4)@>nmqGwppFSJ$SOOedS8T z`&O5TWPD&{M)VA50`(YCTvKZu4o_3fpw3o*R~P)lIuJ2SeFRFfzV4KynYd_qBTq(P zI0X~r@b1M3ub7fG<=!R@$w3?x%R`dThj9RJ z>`5bQZCurg8 ztZ5o6EsPBx3xkJ(n>i*tK(2@4tLU?VyCv4UD`$|H?do*=O}Ft z$7uUGRy)dZS`&BGKIC}qA}459IZ?aL$x7#L%E2kh$=#Kk(^MR%t9b6AdUH?pAWo}? zI74Ogy())$seJCOO1O`j%)Y*AI`>m^xW8J+1Jruq8~Hx9g9oZc{*h|t`_&m9q^|G- z>M9RbH#k#g{;?h^Wd#3J_wZ0Xg&)#?$XWUj{<%JkAJ!*Iy+ZnGc$hwqhwBSDM_;NP6%jC9K=hm-Lh#hK_x(1iM z!A^A*z3pJaj3A1#Cw3AU-7s4;hDaF+qBDkQq-l6WZ46=`IgA()9YaJi*oZ=|FhyZT z1fG&z&?($-iX1gatJ??>K@xGsAoVfkizo%4T5Xk^pCjj4r#9N^-VvMCR9o?buuV{Mk~B(fEP6DnJz%Md{pE!A8U{XmQ4M+Xy2(Do6vP=Eicy2MIN=_Od064~#Y zUXu0ep^ diff --git a/out/production/p4p/p4p/crypto/BitCommitment.class b/out/production/p4p/p4p/crypto/BitCommitment.class index 0f78166b175799d084ce9795631e9b0a213fe6ae..09c74cda83f9ec857251b631adf3561f0e5a729a 100644 GIT binary patch delta 14 Vcmext|G|EPlprJDW;wyDd;l#E1rY!M delta 17 Ycmexh|JiqbW~`=12(~A1}=sa24#j+23>|U2789Q$sgHr7|SQeu}5*%1LYbR_!$}}A7qc? p>}B9)=wlFIm@rv`BY<(nqbW~`=12(}V1}=tV24#j623>|!2789w$sgHr7|SNdu}5*%0p;o$_!$}|A7qc? p>|x+$=w%RK=%1{?5x_WoawUfi_rhZR+a_?JFOHUVwhTd0l{9- z-aLaZ;4=ioaqCoP_-4*I^PTNwg6{A8Cs3!+2_8Ii)p^g>#LAR$wlE!-|Zap(sZ%A)6{!SowN%q%A1n5 slE<{CpdbJDEU_#-7a5V_z*u=jzw)TEnre-8)lnrLH8%8mlWle|f3Wf~g8%>k delta 456 zcma)1yG{Z@6g@M`VgzE0qDWyxv&*8OsHphB*ALKGK}<#@Lm*~Z+y(6HG)660Cb94j zENLyYve5Vm{)ve?5KBzVE$+=Z=bm%#r~f11d;5BP0+7L;>$~>*nyle)yHYJ#?p-z+ z&#|Iqnw7fAt96IfEmq^)W=^?ab7qxTvCNAnPQzpe+$IQ#eHv<$HYH8bBJVNdpW7l& zvt(U7(3B@b5Oq6I?*MiPf^H`$B1$XFFo+z6kjE$vF@YmYqJSA3i&rJ?*DwqP1UjPP zThYR0MC3yOi2y35r4Dj75EB`XZqy`p+Ea{!O2+%E=uTZHB5M|N;>x3i&-yyWkq|GE zJ@3oTV?j_=S1)AFrAVk#N)n4AtLny$L~j2`UXovRlb4Ya_o_x*@vM#+EAl>yRjl=T U8XK~YNQ5GdO{w0(Hg-XN0CY=OfB*mh diff --git a/out/production/p4p/p4p/server/P4PServer.class b/out/production/p4p/p4p/server/P4PServer.class index 8b31772a7a0b9e28d07a8c9edf383fef3c1aeb70..a392c00e800161bd7763ad9e0d8db10a99ea6f03 100644 GIT binary patch delta 2836 zcmah~3v^V~72Rj%y?HZ}H_7BPlZ+%Gi2?E>Au+}hghKelP(ack1;SE>Bw!$tkOVcX zWoJRD*u=Kt(_&L4n4%!s$|npVNI<35+JCFnNu`m2DyiS97gF;H4=(Ux_8TglVJYjRZ<`rFBh8R2^aa*(fr^RbM zlz5$(R!Y)jiMOhf!s*PCZ(aEIaLK05=9Uu1B+%z>=xpyYBxs#XD$vpdnO3Vm(~3)O zNq&j6b>O=&nN=O%*P>+u*i;&I$Tn%spaum$_^Lt4H82FI=V5q`|Knz2-f zfU_k?Lx{kXa2kc0J!6d!q>{xEu*;q$aAx2qoChJ7>Dw^i7EQ#!Px+@@FoU`(uyZN1 zmaD)rZO2b@Jb*+}a2yV^;tnAX11P}}8(fgylM%oxF-TKlFqJ1SoQW49aser{`!l?1 zTkj4mv(uJCZi006;1u^hN6XK%c2A=mFJLNOWD>t)dnmA@svZr$8n4BCRpaMOu7f)# z;B}mV(~gf`lP@C6K&?i9q`vY>Pj%E(nMx@bu)@Jq8-t1$czHAuu8#UiiTP2H=x`*> zBxCUlG{(%8@vSzy3kFaeMffSs9Z+c-G5VTqRPlv6F{6UD_+@Orbv{^NV+h)3^(GSV z7UTLYbNM?`=j}1Er;lPvAB{a7zrwHSFaf?XvAZD`5n$+avL0{5Ty3SEVn(`xI&Kiv zQ7k-#+C`JC-KmLVFuX@=?-RoZ#PD}wIRCL2&f+)!7sHz)j3T*S+o;di%Hxa=)u0j)5gU!w(FcYbyk3~eto=Z#lZinZOyRv(cJrI#MiS1C*rE z@iyM!@#dlzzo(wVrv65FE}_)GAA~drvdpL1Wo`?EP#p#$l;WdOrxBr;^8Am=|ChE> z{t&nToquBZBmNX4S_$8Z@9K=R4sbH2AS5`ZAoS6K_%oJ6B6fk!pt>qhS3%(slL~=;#qSZYMmt#R_B&u_`G1jar7*wz|SYh zXDT0qk1ui*UtD+y_i?UDc?e$tqUd$bu&Gu!+>g5o16tWB^i}F1{TLn<_N>}USI8B` zW0gix$cW;JBJR$L;;AAfJrKo!dLOBD7lqtW9P7o^bP#e4;KUF&EAs{RR}{~FCZhPI z8WVCu3Q#Ve;2^$blW%KGkT+(5rZR@uAC(!ED9vW2eG$nd_#_|sQh;evgy}LF)l!Vb zQi_#Qh6cG7%~FAlave6yC$L4PqB|m$=#}fSM?Q(YG86ly3dgzeS((E-elFgSd3NSk zGN+5#SkB>Hp8QJO!gh3qId8x+yvH*zcxP4GjmeFfoU2PgHJ-Dvv+}XkzR&g|q}m|< z#wO#ybl!ZC^Hg-=A5>KhbHv4mbfJ20HMGmLrt`isaKS(iiOkY#hG&e#Kp(rFfqxpf zs8;>|p+CaZOV~&A>M|J1)Z7F2XX_oKom)QjUx=#FCizH`DSoSqrIux{t_vqiU&LdN jarWqw1g_*ztCm-+pSl+bI+5=_Ns<(oM*@;6A%y-7dh9YR literal 8604 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 diff --git a/out/production/p4p/p4p/sim/P4PSim.class b/out/production/p4p/p4p/sim/P4PSim.class index 9b812bf0d749485c6f6096f6a428919ba8c782e2..565634b741d2567df141a5f75bc1f151b6bee725 100644 GIT binary patch literal 7738 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 IR literal 8518 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 Rewt$X1aTdgPcoc`{{oDnapM30 diff --git a/out/production/p4p/p4p/user/UserVector$L2NormBoundProof.class b/out/production/p4p/p4p/user/UserVector$L2NormBoundProof.class index d42327584808efca00aba4101ecf2fa94f22aa2e..81fa71b401ffc5e5cffa515b855ba09c58dc12bb 100644 GIT binary patch delta 574 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 delta 4938 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 HjL^RTd_g3B diff --git a/out/production/p4p/p4p/user/UserVector2$L2NormBoundProof2.class b/out/production/p4p/p4p/user/UserVector2$L2NormBoundProof2.class index 955f1ae6d0b953686e371604572612227fb2af45..194d5b639a49da3f52655298e60502e9863c5cc7 100644 GIT binary patch delta 744 zcmW;KS!|496vpxMKkxf~OpU71ibzV^&=H}HN{Xs|iRnl*B1Kw>t?EMTTP&$qLWuRV zgvP!kNNiIgZcrhyr()kOh`O;hwls*(O4s& zUpi1AdGwV26v`-i$s~HqJc?uu{bU#YrG|mBpTTmNVN%O*xxol|MNGa?f+bEjMlvRt zsgyCF@$8_S(^OE;1l}`|CMIb!CTl8{n!_}W2HBk|Ev{y!mNHw%GDjvn|+Z;6yIc8pS+%#~`d>~+{&2;EBD! zQ+thP_8!meBVO7Uyt0kFuC{-8<1BAoDh)1+CoY$du7FRjn9nZ87dMWtu98MKgYRxG zKipD&x)uC#YiM$t`R#VAxI>CNsm7gG>n^M39tYh^4Y_xk;u^Ju`>SCuq^-P&rg@nf z@p3htJ|gm45j|G0p()cpOf34{^;dtrUZ3~p&F8OAM|F2~ z=SB^GbeN3KCG0jIvB#{U(|pNZvx%(vo(8jz1E%#bhs<#fo3k7-7dUEu;h4F_59T(f z%|p(ZN1U~mOSTV}ZI~;zh^sbAmwka>?JN9dYq(}>xo#8Ounj&_blWt)+cuvo`NMkL zwjJED2l&&T;I93Vd-ftdwu}3=hX<|pZyq|!UoOOB7vYX8RpYAEx|li__djl?_Hrrh z?V7Z&%V^Lo)qZZdhTIAr;8ttcZO|v(HXZDC>kzkJpLWM|sJrCve$wIYrbb+k7Q276 zBv7Ew1;SbyDAKY(sh0Dyh&-0;p`w%UV(uTjuZBk%lehD}#qt)4L>ZU2I^SyY_K9!f ReTy+MKWlN6gjZg?{9jpd&d2}& diff --git a/out/production/p4p/p4p/user/UserVector2.class b/out/production/p4p/p4p/user/UserVector2.class index b7ef31ba8731ba2b09a5a53a91c5a5cc94e737df..67ecfd68d4421a31f8916a5f19615034626b59c4 100644 GIT binary patch literal 13901 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 HB>(>cbX{uz literal 14849 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 + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - *

+ * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - *

+ * notice, this list of conditions and the following disclaimer. + * * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - *

+ * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * 3. The name of the University may not be used to endorse or promote products - * derived from this software without specific prior written permission. - *

+ * derived from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -58,8 +58,8 @@ /** * * This is essentailly the same class as user.UserVector2 as of reversion r15 (until 12/08/2005). - * As an initial implementation, it only implemented the basic crypographic tools, no real - * computation. It is good as a benchmarking tool since it contains all the expensive crypto + * As an initial implementation, it only implemented the basic crypographic tools, no real + * computation. It is good as a benchmarking tool since it contains all the expensive crypto * steps. It is moved to this package to preserve the banchmarking capability. Real development * will go on in the user package. * @@ -86,7 +86,7 @@ public class UserVector2Bench extends UserVector { public UserVector2Bench(long[] data, long F, int l, NativeBigInteger g, NativeBigInteger h) { super(data, F, l); - this.g = g; + this. g = g; this.h = h; sc = new SquareCommitment(g, h); } @@ -95,8 +95,8 @@ public UserVector2Bench(long[] data, long F, int l, NativeBigInteger g, NativeBi /** * A zero-knowledge proof that the vector L2 norm is bounded by L. *

- * This proof uses another method. Namely instead of checking each checksum individually - * it checks the sum of their squares. This still gives the bound but uses fewer bit + * This proof uses another method. Namely instead of checking each checksum individually + * it checks the sum of their squares. This still gives the bound but uses fewer bit * commitment proofs. Note that the challenge vectors are chosen from {-1, 0, 1}. */ public class L2NormBoundProof2 extends Proof { @@ -108,11 +108,11 @@ public class L2NormBoundProof2 extends Proof { // Construct the ZKP that the commitment contains a bit public void construct() { - if (checkCoVector == null) + if(c == null) throw new RuntimeException("Checksum vector not set yet."); - checksums = new long[checkCoVector.length]; - scProofs = new SquareCommitment.SquareCommitmentProof[checkCoVector.length]; + checksums = new long[c.length]; + scProofs = new SquareCommitment.SquareCommitmentProof[c.length]; SquareCommitment sc = new SquareCommitment(g, h); // Compute the checksums: @@ -120,7 +120,7 @@ public void construct() { BigInteger squareSumCommitment = BigInteger.ONE; // Commitment to the sum of the squares BigInteger sRandomness = BigInteger.ZERO; - for (int i = 0; i < checkCoVector.length; i++) { + for(int i = 0; i < c.length; i++) { // checksums[i] = 0; // for(int j = 0; j < m; j++) { // //s += c[i][j]*data[j]; @@ -129,7 +129,7 @@ public void construct() { // else if(c[i][j] == -1) // checksums[i] -= data[j]; // } - checksums[i] = Math.abs(Util.innerProduct(checkCoVector[i], data_UV)); + checksums[i] = Math.abs(Util.innerProduct(c[i], data)); /** * Note that although all the normal compuations are done in * a small finite field, we don't restrict the size of the @@ -143,11 +143,11 @@ public void construct() { //System.out.println("cs = " + cs); sc.commit(cs); - scProofs[i] = (SquareCommitment.SquareCommitmentProof) sc.getProof(); + scProofs[i] = (SquareCommitment.SquareCommitmentProof)sc.getProof(); - if (debug) { + if(debug) { // lets check here: - if (!sc.verify(scProofs[i])) { + if(!sc.verify(scProofs[i])) { throw new RuntimeException("Square commitment proof or verification is not working properly. i = " + 1); } } @@ -158,12 +158,12 @@ public void construct() { sRandomness = sRandomness.add(sc.getSb()).mod(q); } - if (debug) { + if(debug) { // Lets verify if we compute the commitment to the sum of squares correcly: System.out.print("Checking commitment to sum of squares ..."); Commitment cm = new Commitment(g, h); BigInteger ssc = cm.commit(squareSum, sRandomness); - if (!ssc.equals(squareSumCommitment)) { + if(!ssc.equals(squareSumCommitment)) { throw new RuntimeException("Commitment to sum of squares wasn't computed correctly!"); } System.out.println(" done."); @@ -178,10 +178,10 @@ public void construct() { squareSumCommitment = squareSumCommitment.multiply(squareSumCommitment).mod(p); // 2x // Lets check if the commitment was computed correctly: - if (debug) { + if(debug) { System.out.print("Checking commitment to 2*(sum of squares) ..."); Commitment cm = new Commitment(g, h); - if (!cm.verify(squareSumCommitment, squareSum, sRandomness)) + if(!cm.verify(squareSumCommitment, squareSum, sRandomness)) throw new RuntimeException("Commitment to 2*(sum of squares) wasn't computed correctly!"); System.out.println(" done."); } @@ -191,18 +191,18 @@ public void construct() { commitment[0] = squareSumCommitment; - int numBits = Math.max(squareSum.bitLength(), Integer.toBinaryString(checkCoVector.length).length() + 2 * l_UV); + int numBits = Math.max(squareSum.bitLength(), Integer.toBinaryString(c.length).length()+2*l); // Even for small squares we must do all the commitments otherwise leak info. DEBUG("squareSum has " + numBits + " bits"); bcProofs = new BitCommitment.BitCommitmentProof[numBits]; BitCommitment bc = new BitCommitment(g, h); - for (int i = 0; i < numBits - 1; i++) { + for(int i = 0; i < numBits - 1; i++) { BigInteger cc = bc.commit(squareSum.testBit(i)); - bcProofs[i] = (BitCommitment.BitCommitmentProof) bc.getProof(); + bcProofs[i] = (BitCommitment.BitCommitmentProof)bc.getProof(); - if (debug) { - if (!cc.equals(bcProofs[i].getCommitment()[0])) + if(debug) { + if(!cc.equals(bcProofs[i].getCommitment()[0])) throw new RuntimeException("Bit commitment wasn't computed correctly!"); } @@ -216,39 +216,39 @@ public void construct() { // Now the last bit: // First need to compute the randomness correctly: // BigInteger e = new BigInteger(new Long(((long)1)<<(numBits-1)).toString()); // 2^l - BigInteger e = BigInteger.ZERO.setBit(numBits - 1); // 2^l + BigInteger e = BigInteger.ZERO.setBit(numBits-1); // 2^l e = e.modInverse(q); sRandomness = sRandomness.multiply(e).mod(q); // divide by 2^l - bc.commit(squareSum.testBit(numBits - 1), sRandomness); - bcProofs[numBits - 1] = (BitCommitment.BitCommitmentProof) bc.getProof(); + bc.commit(squareSum.testBit(numBits-1), sRandomness); + bcProofs[numBits-1] = (BitCommitment.BitCommitmentProof)bc.getProof(); // Lets check it here: - if (debug) { + if(debug) { System.out.print("Checking homomorphism ..."); BigInteger ZZ = BigInteger.ONE; BigInteger z = BigInteger.ZERO; - for (int i = 0; i < numBits; i++) { + for(int i = 0; i < numBits; i++) { //BigInteger e = new BigInteger(new Long(((long)1)< Integer.toBinaryString(checkCoVector.length).length() + 2 * l_UV) { + if(bcProofs.length > Integer.toBinaryString(c.length).length()+2*l) { System.out.println("Sum of squares has too many bits: " + bcProofs.length - + ", the limit is " + (Integer.toBinaryString(checkCoVector.length).length() + 2 * l_UV)); + + ", the limit is " + (Integer.toBinaryString(c.length).length()+2*l)); return false; } @@ -310,8 +310,8 @@ public boolean verify2(Proof proof) { // Check the square proofs: SquareCommitment sc = new SquareCommitment(g, h); - for (int i = 0; i < scProofs.length; i++) { - if (!sc.verify(scProofs[i])) { + for(int i = 0; i < scProofs.length; i++) { + if(!sc.verify(scProofs[i])) { System.out.println("Square verification " + i + " failed."); return false; } @@ -320,12 +320,12 @@ public boolean verify2(Proof proof) { // Now the bit commitment for the sum. First check if the commitment is // computed correctly: BigInteger z = BigInteger.ONE; - for (int i = 0; i < scProofs.length; i++) { + for(int i = 0; i < scProofs.length; i++) { z = z.multiply(scProofs[i].getCommitment()[1]).mod(p); // *= B } z = z.multiply(z).mod(p); // commitment[0] actually stores 2X - if (!l2Proof.getCommitment()[0].equals(z)) { + if(!l2Proof.getCommitment()[0].equals(z)) { System.out.println("Commitment to square sum wasn't computed correctly."); return false; } @@ -337,8 +337,8 @@ public boolean verify2(Proof proof) { DEBUG("Checking " + bcProofs.length + " bit commitments"); BigInteger ZZ = BigInteger.ONE; - for (int i = 0; i < bcProofs.length; i++) { - if (!bc.verify(bcProofs[i])) { + for(int i = 0; i < bcProofs.length; i++) { + if(!bc.verify(bcProofs[i])) { System.out.println("Bit commitment verification " + i + " failed."); return false; } @@ -347,11 +347,11 @@ public boolean verify2(Proof proof) { BigInteger e = BigInteger.ZERO.setBit(i); // Note that we can't use ((long)1)< 0 && arg.charAt(0) == '-') { + if(arg.length() > 0 && arg.charAt(0) == '-') { if (arg.equals("-k")) { try { k = Integer.parseInt(args[i++]); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) { k = 512; } - } else if (arg.equals("-m")) { + } + else if(arg.equals("-m")) { try { m = Integer.parseInt(args[i++]); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) { m = 10; } - } else if (arg.equals("-N")) { + } + else if(arg.equals("-N")) { try { zkpIterations = Integer.parseInt(args[i++]); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) { zkpIterations = 50; } - } else if (arg.equals("-o")) { + } + + else if(arg.equals("-o")) { try { nLoops = Integer.parseInt(args[i++]); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) { nLoops = 10; } - } else if (arg.equals("-l")) { + } + + else if(arg.equals("-l")) { try { l = Integer.parseInt(args[i++]); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) { l = 40; } - } else if (arg.equals("-d")) { + } + + else if(arg.equals("-d")) { debug = true; - } else if (arg.equals("-w")) { + } + else if(arg.equals("-w")) { worstcase = true; // test the worst case cost. i.e. every vector should pass. this is when the verifier spends longest time. - } else if (arg.equals("-bench")) { + } + else if(arg.equals("-bench")) { doBench = true; } } @@ -434,7 +449,8 @@ public static void main(String[] args) { SecureRandom rand = null; try { rand = SecureRandom.getInstance("SHA1PRNG"); - } catch (java.security.NoSuchAlgorithmException e) { + } + catch(java.security.NoSuchAlgorithmException e) { System.err.println("NoSuchAlgorithmException!"); e.printStackTrace(); rand = new SecureRandom(); @@ -444,8 +460,8 @@ public static void main(String[] args) { // Lets make l = log_2 (m) //int l = Math.max(10, (int)Math.ceil(Math.log(m)/Math.log(2.))); // We restrict L to be 32 bits - long L = ((long) 2) << l - 1; - long F = BigInteger.probablePrime(l + 10, rand).longValue(); + long L = ((long)2)<val is contained in the commitment @@ -115,7 +115,7 @@ public BigInteger commit(boolean val, BigInteger r) { public boolean verify(BigInteger c, BigInteger val, BigInteger r) { if(!val.equals(BigInteger.ZERO) && !val.equals(BigInteger.ONE)) return false; - + return super.verify(c, val, r); } @@ -129,8 +129,8 @@ public Proof getProof() { public BigInteger f(BigInteger i){ return h.modPow(i, p); } - - + + /** * A zero-knowledge proof that the commitment contains a bit. The protocol * is based on the f-preimage proof of @@ -141,15 +141,15 @@ public BigInteger f(BigInteger i){ */ public class BitCommitmentProof extends Proof { public BitCommitmentProof() { super(); } - + // Construct the ZKP that the commitment contains a bit public void construct() { if(val == null) - throw new RuntimeException("Must commit to a bit first" - + "before constructing the proof!"); - + throw new RuntimeException("Must commit to a bit first" + + "before constructing the proof!"); + commitment = new BigInteger[3]; - commitment[0] = new NativeBigInteger(commit(val, r)); + commitment[0] = new NativeBigInteger(commit(val, r)); /** * The first element is the commitment itself. Note we must use our * own randomness here since we already committed to a bit. @@ -158,7 +158,7 @@ public void construct() { */ challenge = new BigInteger[1]; response = new BigInteger[4]; - + BigInteger v = Util.randomBigInteger(q);; BigInteger e1 = null; BigInteger z1 = null; @@ -166,23 +166,23 @@ public void construct() { BigInteger z0 = null; BigInteger m0 = null; BigInteger m1 = null; - + if(val.equals(BigInteger.ZERO)) { e1 = Util.randomBigInteger(q);; z1 = Util.randomBigInteger(q);; // calculate m0, m1: m0 = f(v); - + /** * Note: NativeBigInteger seems to be unable to handle negative * exponents properly. We should avoid using * modPow(e1.negate(), p) before we fix the implementation. */ - BigInteger t = (commitment[0].modInverse(p)).modPow(e1, p); + BigInteger t = (commitment[0].modInverse(p)).modPow(e1, p); // c^ -e1 t = t.multiply(g.modPow(e1, p)); m1 = (t.multiply(f(z1))).mod(p); // f(z1) * c ^ (-e1) * g ^ e1 - + commitment[1] = m0; commitment[2] = m1; // Get challenge which should be a hash of the commitment: @@ -202,12 +202,12 @@ public void construct() { else if(val.equals(BigInteger.ONE)) { e0 = Util.randomBigInteger(q);; z0 = Util.randomBigInteger(q);; - + // calculate m0, m1: m1 = f(v); - m0 = f(z0).multiply((commitment[0].modInverse(p)).modPow(e0, p)); + m0 = f(z0).multiply((commitment[0].modInverse(p)).modPow(e0, p)); // f(z0) * c ^ (-e0) - + commitment[1] = m0; commitment[2] = m1; // Get challenge which should be a hash of the commitment: @@ -224,15 +224,15 @@ else if(val.equals(BigInteger.ONE)) { z1 = v.add(e1.multiply(r)).mod(q); // v + e1 * r; } else - throw new RuntimeException("Not a bit commitment!"); - + throw new RuntimeException("Not a bit commitment!"); + response[0] = e0; response[1] = e1; response[2] = z0; response[3] = z1; } } - + /** * Verifies the given proof using our own parameters. * @@ -246,16 +246,16 @@ public boolean verify(Proof proof) { BigInteger[] c = proof.getCommitment(); BigInteger[] s = proof.getChallenge(); BigInteger[] r = proof.getResponse(); - + if(c.length != 3 || s.length != 1 || r.length != 4) return false; - + return verify(c[0], c[1], c[2], s[0], r[0], r[1], r[2], r[3]); } - - private boolean verify(BigInteger c, BigInteger m0, BigInteger m1, - BigInteger s, BigInteger e0, BigInteger e1, + + private boolean verify(BigInteger c, BigInteger m0, BigInteger m1, + BigInteger s, BigInteger e0, BigInteger e1, BigInteger z0, BigInteger z1) { // Also need to verify the hash @@ -263,7 +263,7 @@ private boolean verify(BigInteger c, BigInteger m0, BigInteger m1, msg[0] = c; msg[1] = m0; msg[2] = m1; - + try { if(!s.equals(Util.secureHash(msg, q))) { System.out.println("Challenge is not equal to the hash!"); @@ -275,36 +275,36 @@ private boolean verify(BigInteger c, BigInteger m0, BigInteger m1, e.printStackTrace(); return false; } - + // Pass 1: if(!s.equals((e0.add(e1)).mod(q))) { System.out.println("Verification failed 1"); return false; } - + // Pass 2: BigInteger vv = (m0.multiply(c.modPow(e0, p))).mod(p); // m0*c ^ e0 if(!f(z0).equals(vv)) { System.out.println("Verification failed 2"); return false; } - + // Pass 3; //NativeBigInteger nvv = new NativeBigInteger(bit_c.multiply(g.modInverse(p))); - NativeBigInteger nvv = - new NativeBigInteger(c.multiply(g.modInverse(p)).mod(p)); + NativeBigInteger nvv = + new NativeBigInteger(c.multiply(g.modInverse(p)).mod(p)); vv = nvv.modPow(e1, p); //m1 * (c/y)^e1 vv = (vv.multiply(m1)).mod(p); if(!f(z1).equals(vv)) { - System.out.println("Verification failed 3. f(z1) = " + f(z1) - + ", vv = " + vv); + System.out.println("Verification failed 3. f(z1) = " + f(z1) + + ", vv = " + vv); return false; - + } - + return true; } - + /** * Test the BitCommitment and the ZKP @@ -313,14 +313,14 @@ public static void main(String[] args) { int k = 512; int N = 32; int nLoops = 100; - + for (int i = 0; i < args.length; ) { String arg = args[i++]; if(arg.length() > 0 && arg.charAt(0) == '-') { if (arg.equals("-k")) { try { k = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { k = 512; } @@ -328,7 +328,7 @@ public static void main(String[] args) { else if(arg.equals("-N")) { try { N = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { N = 32; } @@ -336,15 +336,15 @@ else if(arg.equals("-N")) { else if(arg.equals("-l")) { try { nLoops = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { nLoops = 10; } } - + } } - + // Setup the parameters: P4PParameters.initialize(k, false); NativeBigInteger g = P4PParameters.getGenerator(); @@ -353,7 +353,7 @@ else if(arg.equals("-l")) { BitCommitment bc = new BitCommitment(g, h); - SecureRandom rand = null; + SecureRandom rand = null; try { rand = SecureRandom.getInstance("SHA1PRNG"); } @@ -362,9 +362,9 @@ else if(arg.equals("-l")) { e.printStackTrace(); rand = new SecureRandom(); } - + rand.nextBoolean(); - + System.out.println("Testing BitCommitment for " + nLoops + " loops ."); StopWatch proverWatch = new StopWatch(); StopWatch verifierWatch = new StopWatch(); @@ -372,27 +372,27 @@ else if(arg.equals("-l")) { for(int j = 0; j < nLoops; j++) { int val = rand.nextBoolean() ? 1 : 0; BigInteger c = bc.commit(val); - - System.out.println("BitCommitted to " + val); - + + System.out.println("Committed to " + val); + // Verify System.out.print("Testing commitment verification ..."); - if(!bc.verify(c, new BigInteger(String.valueOf(val)), - bc.getRandomness())) - System.out.println("Verification failed for test " + j - + ". Should have passed."); + if(!bc.verify(c, new BigInteger(String.valueOf(val)), + bc.getRandomness())) + System.out.println("Verification failed for test " + j + + ". Should have passed."); else System.out.println(" passed"); - + // Wrong randomness. Should fail: - if(bc.verify(c, new BigInteger(String.valueOf(val)), - Util.randomBigInteger(q))) - System.out.println("Verification passed for test " + j - + ". Should have failed (wrong r)."); + if(bc.verify(c, new BigInteger(String.valueOf(val)), + Util.randomBigInteger(q))) + System.out.println("Verification passed for test " + j + + ". Should have failed (wrong r)."); // Wrong value. Should fail: if(bc.verify(c, Util.randomBigInteger(q), bc.getRandomness())) - System.out.println("Verification passed for test " + j - + ". Should have failed (wrong value)."); + System.out.println("Verification passed for test " + j + + ". Should have failed (wrong value)."); // Test the ZKP: System.out.print("Testing bit commitment ZKP ..."); @@ -407,8 +407,8 @@ else if(arg.equals("-l")) { verifierWatch.start(); if(!verifier.verify(proof)) - System.out.println("ZKP failed for test " + j - + ". Should have passed."); + System.out.println("ZKP failed for test " + j + + ". Should have passed."); else System.out.println(" passed"); verifierWatch.pause(); @@ -416,18 +416,18 @@ else if(arg.equals("-l")) { long end = System.currentTimeMillis(); verifierWatch.stop(); proverWatch.stop(); - System.out.println("Bit commitment ZKP: " + nLoops - + " loops. ms per loop:"); + System.out.println("Bit commitment ZKP: " + nLoops + + " loops. ms per loop:"); System.out.println("\n Prover time Verifier time Total"); System.out.println("==================================================="); - System.out.println(" " - + (double)proverWatch.getElapsedTime()/(double)nLoops - + " " - + (double)verifierWatch.getElapsedTime()/(double)nLoops - + " " - + (double)(proverWatch.getElapsedTime() - +verifierWatch.getElapsedTime()) - /(double)nLoops); + System.out.println(" " + + (double)proverWatch.getElapsedTime()/(double)nLoops + + " " + + (double)verifierWatch.getElapsedTime()/(double)nLoops + + " " + + (double)(proverWatch.getElapsedTime() + +verifierWatch.getElapsedTime()) + /(double)nLoops); System.out.println("Total testing time: " + (end-start) + " ms."); } } diff --git a/src/java/p4p/crypto/BitVectorCommitment.java b/src/java/p4p/crypto/BitVectorCommitment.java index 8ad6e10..2ac0ece 100644 --- a/src/java/p4p/crypto/BitVectorCommitment.java +++ b/src/java/p4p/crypto/BitVectorCommitment.java @@ -9,7 +9,7 @@ import p4p.util.P4PParameters; /** - * + * * A bit vector commitment. It allows the committer to commit to an N-dimensional * vector of bits (0's or 1's). The commitment is a single element in Z_q. It * also includes a ZKP that proves that the commmitment contains a vector of bits @@ -25,11 +25,11 @@ public class BitVectorCommitment extends VectorCommitment { // The bit vector boolean[] bitVec = null; - + public BitVectorCommitment(NativeBigInteger g[], NativeBigInteger h) { super(g, h); } - + /** * Override this method to prevent users from using a BitVectorCommitment * object to commit to non-bit vectors. Since all commit calls in @@ -37,9 +37,9 @@ public BitVectorCommitment(NativeBigInteger g[], NativeBigInteger h) { * them all here. */ protected BigInteger vectorCommit(BigInteger[] vals, BigInteger r) { - if(vals.length != N) + if(vals.length != N) throw new RuntimeException("Incorrect dimension!"); - + BigInteger c = h.modPow(r, p); for(int i = 0; i < N; i++) { if(vals[i].equals(BigInteger.ZERO)) @@ -49,33 +49,33 @@ else if(vals[i].equals(BigInteger.ONE)) else throw new RuntimeException("Can only commit to bits!"); } - + return c; } - + /** * Given a matrix of bits, commit to a column specified by the * 2nd argument. The columns are numbered 0, 1, 2, ..., starting * from the LSB. Note that col specifies the position of ``bit'', * not ``byte''. */ - + public BigInteger commit(byte[][] bits, int col) { r = Util.randomBigInteger(q); return commit(bits, col, r); } - + public BigInteger commit(byte[][] bits, int col, BigInteger r) { - if(bits.length != N) + if(bits.length != N) throw new RuntimeException("Incorrect dimension!"); - + int byteIndex = col/8; // Which byte this bit belongs to int offset = col%8; // The offset within this byte. Starting from right - + if(col < 0 || byteIndex > bits[0].length) return null; - + bitVec = new boolean[N]; // Number of rows is the size of the bit vector - + BigInteger c = h.modPow(r, p); for(int i = 0; i < N; i++) { if((bits[i][byteIndex] & (1< 0) { @@ -86,47 +86,47 @@ public BigInteger commit(byte[][] bits, int col, BigInteger r) { bitVec[i] = false; // Nothing to do if the bit is 0 } - + return c; } - - + + /** * Given an array of longs, commit to a bit vector consisting of the * col-th bits of each number. The columns are numbered 0, 1, 2, ..., * starting from the LSB. Note that col specifies the position of * ``bit'', not ``byte''. */ - + public BigInteger commit(long[] vals, int col) { boolean[] bits = new boolean[vals.length]; - + for(int i = 0; i < vals.length; i++) { String bs = Long.toBinaryString(vals[i]); int len = bs.length(); if(len <= col) bits[i] = false; // It is a 0 - else + else bits[i] = (bs.charAt(len-col-1) == '1'); } - + return commit(bits); } - - + + /** * Commit to a bit vector. */ - + public BigInteger commit(boolean[] bits) { r = Util.randomBigInteger(q); return commit(bits, r); } - + public BigInteger commit(boolean[] bits, BigInteger r) { - if(bits.length != N) + if(bits.length != N) throw new RuntimeException("Incorrect dimension! N = " + N - + ", vector size = " + bits.length); + + ", vector size = " + bits.length); bitVec = bits; BigInteger c = h.modPow(r, p); for(int i = 0; i < N; i++) { @@ -135,17 +135,17 @@ public BigInteger commit(boolean[] bits, BigInteger r) { } // Nothing to do if the bit is 0 } - + return c; } - + /** * Return the bit vector contained in this commitment */ public boolean[] getBitVector() { return bitVec; } - + // The verifier: /** * Verify if the given vector is the one contained in the commitment. @@ -154,7 +154,7 @@ public boolean verify(BigInteger c, boolean[] vec, BigInteger r) { BigInteger cc = commit(vec, r); return cc.equals(c); } - + /** * A zero-knowledge proof that the commitment contains a bit vector. * This proof consists of N parallel bit commitment proofs which @@ -163,18 +163,18 @@ public boolean verify(BigInteger c, boolean[] vec, BigInteger r) { */ public class BitVectorCommitmentProof extends Proof { BitCommitment.BitCommitmentProof[] bitProofs; - + // Construct the ZKP that the commitment contains a bit public void construct() { commitment = new BigInteger[1]; commitment[0] = commit(bitVec, r); // Store the commitment in commitment[0] - + bitProofs = new BitCommitment.BitCommitmentProof[N]; - + BitCommitment bc; BigInteger rr = BigInteger.ZERO; - + for(int i = 0; i < N - 1; i++) { bc = new BitCommitment(g[i], h); BigInteger c = bc.commit(bitVec[i]); @@ -187,7 +187,7 @@ public void construct() { BigInteger c = bc.commit(bitVec[N-1], rr); bitProofs[N-1] = (BitCommitment.BitCommitmentProof)bc.getProof(); } - + public BitCommitment.BitCommitmentProof[] getBitProofs() { return bitProofs; } @@ -198,16 +198,16 @@ public Proof getProof() { proof.construct(); return proof; } - + // The ZKP verify public boolean verify(Proof proof) { BitVectorCommitmentProof bvProof = (BitVectorCommitmentProof)proof; BitCommitment.BitCommitmentProof[] bitProofs = bvProof.getBitProofs(); - + BigInteger c = BigInteger.ONE; BitCommitment bc; - + for(int i = 0; i < N; i++) { bc = new BitCommitment(g[i], h); if(!bc.verify(bitProofs[i])) { @@ -217,23 +217,23 @@ public boolean verify(Proof proof) { // The first element in the proof's commitment is the // bit commitment itself, } - + // Now check the commitment itself: if(!c.equals(bvProof.getCommitment()[0])) { System.out.println("Homomorphism does not hold. "); return false; } - + return true; } /** * Test the BitVectorCommitment. One run produced: - * + * * ./bin/p4p p4p.BitVectorCommitment -d -k 1024 -l 600 * * Total time: 2046921 ms. Average: 3411.535 ms per loop - * + * * This is with N = 32. * * Note that the binding of the commitment is probabilistic and @@ -245,14 +245,14 @@ public static void main(String[] args) { int k = 512; int N = 32; int nLoops = 10; - + for (int i = 0; i < args.length; ) { String arg = args[i++]; if(arg.length() > 0 && arg.charAt(0) == '-') { if (arg.equals("-k")) { try { k = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { k = 512; } @@ -260,7 +260,7 @@ public static void main(String[] args) { else if(arg.equals("-N")) { try { N = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { N = 32; } @@ -268,7 +268,7 @@ else if(arg.equals("-N")) { else if(arg.equals("-l")) { try { nLoops = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { nLoops = 10; } @@ -278,18 +278,18 @@ else if(arg.equals("-d")) { } } } - + System.out.println("k = " + k); System.out.println("N = " + N); System.out.println("nLoops = " + nLoops); - + // Setup the parameters: P4PParameters.initialize(k, false); - BitVectorCommitment bvc = - new BitVectorCommitment(P4PParameters.getGenerators(N), - P4PParameters.getGenerator()); + BitVectorCommitment bvc = + new BitVectorCommitment(P4PParameters.getGenerators(N), + P4PParameters.getGenerator()); - SecureRandom rand = null; + SecureRandom rand = null; try { rand = SecureRandom.getInstance("SHA1PRNG"); } @@ -298,12 +298,12 @@ else if(arg.equals("-d")) { e.printStackTrace(); rand = new SecureRandom(); } - + rand.nextBoolean(); // Generate the vector: boolean[] vec = new boolean[N]; boolean[] dummy = new boolean[N]; - + System.out.println("Testing BitVectorCommitment for " + nLoops + " loops ."); long start = System.currentTimeMillis(); for(int i = 0; i < nLoops; i++) { @@ -311,30 +311,30 @@ else if(arg.equals("-d")) { vec[j] = rand.nextBoolean(); dummy[j] = rand.nextBoolean(); } - + BigInteger c = bvc.commit(vec); - + // Verify System.out.print("Testing commitment verification ..."); if(!bvc.verify(c, vec, bvc.getRandomness())) - System.out.println("Verification failed for test " - + i + ". Should have passed."); + System.out.println("Verification failed for test " + + i + ". Should have passed."); else System.out.println(" passed"); - + // Wrong randomness. Should fail: if(bvc.verify(c, vec, Util.randomBigInteger(q))) - System.out.println("Verification passed for test " - + i + ". Should have failed (wrong r submitted)."); - + System.out.println("Verification passed for test " + + i + ". Should have failed (wrong r submitted)."); + // Wrong value. Should fail: if(bvc.verify(c, dummy, bvc.getRandomness())) - System.out.println("Verification passed for test " - + i + ". Should have failed (wrong vector submitted)."); - + System.out.println("Verification passed for test " + + i + ". Should have failed (wrong vector submitted)."); + // Test the ZKP: System.out.print("Testing bit vector commitment ZKP ..."); - + Proof proof = bvc.getProof(); if(!bvc.verify(proof)) System.out.println("ZKP failed for test " + i + ". Should have passed."); @@ -342,9 +342,9 @@ else if(arg.equals("-d")) { System.out.println(" passed"); } long end = System.currentTimeMillis(); - System.out.println("Total time: " + (end-start) + " ms. Average: " - + (double)(end-start)/(double)nLoops + " ms per loop"); - + System.out.println("Total time: " + (end-start) + " ms. Average: " + + (double)(end-start)/(double)nLoops + " ms per loop"); + } } diff --git a/src/java/p4p/crypto/Commitment.java b/src/java/p4p/crypto/Commitment.java index 338b6ce..1282370 100644 --- a/src/java/p4p/crypto/Commitment.java +++ b/src/java/p4p/crypto/Commitment.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Regents of the University of California. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -41,7 +41,7 @@ import p4p.util.P4PParameters; /** - * + * * This is a commitment scheme based on Pedersen's discrete log-based * commitment scheme: *

@@ -55,46 +55,47 @@ public class Commitment extends P4PParameters { protected NativeBigInteger g = null; protected NativeBigInteger h = null; - + /** * verify that the parameters are correct. */ - + public void sanityCheck() { if(!g.modPow(q, p).equals(BigInteger.ONE)) throw new IllegalArgumentException("g does not have the correct order!"); - + if(!h.modPow(q, p).equals(BigInteger.ONE)) throw new IllegalArgumentException("h does not have the correct order!"); } - + // The committer: - - /** + + /** * The value to be committed to. */ - protected BigInteger val = null; + protected BigInteger val = null; - /** + /** * The randomness used in the commitment. */ - protected BigInteger r = null; - + protected BigInteger r = null; + /** */ public Commitment(NativeBigInteger g, NativeBigInteger h) { this.g = g; this.h = h; - sanityCheck(); + sanityCheck(); } /** * Compute the commitment using the given value and randomness. * Make this method final to prevent subclass from overiding it. */ - protected final BigInteger computeCommitment(BigInteger val, + protected final BigInteger computeCommitment(BigInteger val, BigInteger r) { //BigInteger rr = r.mod(q); + if(val.equals(BigInteger.ONE)) return g.multiply(h.modPow(r, p)).mod(p); else if (val.equals(BigInteger.ZERO)) @@ -108,12 +109,12 @@ else if (val.equals(BigInteger.ZERO)) //return g.modPow(val, p).multiply(h.modPow(r, p)).mod(p); return g.modPow(val.mod(q), p).multiply(h.modPow(r, p)).mod(p); } - + /** * Commit to a long */ - + public BigInteger commit(long val) { return commit(new BigInteger(new Long(val).toString())); } @@ -121,7 +122,7 @@ public BigInteger commit(long val) { /** * Commit to a number in Z_q */ - + public BigInteger commit(BigInteger val) { r = Util.randomBigInteger(q); this.val = val; @@ -135,11 +136,11 @@ public BigInteger commit(BigInteger val) { /** * Commit to a number in Z_q using the given randomness */ - + public BigInteger commit(BigInteger val, BigInteger r) { this.r = r.mod(q); this.val = val; - + return computeCommitment(this.val, this.r); } @@ -150,7 +151,7 @@ public BigInteger commit(BigInteger val, BigInteger r) { public BigInteger getRandomness() { return r; } - + /** * Return the vector contained in this commitment */ @@ -158,7 +159,7 @@ public BigInteger getValue() { return val; } - + // The verifier: /** * Verify if the given triple consist a valid commitment using the diff --git a/src/java/p4p/crypto/Proof.java b/src/java/p4p/crypto/Proof.java index 41d1871..41ab0cd 100644 --- a/src/java/p4p/crypto/Proof.java +++ b/src/java/p4p/crypto/Proof.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Regents of the University of California. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -37,7 +37,7 @@ import p4p.util.P4PParameters; /** - * + * * This is an abstract 3-round (a.k.a $\Sigma$) proof consisting of 3 rounds: *

* Prover -> Verifier: commitment @@ -51,7 +51,7 @@ public abstract class Proof extends P4PParameters { - protected BigInteger[] commitment = null; + protected BigInteger[] commitment = null; /** * This is the first message in a 3-round proof. The prover ``commits'' * to her data using some kind of commitment scheme. This is essentially @@ -71,7 +71,7 @@ public abstract class Proof extends P4PParameters { public Proof() {} - public Proof(BigInteger[] commitment, BigInteger[] challenge, + public Proof(BigInteger[] commitment, BigInteger[] challenge, BigInteger[] response) { this.commitment = commitment; this.challenge = challenge; @@ -81,12 +81,12 @@ public Proof(BigInteger[] commitment, BigInteger[] challenge, public BigInteger[] getCommitment() { return commitment; } public BigInteger[] getChallenge() { return challenge; } public BigInteger[] getResponse() { return response; } - + /** * Construct the proof. This should be overriden by subclasses. */ public abstract void construct(); - + /** * Verify the proof. To be overriden by subclasses. */ diff --git a/src/java/p4p/crypto/SquareCommitment.java b/src/java/p4p/crypto/SquareCommitment.java index 8ee9087..04f5538 100644 --- a/src/java/p4p/crypto/SquareCommitment.java +++ b/src/java/p4p/crypto/SquareCommitment.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Regents of the University of California. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -43,7 +43,7 @@ import p4p.util.P4PParameters; /** - * + * * Given two numbers, a and b with b = a^2 mod q, produces two commitments s.t. * A = C(a), B = C(b) and a ZKP that proves, in zero-knowledge, that the * the number contained in B is the square of the number contained in A. @@ -93,10 +93,10 @@ public class SquareCommitment extends Commitment { private BigInteger a = null; private BigInteger b = null; private NativeBigInteger A = null; - private NativeBigInteger B = null; + private NativeBigInteger B = null; private BigInteger sa = null; private BigInteger sb = null; - + public SquareCommitment(NativeBigInteger g, NativeBigInteger h) { super(g, h); } @@ -115,10 +115,10 @@ public BigInteger commit(BigInteger val) { b = a.multiply(a).mod(q); B = new NativeBigInteger(super.commit(b)); sb = getRandomness(); - + return A; } - + /** * Commits to a using the given randomness. The method actually * produces two Commitments (A and B). Only A is returned. B @@ -140,10 +140,10 @@ public BigInteger commit(BigInteger val, BigInteger r) { if(!b.equals(a.mod(q).multiply(a.mod(q)).mod(q))) throw new RuntimeException("b (should be a^2) is not correct!"); } - + sb = Util.randomBigInteger(q); B = new NativeBigInteger(computeCommitment(b, sb)); - + return A; } @@ -153,22 +153,22 @@ public BigInteger commit(BigInteger val, BigInteger r) { public BigInteger getA() { return A; } - + public BigInteger getB() { return B; } - + /** * Gets the randomness - */ + */ public BigInteger getSa() { return sa; } - + public BigInteger getSb() { return sb; } - + /** * Constructs the square commitment proof. */ @@ -177,7 +177,7 @@ public Proof getProof() { proof.construct(); return proof; } - + /** * A zero-knowledge proof that two commitments contain a number and its @@ -189,26 +189,26 @@ public Proof getProof() { */ public class SquareCommitmentProof extends Proof { public SquareCommitmentProof() { super(); } - + // Construct the ZKP that the commitment contains a bit public void construct() { if(A == null || B == null) throw new RuntimeException("Must commit to the numbers before" - + " constructing the proof!"); + + " constructing the proof!"); commitment = new BigInteger[4]; - commitment[0] = A; + commitment[0] = A; commitment[1] = B; BigInteger x = Util.randomBigInteger(q); BigInteger ra = Util.randomBigInteger(q); BigInteger rb = Util.randomBigInteger(q); - + commitment[2] = g.modPow(x, p).multiply(h.modPow(ra, p)).mod(p); // Ca commitment[3] = A.modPow(x, p).multiply(h.modPow(rb, p)).mod(p); // Cb // The first two elements are the commitments to a and b. // The next two elements are Ca and Cb - + challenge = new BigInteger[1]; - + // Get the challenge which should be a hash of the commitment: BigInteger c = null; try { @@ -219,22 +219,22 @@ public void construct() { System.err.println("Can't compute hash!"); e.printStackTrace(); } - + response = new BigInteger[3]; - + // response[0] = a.multiply(c).add(x).mod(q); // v // response[1] = sa.multiply(c).add(ra).mod(q); // za // response[2] = sb.subtract(sa.multiply(a)).multiply(c).add(rb).mod(q); // zb - + BigInteger a1 = a.mod(q); response[0] = a1.multiply(c).add(x).mod(q); // v response[1] = sa.multiply(c).add(ra).mod(q); // za response[2] = sb.subtract(sa.multiply(a1)).multiply(c).add(rb) - .mod(q); // zb + .mod(q); // zb } } - + /** * Verifies the given proof using our own parameters. *

@@ -247,15 +247,15 @@ public boolean verify(Proof proof) { BigInteger[] c = proof.getCommitment(); BigInteger[] s = proof.getChallenge(); BigInteger[] r = proof.getResponse(); - + if(c.length != 4 || s.length != 1 || r.length != 3) return false; - + return verify(c[0], c[1], c[2], c[3], s[0], r[0], r[1], r[2]); } - - private boolean verify(BigInteger A, BigInteger B, BigInteger Ca, - BigInteger Cb, BigInteger c, BigInteger v, + + private boolean verify(BigInteger A, BigInteger B, BigInteger Ca, + BigInteger Cb, BigInteger c, BigInteger v, BigInteger za, BigInteger zb) { // Also need to verify the hash BigInteger[] msg = new BigInteger[4]; @@ -263,7 +263,7 @@ private boolean verify(BigInteger A, BigInteger B, BigInteger Ca, msg[1] = B; msg[2] = Ca; msg[3] = Cb; - + try { if(!c.equals(Util.secureHash(msg, q))) { System.out.println("Challenge is not equal to the hash!"); @@ -275,26 +275,26 @@ private boolean verify(BigInteger A, BigInteger B, BigInteger Ca, e.printStackTrace(); return false; } - - + + // Pass 1: g^v*h^za = A^c*Ca mod p? if(!g.modPow(v, p).multiply(h.modPow(za, p)).mod(p) - .equals(A.modPow(c, p).multiply(Ca).mod(p))) { + .equals(A.modPow(c, p).multiply(Ca).mod(p))) { System.out.println("Pass 1: g^v*h^za = A^c*Ca mod p failed."); return false; } - + // Pass 2: A^v*h^zb = B^c*Cb mod p? - BigInteger vv = Cb.multiply(B.modPow(c, p)).mod(p); + BigInteger vv = Cb.multiply(B.modPow(c, p)).mod(p); if(!vv.equals(A.modPow(v, p).multiply(h.modPow(zb, p)).mod(p))) { System.out.println("Pass 2: A^v*h^zb = B^c*Cb mod p failed."); return false; } - + return true; } - + /** * Test the SquareCommitment and the ZKP @@ -302,14 +302,14 @@ private boolean verify(BigInteger A, BigInteger B, BigInteger Ca, public static void main(String[] args) { int k = 512; int nLoops = 10; - + for (int i = 0; i < args.length; ) { String arg = args[i++]; if(arg.length() > 0 && arg.charAt(0) == '-') { if (arg.equals("-k")) { try { k = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { k = 512; } @@ -317,7 +317,7 @@ public static void main(String[] args) { else if(arg.equals("-l")) { try { nLoops = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { nLoops = 10; } @@ -327,7 +327,7 @@ else if(arg.equals("-d")) { } } } - + // Setup the parameters: P4PParameters.initialize(k, false); NativeBigInteger g = P4PParameters.getGenerator(); @@ -337,8 +337,8 @@ else if(arg.equals("-d")) { SquareCommitment sc = new SquareCommitment(g, h); SquareCommitment verifier = new SquareCommitment(g, h); // Construct a new SquareCommitment to verify. - - System.out.println("Testing SquareCommitment for " + nLoops + " loops ."); + + System.out.println("Testing SquareCommitment for " + nLoops + " loops ."); StopWatch proverWatch = new StopWatch(); StopWatch verifierWatch = new StopWatch(); long start = System.currentTimeMillis(); @@ -347,18 +347,18 @@ else if(arg.equals("-d")) { BigInteger r = Util.randomBigInteger(q); sc.commit(a.negate(), r); //sc.commit(a, r); - + // Test the ZKP: System.out.print("Testing square commitment ZKP ..."); proverWatch.start(); SquareCommitmentProof proof = (SquareCommitmentProof)sc.getProof(); proverWatch.pause(); - + verifierWatch.start(); if(!sc.verify(proof)) - System.out.println("ZKP failed for test " + j - + ". Should have passed."); - // how do we test failed zkp? + System.out.println("ZKP failed for test " + j + + ". Should have passed."); + // how do we test failed zkp? else System.out.println(" passed"); verifierWatch.pause(); @@ -366,19 +366,19 @@ else if(arg.equals("-d")) { verifierWatch.stop(); proverWatch.stop(); long end = System.currentTimeMillis(); - System.out.println("Square commitment ZKP: " + nLoops - + " loops. ms per loop:"); + System.out.println("Square commitment ZKP: " + nLoops + + " loops. ms per loop:"); System.out.println("\n Prover time Verifier time Total"); System.out.println("==================================================="); - System.out.println(" " - + (double)proverWatch.getElapsedTime()/(double)nLoops - + " " - + (double)verifierWatch.getElapsedTime()/(double)nLoops - + " " - + (double)(proverWatch.getElapsedTime()+verifierWatch - .getElapsedTime())/(double)nLoops); - - - + System.out.println(" " + + (double)proverWatch.getElapsedTime()/(double)nLoops + + " " + + (double)verifierWatch.getElapsedTime()/(double)nLoops + + " " + + (double)(proverWatch.getElapsedTime()+verifierWatch + .getElapsedTime())/(double)nLoops); + + + } } diff --git a/src/java/p4p/crypto/ThreeWayCommitment.java b/src/java/p4p/crypto/ThreeWayCommitment.java index 0cdc59c..d1cd1a4 100644 --- a/src/java/p4p/crypto/ThreeWayCommitment.java +++ b/src/java/p4p/crypto/ThreeWayCommitment.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Regents of the University of California. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -64,7 +64,7 @@ public class ThreeWayCommitment extends Commitment { public final NativeBigInteger CONST; // The public constant - + public ThreeWayCommitment(NativeBigInteger g, NativeBigInteger h, BigInteger c) { super(g, h); @@ -76,44 +76,44 @@ public ThreeWayCommitment(NativeBigInteger g, NativeBigInteger h, super(g, h); this.CONST = new NativeBigInteger(new BigInteger(String.valueOf(c)).abs()); } - + /** */ public BigInteger commit(BigInteger val) { if(!val.equals(BigInteger.ZERO) && !val.equals(CONST) - && !val.equals(CONST.negate())) - throw new RuntimeException("ThreeWayCommitment.commit can only" - + "be invoked with 0 or +/-" + CONST); + && !val.equals(CONST.negate())) + throw new RuntimeException("ThreeWayCommitment.commit can only" + + "be invoked with 0 or +/-" + CONST); return super.commit(val); // Commitment is smart enough to avoid doing // exponetiation if val is either 0 or 1. } - + /** - */ + */ public BigInteger commit(long val) { long c = CONST.longValue(); if(val != 0 && val != c && val != -c) - throw new RuntimeException("ThreeWayCommitment.commit can only" - + "be invoked with 0 or +/-" + c); - + throw new RuntimeException("ThreeWayCommitment.commit can only" + + "be invoked with 0 or +/-" + c); + return super.commit(new BigInteger(String.valueOf(val))); // Commitment is smart enough to avoid doing exponetiation // if val is either 0 or 1. } - + public BigInteger commit(long val, BigInteger r) { long c = CONST.longValue(); if(val != 0 && val != c && val != -c) - throw new RuntimeException("ThreeWayCommitment.commit can only" - + "be invoked with 0 or +/-" + c); - + throw new RuntimeException("ThreeWayCommitment.commit can only" + + "be invoked with 0 or +/-" + c); + return super.commit(new BigInteger(String.valueOf(val)), r); // Commitment is smart enough to avoid doing exponetiation // if val is either 0 or 1. } - - + + // The verifier: /** * Verify if the given bit val is contained in the commitment @@ -122,9 +122,9 @@ public BigInteger commit(long val, BigInteger r) { */ public boolean verify(BigInteger c, BigInteger val, BigInteger r) { if(!val.equals(BigInteger.ZERO) && !val.equals(CONST) - && !val.equals(CONST.negate())) + && !val.equals(CONST.negate())) return false; - + return super.verify(c, val, r); } @@ -133,7 +133,7 @@ public Proof getProof() { proof.construct(); return proof; } - + /** * A zero-knowledge proof that the commitment contains 0,or +/-c. The protocol * is based on @@ -155,20 +155,20 @@ public class ThreeWayCommitmentProof extends Proof { * itself so we don't need to store the bit commitments. */ private BitCommitment.BitCommitmentProof bcp1 = null; - private BitCommitment.BitCommitmentProof bcp2 = null; + private BitCommitment.BitCommitmentProof bcp2 = null; public ThreeWayCommitmentProof() { super(); } - + // Construct the ZKP that the commitment contains 0,or +/-c public void construct() { if(val == null) - throw new RuntimeException("Must commit to a value first" - + "before constructing the proof!"); - + throw new RuntimeException("Must commit to a value first" + + "before constructing the proof!"); + // We do need to store this commitment: commitment = new BigInteger[1]; - if(val != null) + if(val != null) commitment[0] = commit(val, r); else commitment[0] = commit(val); @@ -202,7 +202,7 @@ else if(val.equals(CONST.negate())) { bc2.commit(1); bc1.commit(0, rc.add(bc2.getRandomness()).mod(q)); } - + /** * The first element in the BitCommitmentProof is the commitment * itself so we don't need to store the bit commitment. @@ -226,9 +226,9 @@ public BitCommitment.BitCommitmentProof getNumeratorProof() { */ public BitCommitment.BitCommitmentProof getDenominatorProof() { return bcp2; - } + } } - + /** * Verifies the given proof using our own parameters. * @@ -236,19 +236,19 @@ public BitCommitment.BitCommitmentProof getDenominatorProof() { * who does not have the values, should construct a fresh new commitment * and pass the proof to it. The verifier and the prover should use the * same parameters (e.g. g and h). - */ + */ public boolean verify(ThreeWayCommitmentProof proof) { BitCommitment.BitCommitmentProof bcp1 = proof.getNumeratorProof(); BitCommitment.BitCommitmentProof bcp2 = proof.getDenominatorProof(); // Check the bit commitments - BitCommitment bc = new BitCommitment(g, h); + BitCommitment bc = new BitCommitment(g, h); if(!bc.verify(bcp1) || !bc.verify(bcp2)) { System.out.println("BitCommitment verification failed!"); return false; } - + // This commitment BigInteger C = proof.getCommitment()[0]; BigInteger C1 = bcp1.getCommitment()[0]; @@ -258,10 +258,10 @@ public boolean verify(ThreeWayCommitmentProof proof) { System.out.println("C1: " + C1 + ", C2: " + C2); return false; } - + return true; } - + /** * Test the ThreeCommitment and the ZKP @@ -269,14 +269,14 @@ public boolean verify(ThreeWayCommitmentProof proof) { public static void main(String[] args) { int k = 512; int nLoops = 10; - + for (int i = 0; i < args.length; ) { String arg = args[i++]; if(arg.length() > 0 && arg.charAt(0) == '-') { if (arg.equals("-k")) { try { k = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { k = 512; } @@ -284,22 +284,22 @@ public static void main(String[] args) { else if(arg.equals("-l")) { try { nLoops = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { nLoops = 10; } } - + } } - + // Setup the parameters: P4PParameters.initialize(k, false); NativeBigInteger g = P4PParameters.getGenerator(); NativeBigInteger h = P4PParameters.getFreshGenerator(); // We should use the same generators for both the prover and the verifier. - SecureRandom rand = null; + SecureRandom rand = null; try { rand = SecureRandom.getInstance("SHA1PRNG"); } @@ -308,9 +308,9 @@ else if(arg.equals("-l")) { e.printStackTrace(); rand = new SecureRandom(); } - + rand.nextBoolean(); - + System.out.println("Testing ThreeWayCommitment for " + nLoops + " loops ."); StopWatch proverWatch = new StopWatch(); StopWatch verifierWatch = new StopWatch(); @@ -319,7 +319,7 @@ else if(arg.equals("-l")) { for(int j = 0; j < nLoops; j++) { long c = rand.nextLong(); if(k < 66) c = (long)rand.nextInt()%(1<<(k-2)); - + if(c < 0) c = -c; long val = rand.nextLong(); if(val%3 == 0) val = 0; @@ -327,29 +327,29 @@ else if(arg.equals("-l")) { else val = -c; ThreeWayCommitment tc = new ThreeWayCommitment(g, h, c); - BigInteger C = tc.commit(val); - + BigInteger C = tc.commit(val); + // Verify System.out.print("Testing commitment verification No. " + j + "...."); System.out.println(" Committed to " + val); - if(!tc.verify(C, new BigInteger(String.valueOf(val)), - tc.getRandomness())) { - System.out.println("Verification failed for test " + j - + ". Should have passed."); + if(!tc.verify(C, new BigInteger(String.valueOf(val)), + tc.getRandomness())) { + System.out.println("Verification failed for test " + j + + ". Should have passed."); nfails++; } - + // Wrong randomness. Should fail: - if(tc.verify(C, new BigInteger(String.valueOf(val)), - Util.randomBigInteger(q))) { - System.out.println("Verification passed for test " + j - + ". Should have failed (wrong r)."); + if(tc.verify(C, new BigInteger(String.valueOf(val)), + Util.randomBigInteger(q))) { + System.out.println("Verification passed for test " + j + + ". Should have failed (wrong r)."); nfails++; } // Wrong value. Should fail: if(tc.verify(C, Util.randomBigInteger(q), tc.getRandomness())) { - System.out.println("Verification passed for test " + j - + ". Should have failed (wrong value)."); + System.out.println("Verification passed for test " + j + + ". Should have failed (wrong value)."); nfails++; } @@ -374,18 +374,18 @@ else if(arg.equals("-l")) { long end = System.currentTimeMillis(); verifierWatch.stop(); proverWatch.stop(); - System.out.println("3-Way commitment ZKP: " + nLoops - + " loops. Total failed tests: " + nfails + ". ms per loop:"); + System.out.println("3-Way commitment ZKP: " + nLoops + + " loops. Total failed tests: " + nfails + ". ms per loop:"); System.out.println("\n Prover time Verifier time Total"); System.out.println("==================================================="); - System.out.println(" " - + (double)proverWatch.getElapsedTime()/(double)nLoops - + " " - + (double)verifierWatch.getElapsedTime()/(double)nLoops - + " " - + (double)(proverWatch.getElapsedTime() - +verifierWatch.getElapsedTime()) - /(double)nLoops); + System.out.println(" " + + (double)proverWatch.getElapsedTime()/(double)nLoops + + " " + + (double)verifierWatch.getElapsedTime()/(double)nLoops + + " " + + (double)(proverWatch.getElapsedTime() + +verifierWatch.getElapsedTime()) + /(double)nLoops); System.out.println("Total testing time: " + (end-start) + " ms."); } } diff --git a/src/java/p4p/crypto/VectorCommitment.java b/src/java/p4p/crypto/VectorCommitment.java index 1da82c8..2e5a4dd 100644 --- a/src/java/p4p/crypto/VectorCommitment.java +++ b/src/java/p4p/crypto/VectorCommitment.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Regents of the University of California. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -41,7 +41,7 @@ import p4p.util.P4PParameters; /** - * + * * Vector commitment. It allows the committer to commit to an N-dimensional * vector. The commitment is a single element in Z_q. The scheme is based on * Pedersen's discrete log based commitment scheme: @@ -59,32 +59,32 @@ public class VectorCommitment extends P4PParameters { protected NativeBigInteger[] g = null; protected NativeBigInteger h = null; - + /** * The dimension of the vector */ - int N = -1; - + int N = -1; + /** * verify that the parameters are correct. */ - + public void sanityCheck() { super.sanityCheck(); - + if(!h.modPow(q, p).equals(BigInteger.ONE)) throw new IllegalArgumentException("h does not have the correct order!"); - + if(N <= 0) throw new IllegalArgumentException("Non-positive dimension!"); - + for(int i = 0; i < N; i++) { if(g[i].equals(BigInteger.ONE)) throw new IllegalArgumentException("g[" + i + "] is ONE!"); if(!g[i].modPow(q, p).equals(BigInteger.ONE)) throw new IllegalArgumentException("g[" + i + "] does not have the correct order!"); } - + } /** @@ -93,9 +93,9 @@ public void sanityCheck() { * to bits). */ protected BigInteger vectorCommit(BigInteger[] vals, BigInteger r) { - if(vals.length != N) + if(vals.length != N) throw new IllegalArgumentException("Incorrect dimension!"); - + BigInteger c = h.modPow(r, p); for(int i = 0; i < N; i++) { if(vals[i].equals(BigInteger.ZERO)) @@ -105,107 +105,107 @@ else if(vals[i].equals(BigInteger.ONE)) else c = c.multiply(g[i].modPow(vals[i].mod(q), p)).mod(p); } - + return c; } // The committer: - /** + /** * The values to be committed to. */ - protected BigInteger[] vals = null; - - /** + protected BigInteger[] vals = null; + + /** * The randomness used in the commitment. */ - protected BigInteger r = null; - + protected BigInteger r = null; + /** */ public VectorCommitment(NativeBigInteger g[], NativeBigInteger h) { this.g = g; this.h = h; N = g.length; - sanityCheck(); + sanityCheck(); } - + public int getDemension() { return N; } - + /** * Commits to a vector of long integers. (Assume q > Long.MAX_VALUE) - */ + */ public BigInteger commit(long[] vals) { this.vals = new BigInteger[vals.length]; - for(int i = 0; i < vals.length; i++) + for(int i = 0; i < vals.length; i++) this.vals[i] = new BigInteger(String.valueOf(vals[i])); - + return commit(this.vals); } - - + + /** - * Commits to a vector of long integers using the given randomness + * Commits to a vector of long integers using the given randomness * (Assume q > Long.MAX_VALUE) - */ + */ public BigInteger commit(long[] vals, BigInteger r) { this.vals = new BigInteger[vals.length]; - for(int i = 0; i < vals.length; i++) + for(int i = 0; i < vals.length; i++) this.vals[i] = new BigInteger(String.valueOf(vals[i])); - + return commit(this.vals, r); } - - + + /** * Commits to a vector of integers. (Assume q > Integer.MAX_VALUE) - */ + */ public BigInteger commit(int[] vals) { this.vals = new BigInteger[vals.length]; - for(int i = 0; i < vals.length; i++) + for(int i = 0; i < vals.length; i++) this.vals[i] = new BigInteger(String.valueOf(vals[i])); - + return commit(this.vals); } - + /** * Commits to a vector of integers using the given randomness. * (Assume q > Integer.MAX_VALUE) - */ + */ public BigInteger commit(int[] vals, BigInteger r) { this.vals = new BigInteger[vals.length]; - for(int i = 0; i < vals.length; i++) + for(int i = 0; i < vals.length; i++) this.vals[i] = new BigInteger(String.valueOf(vals[i])); - + return commit(this.vals, r); } - + /** * Commits to a vector of BigInteger */ - + public BigInteger commit(BigInteger[] vals) { r = Util.randomBigInteger(q); return commit(vals, r); } - + /** * Commits to a vector of BigInteger using the given randomness */ - + public BigInteger commit(BigInteger[] vals, BigInteger r) { this.r = r; this.vals = vals; - + return vectorCommit(vals, r); } - + /** * Returns the randomness used in this commitment */ public BigInteger getRandomness() { return r; } - + /** * Returns the vector contained in this commitment */ @@ -213,7 +213,7 @@ public BigInteger[] getVector() { return vals; } - + // The verifier: /** * Verify if the given vector is the one contained in the commitment. @@ -223,7 +223,7 @@ public boolean verify(BigInteger c, BigInteger[] vec, BigInteger r) { BigInteger cc = vectorCommit(vec, r); return cc.equals(c); } - + /** * Test the VectorCommitment */ @@ -231,14 +231,14 @@ public static void main(String[] args) { int k = 512; int N = 32; int nLoops = 10; - + for (int i = 0; i < args.length; ) { String arg = args[i++]; if(arg.length() > 0 && arg.charAt(0) == '-') { if (arg.equals("-k")) { try { k = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { k = 512; } @@ -246,7 +246,7 @@ public static void main(String[] args) { else if(arg.equals("-N")) { try { N = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { N = 32; } @@ -254,31 +254,31 @@ else if(arg.equals("-N")) { else if(arg.equals("-l")) { try { nLoops = Integer.parseInt(args[i++]); - } + } catch (NumberFormatException e) { nLoops = 10; } } - + } } - + // Setup the parameters: P4PParameters.initialize(k, false); - - VectorCommitment vc = - new VectorCommitment(P4PParameters.getGenerators(N), - P4PParameters.getGenerator()) ; - + + VectorCommitment vc = + new VectorCommitment(P4PParameters.getGenerators(N), + P4PParameters.getGenerator()) ; + // Generate the vector: BigInteger[] vec = new BigInteger[N]; BigInteger[] sum = new BigInteger[N]; - + // dummy BigInteger[] dummy = new BigInteger[N]; for(int i = 0; i < N; i++) dummy[i] = Util.randomBigInteger(q); - + System.out.println("Testing VectorCommitment ."); for(int j = 0; j < nLoops; j++) { //System.out.print("."); @@ -286,31 +286,31 @@ else if(arg.equals("-l")) { vec[i] = Util.randomBigInteger(q); sum[i] = vec[i].add(dummy[i]); } - + // Commit BigInteger c = vc.commit(vec); BigInteger r = vc.getRandomness(); - + // Verify if(!vc.verify(c, vec, r)) - System.out.println("Verification failed for test " - + j + ". Should have passed."); - + System.out.println("Verification failed for test " + + j + ". Should have passed."); + // Wrong randomness. Should fail: if(vc.verify(c, vec, Util.randomBigInteger(q))) - System.out.println("Verification passed for test " - + j + ". Should have failed (wrong r submitted)."); - + System.out.println("Verification passed for test " + + j + ". Should have failed (wrong r submitted)."); + // Wrong vector. Should fail: if(vc.verify(c, dummy, r)) - System.out.println("Verification passed for test " - + j + ". Should have failed (wrong vector submitted)."); - + System.out.println("Verification passed for test " + + j + ". Should have failed (wrong vector submitted)."); + // Now check the homomorphism: System.out.print("Verifying homomorphism ...."); BigInteger dc = vc.commit(dummy); BigInteger dr = vc.getRandomness(); - + // c*dc = commit(sum, r+dr) if(!c.multiply(dc).mod(p).equals(vc.commit(sum, r.add(dr)).mod(p))) System.out.println(" failed. Homomorphism doesn't hold."); diff --git a/src/java/p4p/server/P4PServer.java b/src/java/p4p/server/P4PServer.java index 9f016ba..23a4223 100644 --- a/src/java/p4p/server/P4PServer.java +++ b/src/java/p4p/server/P4PServer.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Regents of the University of California. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -33,7 +33,9 @@ import java.math.BigInteger; import java.security.SecureRandom; -import java.util.*; +import java.util.Vector; +import java.util.Hashtable; +import java.util.Map; import net.i2p.util.NativeBigInteger; @@ -43,7 +45,7 @@ import p4p.user.UserVector2; /** - * + * * The P4P server class. * * @author ET 12/02/2005 @@ -53,72 +55,72 @@ /** * FIXME: * - * Currently this is just a data structure for holding the server data and - * methods. The real server should be client-driven and multithreaded. i.e. - * when there is a client sending data, the server should spawn a thread to + * Currently this is just a data structure for holding the server data and + * methods. The real server should be client-driven and multithreaded. i.e. + * when there is a client sending data, the server should spawn a thread to * handle it. The threat could update the internal state of this class based - * on actual user data. We are now only using the class in a simulation + * on actual user data. We are now only using the class in a simulation * framework to verify the correctness and the efficiency of the protocols. */ public class P4PServer extends P4PParameters { - private NativeBigInteger g_server = null; - private NativeBigInteger h_server = null; - - protected int dimension_Ser = -1; // The dimension of user vector - protected long group_order_F_Server = -1; + private NativeBigInteger g = null; + private NativeBigInteger h = null; + + protected int m = -1; // The dimension of user vector + protected long F = -1; /** - * The order of the (small) finite field over which all the computations - * are carried out. It should be a prime of appropriate bit-length (e.g. + * The order of the (small) finite field over which all the computations + * are carried out. It should be a prime of appropriate bit-length (e.g. * 64 bits). */ - - protected long L_P4PServer = -1; - protected int max_bits_2_norm_user_vector_l; // The max number of bits of the 2 norm of user vector - protected int Num_cs_to_server_ZKP_iteration = 50; //ZKP Iteration // The number of chechsums to compute. Default 50 - private int final_CVs[][] = null; // The challenge vectors - private long[] acc_vector_sum_Server = null; // The accumulated vector sum + + protected long L = -1; + protected int l; // The max number of bits of the 2 norm of user vector + protected int N = 50; // The number of chechsums to compute. Default 50 + private int c[][] = null; // The challenge vectors + private long[] s = null; // The accumulated vector sum private long[] peerSum = null; // The peer's share of the vector sum - + /** - * A class holding user information, including his data vector (share), + * A class holding user information, including his data vector (share), * its validity ZKP etc. */ public class UserInfo { private int ID; - private long[] v_userinfo = null; - private UserVector2.L2NormBoundProof2 proof = null; + private long[] v = null; + private UserVector2.L2NormBoundProof2 proof = null; // The L2 norm bound proof. Should be passed to us by the user. - private BigInteger[] Y_commitments_to_peer_share_of_checksum_Ser = null; + private BigInteger[] Y = null; // The commitments to the peer's share of the checksums. public UserInfo(int user, long[] v) { ID = user; - this.v_userinfo = v; + this.v = v; } - + /** * @return Returns the vector v. */ public long[] getVector() { - return v_userinfo; + return v; } - + /** * Update the user vector. * @param v The new vector to set. */ public void setVector(long[] v) { - this.v_userinfo = v; + this.v = v; } - + /** * @return Returns the user ID. */ public int getID() { return ID; } - + /** * @return Returns the proof. */ @@ -132,83 +134,82 @@ public UserVector2.L2NormBoundProof2 getProof() { public void setProof(UserVector2.L2NormBoundProof2 proof) { this.proof = proof; } - + /** */ - public void setY(BigInteger[] Y_commitments_to_peer_share_of_checksum) { - this.Y_commitments_to_peer_share_of_checksum_Ser = Y_commitments_to_peer_share_of_checksum; + public void setY(BigInteger[] Y) { + this.Y = Y; } - + /** */ public BigInteger[] getY() { - return Y_commitments_to_peer_share_of_checksum_Ser; + return Y; } } - - private Hashtable usersMap = - new Hashtable(); + + private Hashtable usersMap = + new Hashtable(); /** */ - public P4PServer(int m, long F, int l, int N_zkpIterations, NativeBigInteger g, + public P4PServer(int m, long F, int l, int N, NativeBigInteger g, NativeBigInteger h) { if(F < 0) throw new RuntimeException("Field order must be positive."); - - this.dimension_Ser = m; - this.group_order_F_Server = F; - this.max_bits_2_norm_user_vector_l = l; - this.L_P4PServer = ((long)1)<true if the user is sucessfuly removed. + * + * @return true if the user is sucessfuly removed. * false if the user is not found in the record. */ public boolean disqualifyUser(int user) { return usersMap.remove(user) == null; - } public int getNQulaifiedUsers() { @@ -219,7 +220,7 @@ public int getNQulaifiedUsers() { * Set the l2 norm proof for the given user. * @param user The user index. * @param proof The proof to set. - * @return true if the user is sucessfuly updated. + * @return true if the user is sucessfuly updated. * false if the user is not found in the record. */ public boolean setProof(int user, UserVector2.L2NormBoundProof2 proof) { @@ -233,138 +234,48 @@ public boolean setProof(int user, UserVector2.L2NormBoundProof2 proof) { /** * Sets Y for the given user. * @param user The user index. - * @param Y_commitments_to_peer_share_of_checksum The commitments to the peer's share of the checksums - * @return true if the user is sucessfuly updated. + * @param Y The commitments to the peer's share of the checksums + * @return true if the user is sucessfuly updated. * false if the user is not found in the record. */ - public boolean setY(int user, BigInteger[] Y_commitments_to_peer_share_of_checksum) { + public boolean setY(int user, BigInteger[] Y) { UserInfo userInfo = usersMap.get(user); if(userInfo == null) return false; - - userInfo.setY(Y_commitments_to_peer_share_of_checksum); + + userInfo.setY(Y); return true; } - + /** * Generates challenge vectors. */ public void generateChallengeVectors() { // byte[] randBytes = new byte[(int)Math.ceil(2*N*m/8)]; - byte[] randBytes = new byte[2*((int)Math.ceil(Num_cs_to_server_ZKP_iteration*dimension_Ser/8)+1)]; - int[] idjRShift3s = new int[dimension_Ser]; - // We need twice the random bits in challenge_vectors_Ser. We need half of them to flip the 1's + byte[] randBytes = new byte[2*((int)Math.ceil(N*m/8)+1)]; + // We need twice the random bits in c. We need half of them to flip the 1's Util.rand.nextBytes(randBytes); int mid = randBytes.length/2; - //// //// //// //// //// //// ///// challenger //// //// //// //// //// //// //// //// //// //// - final_CVs = new int[Num_cs_to_server_ZKP_iteration][]; - //// //// //// //// ////\\\ - - - int bIndex_R3 = 0; - // challenge vector in P4PServer.java - // idj=i*dimension_Ser + j - int idj = 0; - int[] idj_arr = new int[dimension_Ser]; - - // (i*dimension_Ser + j)%8 - int idjM8 = 0; - int[] offset_idjM8_arr = new int[dimension_Ser]; - - // 1< firstCV_arr = new ArrayList(); - // prev_Greater_zero = (this_randByte & (1< 0 - boolean IS_firstCV_Greater_0; - ArrayList IS_firstCV_Greater_0s = new ArrayList(); - - - int secondCV; - ArrayList secondCV_arr = new ArrayList(); - int thirdCV = Integer.MAX_VALUE; - ArrayList thirdCV_arr = new ArrayList(); - int fourthCV = Integer.MAX_VALUE; - ArrayList fourthCV_arr = new ArrayList(); - - boolean IS_secondCV_Equal_1s; - ArrayList IS_2ndCV_Equal_1s = new ArrayList(); - - byte[] randBytes_10 = new byte[dimension_Ser]; - for(int i = 0; i < Num_cs_to_server_ZKP_iteration; i++) { - final_CVs[i] = new int[dimension_Ser]; - for(int dim_jd = 0; dim_jd < dimension_Ser; dim_jd++) { - //int byteIndex = (int)2*(i*m + dim_jd)/8; - //int offset = 2*(i*m + dim_jd)%8; - idj = i*dimension_Ser + dim_jd; - idj_arr[dim_jd] = idj; - bIndex_R3 = (i*dimension_Ser + dim_jd)>>3; - idjRShift3s[dim_jd] = bIndex_R3; - - ///// idjM8 ////// - idjM8 = (i*dimension_Ser + dim_jd)%8; - offset_idjM8_arr[dim_jd] = idjM8; - - // 1<<(i*m + j)%8; - LS1_M8 = 1< 0; - IS_firstCV_Greater_0s.add(IS_firstCV_Greater_0); - - - // 2⃣️ - secondCV = (randBytes[bIndex_R3] & LS1_M8) > 0 ? 1 : 0; - final_CVs[i][dim_jd] = secondCV; - secondCV_arr.add(secondCV); - // 2⃣️🌟 - IS_secondCV_Equal_1s = false; - if(final_CVs[i][dim_jd] == 1){ - thirdCV = (randBytes[mid+bIndex_R3] & LS1_M8A1); - fourthCV = thirdCV > 0 ? 1 : -1; - final_CVs[i][dim_jd] = fourthCV; - IS_secondCV_Equal_1s = true; - } - - // 3⃣️🌟 - thirdCV_arr.add(thirdCV); - thirdCV = Integer.MAX_VALUE; - - - // 4⃣️🌟 - fourthCV_arr.add(fourthCV); - fourthCV = Integer.MAX_VALUE; - - IS_2ndCV_Equal_1s.add(IS_secondCV_Equal_1s); - System.out.println("End dim_id of Num_cs_to_server_ZKP_iteration: " + dim_jd); + c = new int[N][]; + for(int i = 0; i < N; i++) { + c[i] = new int[m]; + for(int j = 0; j < m; j++) { + //int byteIndex = (int)2*(i*m + j)/8; + //int offset = 2*(i*m + j)%8; + int byteIndex = (i*m + j)>>3; + int offset = (i*m + j)%8; + c[i][j] = (randBytes[byteIndex] & (1< 0 ? 1 : 0; + if(c[i][j] == 1) // flip half of the 1's + c[i][j] = (randBytes[mid+byteIndex] & (1<<(offset+1))) > 0 ? + 1 : -1; } } - System.out.println("c Challenge Vecter: "+ Arrays.deepToString(final_CVs)); } - + /** */ public int[][] getChallengeVectors() { - return final_CVs; + return c; } /** @@ -373,7 +284,6 @@ public int[][] getChallengeVectors() { */ public void setPeerSum(long[] vv) { peerSum = vv; - System.out.println("peerSum: " + Arrays.toString(peerSum)); } @@ -381,55 +291,44 @@ public void setPeerSum(long[] vv) { * The server have received data and their proofs from enough users. * This fucntion is then called to compute the sum of the valid vectors. */ - - // 使用Challeng Vector public void compute() { Object[] users = usersMap.entrySet().toArray(); - - UserVector2 uv = new UserVector2(dimension_Ser, group_order_F_Server, max_bits_2_norm_user_vector_l, g_server, h_server); - System.out.println("Server:: computing. There are potentially " + usersMap.size() - + " users."); + + UserVector2 uv = new UserVector2(m, F, l, g, h); + System.out.println("Server:: computing. There are potentially " + usersMap.size() + + " users."); int disqualified = 0; - System.out.println("users.length: "+users.length); for(int i = 0; i < users.length; i++) { - Map.Entry userEntry = - (Map.Entry)users[i]; + Map.Entry userEntry = + (Map.Entry)users[i]; UserInfo user = userEntry.getValue(); - long[] u_userVector_compute = user.getVector(); - long[] u_server_for_U2 = u_userVector_compute; - - // Verify its proof in UserVector2: - uv.setU(u_server_for_U2); - uv.setChecksumCoefficientVectors(final_CVs); - - BigInteger[] Y_U2 = user.getY(); - uv.setY_UV2(Y_U2); - UserVector2.L2NormBoundProof2 proof = user.getProof(); + long[] u = user.getVector(); - if(uv.verify2(proof)){ - System.out.println("User " + user.ID - + "'s vector succeed the verification."); - } + // Verify its proof: + uv.setU(u); + uv.setChecksumCoefficientVectors(c); + uv.setY(user.getY()); + UserVector2.L2NormBoundProof2 proof = user.getProof(); if(!uv.verify2(proof)) { - System.out.println("User " + user.ID - + "'s vector failed the verification."); + System.out.println("User " + user.ID + + "'s vector failed the verification."); disqualifyUser(user.ID); // TODO: Must let the peer know about disqualified users so he can computes his share // of the sum (the peerSum). disqualified++; continue; } - Util.vectorAdd(acc_vector_sum_Server, u_userVector_compute, acc_vector_sum_Server, group_order_F_Server); + Util.vectorAdd(s, u, s, F); } - Util.vectorAdd(acc_vector_sum_Server, peerSum, acc_vector_sum_Server, group_order_F_Server); + Util.vectorAdd(s, peerSum, s, F); System.out.println("Server:: done computing. " + disqualified + " users disqualified."); } - + /** */ public long[] getVectorSum() { - return acc_vector_sum_Server; + return s; } } diff --git a/src/java/p4p/sim/P4PSim.java b/src/java/p4p/sim/P4PSim.java index e5055c5..68c7865 100644 --- a/src/java/p4p/sim/P4PSim.java +++ b/src/java/p4p/sim/P4PSim.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Regents of the University of California. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -36,19 +36,19 @@ import java.util.Vector; import net.i2p.util.NativeBigInteger; -import java.util.Arrays; + import p4p.util.Util; import p4p.util.StopWatch; import p4p.util.P4PParameters; -//import p4p.crypto.SquareCommitment; -//import p4p.crypto.Proof; -//import p4p.crypto.BitCommitment; -//import p4p.crypto.Commitment; +import p4p.crypto.SquareCommitment; +import p4p.crypto.Proof; +import p4p.crypto.BitCommitment; +import p4p.crypto.Commitment; import p4p.user.UserVector2; import p4p.server.P4PServer; /** - * + * * Providing a simulation framework for a P4P system. This allows one to debug * and benchmark the cryptographic primitives without having to provide other * components necessary for a real deployment (e.g. secure communication). @@ -59,59 +59,52 @@ public class P4PSim extends P4PParameters { private static NativeBigInteger g = null; private static NativeBigInteger h = null; - - private static int security_parameter_Sim = 512; // Security parameter - private static int dimension = 10; // User vector dimension -// private static int n = 10; // Number of users - private static int user_num = 10; // Number of users - private static int bitLength = 40; // Bit length of L - + + private static int k = 512; // Security parameter + private static int m = 10; // User vector dimension + private static int n = 10; // Number of users + private static int l = 40; // Bit length of L + /** * Start a simulation. */ public static void main(String[] args) { - int nLoops = 1; + int nLoops = 10; boolean doBench = false; boolean worstcase = false; /** - * Test the worst case cost. i.e. every vector should pass. This is + * Test the worst case cost. i.e. every vector should pass. This is * when the verifier spends longest time. */ // Definie the number of iterations that the bound ZKP must have: - int zkpIterations = 1; + int zkpIterations = 50; - System.out.println("args.length: " + args.length); - - - int[] shouldPass_Counter = new int[2]; - shouldPass_Counter[0] = 0; - shouldPass_Counter[1] = 1; for (int i = 0; i < args.length; ) { String arg = args[i++]; if(arg.length() > 0 && arg.charAt(0) == '-') { - if (arg.equals("-security_parameter_Sim")) { + if (arg.equals("-k")) { try { - security_parameter_Sim = Integer.parseInt(args[i++]); + k = Integer.parseInt(args[i++]); } catch (NumberFormatException e) { - security_parameter_Sim = 512; + k = 512; } } else if(arg.equals("-m")) { try { - dimension = Integer.parseInt(args[i++]); + m = Integer.parseInt(args[i++]); } catch (NumberFormatException e) { - dimension = 10; + m = 10; } } else if(arg.equals("-n")) { try { - user_num = Integer.parseInt(args[i++]); + n = Integer.parseInt(args[i++]); } catch (NumberFormatException e) { - user_num = 10; + n = 10; } } else if(arg.equals("-N")) { @@ -134,10 +127,10 @@ else if(arg.equals("-o")) { else if(arg.equals("-l")) { try { - bitLength = Integer.parseInt(args[i++]); + l = Integer.parseInt(args[i++]); } catch (NumberFormatException e) { - bitLength = 40; + l = 40; } } @@ -153,13 +146,13 @@ else if(arg.equals("-bench")) { } } - System.out.println("securityParameter = " + security_parameter_Sim); - System.out.println("dimension = " + dimension); - System.out.println("n = " + user_num); + System.out.println("k = " + k); + System.out.println("m = " + m); + System.out.println("n = " + n); System.out.println("nLoops = " + nLoops); // Setup the parameters: - P4PParameters.initialize(security_parameter_Sim, false); + P4PParameters.initialize(k, false); SecureRandom rand = null; try { rand = SecureRandom.getInstance("SHA1PRNG"); @@ -169,165 +162,121 @@ else if(arg.equals("-bench")) { e.printStackTrace(); rand = new SecureRandom(); } + rand.nextBoolean(); - long L_1099511627776 = ((long)2)< + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - *

+ * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - *

+ * notice, this list of conditions and the following disclaimer. + * * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - *

+ * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * 3. The name of the University may not be used to endorse or promote products - * derived from this software without specific prior written permission. - *

+ * derived from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -46,10 +46,10 @@ /** * Changes: - *

- * 10/12/2007: The method implemented in this class is OUT OF DATE. Do NOT - * use this class. - * 12/05/2005: Moved to user package. + * + * 10/12/2007: The method implemented in this class is OUT OF DATE. Do NOT + * use this class. + * 12/05/2005: Moved to user package. */ /** @@ -59,77 +59,71 @@ * some operations as well as a ZKP that proves the L2 norm of the user vector * is bounded by L. * - * NOTE: The L2-norm bound ZKP implemented in this class is OUT OF DATE. It + * NOTE: The L2-norm bound ZKP implemented in this class is OUT OF DATE. It * should be replaced by the protocol implemented in UserVector2 * which is more efficient and secure. This class is kept here for reference - * purposes only. It is not being maintained and hasn't been throughoutly + * purposes only. It is not being maintained and hasn't been throughoutly * tested. Use UserVector2 instead. * * @author ET 10/11/2005 */ public class UserVector extends P4PParameters { - protected long[] data_UV = null; // The user data - protected int dimension = -1; // The dimension of user vector + protected long[] data = null; // The user data + protected int m = -1; // The dimension of user vector - protected long F_UV = -1; - // The order of the (small) finite field over which all the - // computations are carried out. It should be a prime of + protected long F = -1; + // The order of the (small) finite field over which all the + // computations are carried out. It should be a prime of // appropriate length (e.g. the length of a long). - protected int[][] checkCoVector = null; // The checksum coefficient vectors. + protected int[][] c = null; // The checksum coefficient vectors. - protected long L_UV = -1; - protected int l_UV; + protected long L = -1; + protected int l; /** */ - public UserVector(long[] data_UV_P, long F_UV_P, int log_2_m_UV_P) { - if (F_UV_P < 0 || !new BigInteger(new Long(F_UV_P).toString()).isProbablePrime(200)) + public UserVector(long[] data, long F, int l) { + if(F < 0 || !new BigInteger(new Long(F).toString()).isProbablePrime(200)) throw new RuntimeException("Field order must be positive prime."); - this.data_UV = data_UV_P; - this.dimension = data_UV_P.length - ; - this.F_UV = F_UV_P; - this.l_UV = log_2_m_UV_P; - this.L_UV = ((long) 1) << l_UV - 1; + this.data = data; + this.m = data.length + ; this.F = F; + this.l = l; + this.L = ((long)1)< oked = new Vector(); @@ -177,28 +167,28 @@ public void construct() { // Compute the checksums: - for (int i = 0; i < checkCoVector.length; i++) { - long s_checksums_long_UV = 0; - for (int j = 0; j < dimension; j++) { + for(int i = 0; i < c.length; i++) { + long s = 0; + for(int j = 0; j < m; j++) { //s += c[i][j]*data[j]; - if (checkCoVector[i][j] == 1) - s_checksums_long_UV += data_UV[j]; + if(c[i][j] == 1) + s += data[j]; else - s_checksums_long_UV -= data_UV[j]; + s -= data[j]; // Maybe it is faster this way? /** * Note that although all the normal compuations are done in * a small finite field, we don't restrict the size of the - * checksum here (i.e. no mod operation). We allow s_checksums_long_UV to grow + * checksum here (i.e. no mod operation). We allow s to grow * to check the L2 norm of the user vector. */ } - if (s_checksums_long_UV < 0) s_checksums_long_UV = Math.abs(s_checksums_long_UV); + if(s < 0) s = Math.abs(s); //DEBUG("checksums[" + i + "] = " + s); - if (s_checksums_long_UV < L_UV) { + if(s < L) { oked.add(new Integer(i)); - cs.add(new Long(s_checksums_long_UV)); + cs.add(new Long(s)); } } @@ -206,54 +196,54 @@ public void construct() { passed = new int[cs.size()]; int numBits = 0; - for (int i = 0; i < checksums.length; i++) { - passed[i] = ((Integer) oked.elementAt(i)).intValue(); - checksums[i] = ((Long) cs.elementAt(i)).longValue(); + for(int i = 0; i < checksums.length; i++) { + passed[i] = ((Integer)oked.elementAt(i)).intValue(); + checksums[i] = ((Long)cs.elementAt(i)).longValue(); numBits = Math.max(numBits, Long.toBinaryString(checksums[i]).length()); //DEBUG("checksums[" + i + "] = " + checksums[i]); } DEBUG("Largest checksum has " + numBits + " bits."); - if (checksums.length == 0) return; + if(checksums.length == 0) return; // All checksums are greater than L. We fail // Commit to the bit vectors: BitVectorCommitment bvc = new BitVectorCommitment(P4PParameters.getGenerators(checksums.length), - P4PParameters.getGenerator()); + P4PParameters.getGenerator()) ; BigInteger sRandomness = BigInteger.ZERO; -// byte[][] bits = new byte[checksums.length][]; +// byte[][] bits = new byte[checksums.length][]; // for(int i = 0; i < checksums.length; i++) { // bits[i] = new byte[8]; // Util.bytesFromLong(bits[i], 0, checksums[i]); // } - bitVecProofs = new BitVectorCommitment.BitVectorCommitmentProof[l_UV]; - commitment = new BigInteger[l_UV + 2]; - commitment[l_UV] = BigInteger.ONE; + bitVecProofs = new BitVectorCommitment.BitVectorCommitmentProof[l]; + commitment = new BigInteger[l+2]; + commitment[l] = BigInteger.ONE; // The commitment to the vector. To be calculated by multiplying all the bit vector commitments - for (int i = 0; i < l_UV; i++) { + for(int i = 0; i < l; i++) { commitment[i] = bvc.commit(checksums, i); NativeBigInteger c = new NativeBigInteger(commitment[i]); // Turn it into a NativeBigInteger because we need to do pow. - BigInteger e = new BigInteger(new Long(((long) 1) << i).toString()); + BigInteger e = new BigInteger(new Long(((long)1)< 0 && arg.charAt(0) == '-') { + if(arg.length() > 0 && arg.charAt(0) == '-') { if (arg.equals("-k")) { try { k = Integer.parseInt(args[i++]); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) { k = 512; } - } else if (arg.equals("-m")) { + } + else if(arg.equals("-m")) { try { m = Integer.parseInt(args[i++]); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) { m = 10; } - } else if (arg.equals("-l")) { + } + else if(arg.equals("-l")) { try { nLoops = Integer.parseInt(args[i++]); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) { nLoops = 10; } - } else if (arg.equals("-d")) { + } + else if(arg.equals("-d")) { debug = true; - } else if (arg.equals("-w")) { + } + else if(arg.equals("-w")) { worstcase = true; // test the worst case cost. i.e. every vector should pass. this is when the verifier spends longest time. - } else if (arg.equals("-bench")) { + } + else if(arg.equals("-bench")) { doBench = true; } } @@ -421,7 +419,8 @@ public static void main(String[] args) { SecureRandom rand = null; try { rand = SecureRandom.getInstance("SHA1PRNG"); - } catch (java.security.NoSuchAlgorithmException e) { + } + catch(java.security.NoSuchAlgorithmException e) { System.err.println("NoSuchAlgorithmException!"); e.printStackTrace(); rand = new SecureRandom(); @@ -433,12 +432,9 @@ public static void main(String[] args) { // int l = 32; // We restrict L to be 32 bits // Lets make l = log_2 (m) - int log_2_m = Math.max(10, (int) Math.ceil(Math.log(m) / Math.log(2.))); - - - // We restrict L to be 32 bits - long L_to_32_bits = ((long) 2) << log_2_m - 1; - long F = BigInteger.probablePrime(log_2_m + 10, rand).longValue(); + int l = Math.max(10, (int)Math.ceil(Math.log(m)/Math.log(2.))); // We restrict L to be 32 bits + long L = ((long)2)<UserVector2. - * - * - * The privacy peer only + * user will construct a full UserVector2. The privacy peer only * sets and accesses the v part of the data (by calling * {@link #setV(long[])}, {@link #getV()} and {@link #getL2NormBoundProof2(boolean)}) * with argument false. - * - * * The server manipulates the u part via {@link #setV(long[])}, * {@link #getV()} and {@link #getL2NormBoundProof2(boolean)} with argument true. In addition, the * server should receive Y's from the peer and call {@link #setY} @@ -82,15 +76,15 @@ */ public class UserVector2 extends UserVector { - private NativeBigInteger g_UV2 = null; - private NativeBigInteger h_UV2 = null; + private NativeBigInteger g = null; + private NativeBigInteger h = null; //private SquareCommitment sc = null; /** * Constructs a (share of) user vector. * * @param data the user vector - * @param F_UV_p the size of the field where all user computations are + * @param F the size of the field where all user computations are * performed * @param l the max allowed number of bits of the L2 norm of user * vector @@ -98,64 +92,48 @@ public class UserVector2 extends UserVector { * @param h the sceond generator used in commitment * */ - public UserVector2(long[] data, long F_UV_p, int l, NativeBigInteger g, + public UserVector2(long[] data, long F, int l, NativeBigInteger g, NativeBigInteger h) { - super(data, F_UV_p, l); - this.g_UV2 = g; - this.h_UV2 = h; + super(data, F, l); + this. g = g; + this.h = h; //sc = new SquareCommitment(g, h); } - public UserVector2(int m, long FieldSize_larger_than_bitLength_UV2, int log_2_m_UV2_P, NativeBigInteger g_UV2_P, - NativeBigInteger h_UV2_P) { - super(m, FieldSize_larger_than_bitLength_UV2, log_2_m_UV2_P); - this.g_UV2 = g_UV2_P; - this.h_UV2 = h_UV2_P; + public UserVector2(int m, long F, int l, NativeBigInteger g, + NativeBigInteger h) { + super(m, F, l); + this. g = g; + this.h = h; //sc = new SquareCommitment(g, h); } /** */ - public void setData(long[] data_UV2_P) { - this.data_UV = data_UV2_P; - if(dimension == -1) - dimension = data_UV2_P.length; + public void setData(long[] data) { + this.data = data; + if(m == -1) + m = data.length; } - private long [] serverUserVector_UV2 = null; // Server's share of user vector - private long [] peerVector_UV2 = null; // Privacy peer's share of user vector + private long [] u = null; // Server's share of user vector + private long [] v = null; // Privacy peer's share of user vector /** * Generates the shares of the user vector. */ - // iterate through dimensions - // generate server & peer vectors public void generateShares() { - if(serverUserVector_UV2 == null) { - serverUserVector_UV2 = new long[dimension]; - peerVector_UV2 = new long[dimension]; + if(u == null) { + u = new long[m]; + v = new long[m]; + } + + u = Util.randVector(m, F, 0); + for(int i = 0; i < m; i++) { + v[i] = Util.mod(data[i] - u[i], F); + assert (data[i] == Util.mod(u[i] + v[i], F)); } - // 1. serverUVector - serverUserVector_UV2 = Util.randVector(dimension, F_UV, 0); - - boolean data_equal_mod_uv2; - boolean [] data_equal_mod_array_uv2 = new boolean[dimension]; - int generate_shares_ui = 0; - for(generate_shares_ui = 0; generate_shares_ui < dimension; generate_shares_ui++) { - - // 2. peerUVector = mod(dataUV[]-serverVector, F - // - // if(data_UV[i] == Util.mod(serverV[i] + peerV[i], F)) - peerVector_UV2[generate_shares_ui] = Util.mod(data_UV[generate_shares_ui] - serverUserVector_UV2[generate_shares_ui], F_UV); - - if(data_UV[generate_shares_ui] == Util.mod(serverUserVector_UV2[generate_shares_ui] + peerVector_UV2[generate_shares_ui], F_UV)){ - data_equal_mod_uv2 = true; - data_equal_mod_array_uv2[generate_shares_ui] = data_equal_mod_uv2; - } - assert (data_UV[generate_shares_ui] == Util.mod(serverUserVector_UV2[generate_shares_ui] + peerVector_UV2[generate_shares_ui], F_UV)); - System.out.println("after assert in GenerateShares UV2"); - } // for 10 dimension, assert(data==mod) } @@ -163,14 +141,14 @@ public void generateShares() { * Returns the server share. */ public long[] getU() { - return serverUserVector_UV2; + return u; } /** * Returns the peer share. */ public long[] getV() { - return peerVector_UV2; + return v; } @@ -178,11 +156,11 @@ public long[] getV() { * Sets the server share. This is useful for server-side manipulation, * e.g. verifying the server-side proof. * - * @param u_U2 the vector + * @param u the vector * */ - public void setU(long[] u_U2) { - this.serverUserVector_UV2 = u_U2; + public void setU(long[] u) { + this.u = u; } @@ -194,7 +172,7 @@ public void setU(long[] u_U2) { * */ public void setV(long[] v) { - this.peerVector_UV2 = v; + this.v = v; } @@ -299,7 +277,7 @@ public class L2NormBoundProof2 extends Proof { private L2NormBoundProof2 serverProof = null; private L2NormBoundProof2 peerProof = null; - ThreeWayCommitment tc = new ThreeWayCommitment(g_UV2, h_UV2, F_UV); + ThreeWayCommitment tc = new ThreeWayCommitment(g, h, F); // Used to prepare the ZKP. Can be computed offline. /** @@ -321,22 +299,22 @@ public boolean isForServer() { * the other for the privacy peer. */ public void construct() { - if(checkCoVector == null || serverUserVector_UV2 == null) + if(c == null || u == null) throw new RuntimeException("Checksum vector not set or shares" - + " not generated yet."); + + " not generated yet."); serverProof = new L2NormBoundProof2(true); peerProof = new L2NormBoundProof2(false); /** For the server: */ - serverProof.checksums = new long[checkCoVector.length]; - serverProof.checksumRandomness = new BigInteger[checkCoVector.length]; + serverProof.checksums = new long[c.length]; + serverProof.checksumRandomness = new BigInteger[c.length]; serverProof.scProofs = - new SquareCommitment.SquareCommitmentProof[checkCoVector.length]; + new SquareCommitment.SquareCommitmentProof[c.length]; serverProof.tcProofs = - new ThreeWayCommitment.ThreeWayCommitmentProof[checkCoVector.length]; + new ThreeWayCommitment.ThreeWayCommitmentProof[c.length]; - serverProof.mdCorrector = new BigInteger[checkCoVector.length]; + serverProof.mdCorrector = new BigInteger[c.length]; BigInteger squareSum = BigInteger.ZERO; // Sum of the squares BigInteger squareSumCommitment = BigInteger.ONE; @@ -344,14 +322,14 @@ public void construct() { BigInteger sRandomness = BigInteger.ZERO; /** For the peer: */ - peerProof.checksums = new long[checkCoVector.length]; - peerProof.checksumRandomness = new BigInteger[checkCoVector.length]; + peerProof.checksums = new long[c.length]; + peerProof.checksumRandomness = new BigInteger[c.length]; - Commitment cm = new Commitment(g_UV2, h_UV2); - SquareCommitment sc = new SquareCommitment(g_UV2, h_UV2); - for(int i = 0; i < checkCoVector.length; i++) { - serverProof.checksums[i] = Util.mod(Util.innerProduct(checkCoVector[i], serverUserVector_UV2), F_UV); - peerProof.checksums[i] = Util.mod(Util.innerProduct(checkCoVector[i], peerVector_UV2), F_UV); + Commitment cm = new Commitment(g, h); + SquareCommitment sc = new SquareCommitment(g, h); + for(int i = 0; i < c.length; i++) { + serverProof.checksums[i] = Util.mod(Util.innerProduct(c[i], u), F); + peerProof.checksums[i] = Util.mod(Util.innerProduct(c[i], v), F); /** * Note that although all the normal compuations are done in @@ -359,78 +337,78 @@ public void construct() { * checksum here (i.e. no mod operation). We allow s to grow * to check the L2 norm of the user vector. */ - peerProof.checksumRandomness[i] = Util.randomBigInteger(q); + peerProof.checksumRandomness[i] = Util.randomBigInteger(q); // We don't need to really compute the commitment here serverProof.checksumRandomness[i] = Util.randomBigInteger(q); // The peer should be done. The following are for the server: long s = Util.mod(serverProof.checksums[i] - + peerProof.checksums[i], F_UV); + + peerProof.checksums[i], F); long b = s - (serverProof.checksums[i]+peerProof.checksums[i]); - if(!(b == 0 || b == -F_UV || b == F_UV)) + if(!(b == 0 || b == -F || b == F)) throw new RuntimeException("Modular reduction corrector " - + "wrong. F_UV = " + F_UV + ", b = " - + b); + + "wrong. F = " + F + ", b = " + + b); serverProof.mdCorrector[i] = tc.commit(b); serverProof.tcProofs[i] = - (ThreeWayCommitment.ThreeWayCommitmentProof)tc.getProof(); + (ThreeWayCommitment.ThreeWayCommitmentProof)tc.getProof(); // check if(!serverProof.mdCorrector[i].equals(serverProof.tcProofs[i] - .getCommitment()[0])) + .getCommitment()[0])) throw new RuntimeException("Modular corrector " + i - + " was not computed correctly."); + + " was not computed correctly."); // NOTE: Constructing and verifying the 3-way commitment proofs // are independent of user data so they can be done offline. // The performance reported in the paper did not include this // cost which is a few seconds for m = 10^6. BigInteger rr = - peerProof.checksumRandomness[i] - .add(serverProof.checksumRandomness[i]) - .add(tc.getRandomness()).mod(q); + peerProof.checksumRandomness[i] + .add(serverProof.checksumRandomness[i]) + .add(tc.getRandomness()).mod(q); //BigInteger cs = new BigInteger(new Long(Math.abs(s)).toString()); BigInteger cs = new BigInteger(new Long(s).toString()); sc.commit(cs, rr); serverProof.scProofs[i] - = (SquareCommitment.SquareCommitmentProof)sc.getProof(); + = (SquareCommitment.SquareCommitmentProof)sc.getProof(); DEBUG("checksum: " + cs); if(debug) { // lets check here: if(!sc.verify(serverProof.scProofs[i])) { throw new RuntimeException("Square commitment proof or" - + " verification is not " - + "working properly. i = " - + 1); + + " verification is not " + + "working properly. i = " + + 1); } if(!rr.equals(sc.getSa())) throw new RuntimeException("Square commitment uses " - + "the wrong randomness. " - + "i = " + 1); + + "the wrong randomness. " + + "i = " + 1); BigInteger Y = - cm.commit(new BigInteger(new - Long(peerProof.checksums[i]) - .toString()).mod(q), - peerProof.checksumRandomness[i].mod(q)); + cm.commit(new BigInteger(new + Long(peerProof.checksums[i]) + .toString()).mod(q), + peerProof.checksumRandomness[i].mod(q)); BigInteger X = - cm.commit(new BigInteger(new - Long(serverProof.checksums[i]) - .toString()).mod(q), - serverProof.checksumRandomness[i].mod(q)); + cm.commit(new BigInteger(new + Long(serverProof.checksums[i]) + .toString()).mod(q), + serverProof.checksumRandomness[i].mod(q)); if(!serverProof.scProofs[i].getCommitment()[0] - .equals(X.multiply(Y).multiply(serverProof - .mdCorrector[i]).mod(p))) + .equals(X.multiply(Y).multiply(serverProof + .mdCorrector[i]).mod(p))) throw new RuntimeException("S != X*Y*B. i = " + 1); } //squareSum = squareSum.add(cs.multiply(cs).mod(q)).mod(q); squareSum = squareSum.add(cs.multiply(cs)); squareSumCommitment = - squareSumCommitment.multiply(sc.getB()).mod(p); + squareSumCommitment.multiply(sc.getB()).mod(p); // Now get the randomness used to commit to the square: sRandomness = sRandomness.add(sc.getSb()).mod(q); } @@ -442,7 +420,7 @@ public void construct() { BigInteger ssc = cm.commit(squareSum, sRandomness); if(!ssc.equals(squareSumCommitment)) { throw new RuntimeException("Commitment to sum of squares " - + " wasn't computed correctly!"); + + " wasn't computed correctly!"); } System.out.println(" done."); } @@ -456,7 +434,7 @@ public void construct() { squareSum = squareSum.add(squareSum); // 2x sRandomness = sRandomness.add(sRandomness).mod(q); squareSumCommitment = - squareSumCommitment.multiply(squareSumCommitment).mod(p); // 2x + squareSumCommitment.multiply(squareSumCommitment).mod(p); // 2x /** * Note on computing the checksums: @@ -471,7 +449,7 @@ public void construct() { System.out.print("Checking commitment to 2*(sum of squares) ..."); if(!cm.verify(squareSumCommitment, squareSum, sRandomness)) throw new RuntimeException("Commitment to 2*(sum of squares" - + ") wasn't computed correctly!"); + + ") wasn't computed correctly!"); System.out.println(" done."); } @@ -480,25 +458,25 @@ public void construct() { serverProof.commitment[0] = squareSumCommitment; int numBits = - Math.max(squareSum.bitLength(), - Integer.toBinaryString(checkCoVector.length).length()+2*l_UV); + Math.max(squareSum.bitLength(), + Integer.toBinaryString(c.length).length()+2*l); // Even for small squares we must do all the commitments // otherwise leak info. DEBUG("squareSum has " + numBits + " bits. The limit is " - + (Integer.toBinaryString(checkCoVector.length).length()+2*l_UV)); + + (Integer.toBinaryString(c.length).length()+2*l)); serverProof.bcProofs = - new BitCommitment.BitCommitmentProof[numBits]; - BitCommitment bc = new BitCommitment(g_UV2, h_UV2); + new BitCommitment.BitCommitmentProof[numBits]; + BitCommitment bc = new BitCommitment(g, h); for(int i = 0; i < numBits - 1; i++) { BigInteger cc = bc.commit(squareSum.testBit(i)); serverProof.bcProofs[i] = - (BitCommitment.BitCommitmentProof)bc.getProof(); + (BitCommitment.BitCommitmentProof)bc.getProof(); if(debug) { if(!cc.equals(serverProof.bcProofs[i].getCommitment()[0])) throw new RuntimeException("Bit commitment wasn't " - + "computed correctly!"); + + "computed correctly!"); } BigInteger r = bc.getRandomness(); @@ -517,7 +495,7 @@ public void construct() { sRandomness = sRandomness.multiply(e).mod(q); // divide by 2^l bc.commit(squareSum.testBit(numBits-1), sRandomness); serverProof.bcProofs[numBits-1] = - (BitCommitment.BitCommitmentProof)bc.getProof(); + (BitCommitment.BitCommitmentProof)bc.getProof(); // Lets check it here: if(debug) { @@ -535,7 +513,7 @@ public void construct() { z = z.add(e); NativeBigInteger Z = - (NativeBigInteger)serverProof.bcProofs[i].getCommitment()[0]; + (NativeBigInteger)serverProof.bcProofs[i].getCommitment()[0]; ZZ = ZZ.multiply(Z.modPow(e, p)).mod(p); } @@ -544,7 +522,7 @@ public void construct() { System.out.println("z = " + z); System.out.println("squareSum = " + squareSum); throw new RuntimeException("2*(sum of squares) wasn't " - + "computed correctly!"); + + "computed correctly!"); } if(!ZZ.equals(squareSumCommitment)) throw new RuntimeException("Homomorphism doesn't hold!"); @@ -568,7 +546,7 @@ public L2NormBoundProof2 getPeerProof() { } public SquareCommitment.SquareCommitmentProof[] - getSquareCommitmentProofs() { + getSquareCommitmentProofs() { return scProofs; } @@ -601,12 +579,6 @@ public Proof getL2NormBoundProof2(boolean server) { proof = new L2NormBoundProof2(server); proof.construct(); } -// System.out.println("server： "+server); - if(server){ - proof.getServerProof(); - }else{ - proof.getPeerProof(); - } return server ? proof.getServerProof() : proof.getPeerProof(); } @@ -622,121 +594,119 @@ public Proof getL2NormBoundProof2(boolean server) { * proof will construct Y. The peer can then call * {@link #getY()} to obtain Y and pass it to the server. */ - private BigInteger[] Y_peer_UV2 = null; - // The peer share of the checksums. Put it here for tes + private BigInteger[] Y = null; + // The peer share of the checksums. Put it here for test public boolean verify2(Proof proof) { L2NormBoundProof2 l2Proof = (L2NormBoundProof2)proof; if(l2Proof.isForServer()) - return serverVerify_uv2(l2Proof, Y_peer_UV2); + return serverVerify(l2Proof, Y); else - return peerVerify_uv2(l2Proof); + return peerVerify(l2Proof); } /** * Call this method to set the commitments to the y's, which should be * verified by the peer and passed to the server. */ - public void setY_UV2(BigInteger[] Y_U2) { - this.Y_peer_UV2 = Y_U2; + public void setY(BigInteger[] Y) { + this.Y = Y; } - public BigInteger[] getY_UV2() { - return Y_peer_UV2; + public BigInteger[] getY() { + return Y; } - protected boolean peerVerify_uv2(L2NormBoundProof2 l2Proof) { - long[] y_checksums_l2Proof = l2Proof.getChecksums(); - System.out.println("peerVerify_uv2: [y.length] "+ String.valueOf(y_checksums_l2Proof.length)); + protected boolean peerVerify(L2NormBoundProof2 l2Proof) { + long[] y = l2Proof.getChecksums(); // This is only getting the peer's share of the checksums. BigInteger[] r = l2Proof.getChecksumRandomness(); - Y_peer_UV2 = new BigInteger[y_checksums_l2Proof.length]; // The commitments to the checksums + Y = new BigInteger[y.length]; // The commitments to the checksums // Peer just computes the commitments to the checksums - Commitment cm = new Commitment(g_UV2, h_UV2); - for(int i = 0; i < y_checksums_l2Proof.length; i++) { - y_checksums_l2Proof[i] = Util.mod(Util.innerProduct(checkCoVector[i], peerVector_UV2), F_UV); - Y_peer_UV2[i] = - cm.commit(new BigInteger(new Long(y_checksums_l2Proof[i]).toString()), - // The checksum - r[i]); // The randomness + Commitment cm = new Commitment(g, h); + for(int i = 0; i < y.length; i++) { + y[i] = Util.mod(Util.innerProduct(c[i], v), F); + Y[i] = + cm.commit(new BigInteger(new Long(y[i]).toString()), + // The checksum + r[i]); // The randomness } return true; } - public boolean serverVerify_uv2(L2NormBoundProof2 l2Proof, BigInteger[] Y_UV2_serverV_P) { - System.out.println("serverVerify_uv2: "+ Arrays.toString(Y_UV2_serverV_P)); - if(Y_UV2_serverV_P == null) + public boolean serverVerify(L2NormBoundProof2 l2Proof, BigInteger[] Y) { + if(Y == null) throw new RuntimeException("Must perform peer verification first!"); BitCommitment.BitCommitmentProof[] bcProofs = - l2Proof.getBitCommitmentProofs(); + l2Proof.getBitCommitmentProofs(); SquareCommitment.SquareCommitmentProof[] scProofs = - l2Proof.getSquareCommitmentProofs(); + l2Proof.getSquareCommitmentProofs(); ThreeWayCommitment.ThreeWayCommitmentProof[] tcProofs = - l2Proof.getThreeWayCommitmentProofs(); + l2Proof.getThreeWayCommitmentProofs(); long[] x = l2Proof.getChecksums(); // This is only getting the server's share of the checksums. - BigInteger[] r_checksum_randomness_l2Proof = l2Proof.getChecksumRandomness(); - BigInteger[] X_checksums = new BigInteger[x.length]; + BigInteger[] r = l2Proof.getChecksumRandomness(); + BigInteger[] X = new BigInteger[x.length]; // The commitments to the checksums - BigInteger[] S_checksums = new BigInteger[x.length]; + BigInteger[] S = new BigInteger[x.length]; // The commitments to s - BigInteger[] B_MdCorrector_l2Proof = l2Proof.getMdCorrector(); + BigInteger[] B = l2Proof.getMdCorrector(); // The Bs // Check the checksums and their commitments: - Commitment cm = new Commitment(g_UV2, h_UV2); - ThreeWayCommitment tc = new ThreeWayCommitment(g_UV2, h_UV2, F_UV); + Commitment cm = new Commitment(g, h); + ThreeWayCommitment tc = new ThreeWayCommitment(g, h, F); for(int i = 0; i < x.length; i++) { // First make sure the checksums are computed correctly: //if(s[i] != Math.abs(Util.innerProduct(c[i], data))) { - if(x[i] != Util.mod(Util.innerProduct(checkCoVector[i], serverUserVector_UV2), F_UV)) { + if(x[i] != Util.mod(Util.innerProduct(c[i], u), F)) { // We are doing server System.out.println("Checksum " + i - + " not computed correctly!"); + + " not computed correctly!"); return false; } // Now check if the modular correctors, the Bs, are computed correctly - if(!B_MdCorrector_l2Proof[i].equals(tcProofs[i].getCommitment()[0])) { + if(!B[i].equals(tcProofs[i].getCommitment()[0])) { System.out.println("B[" + i + "]" - + " not computed correctly!"); + + " not computed correctly!"); return false; } // Check the 3-way proofs if(!tc.verify(tcProofs[i])) { System.out.println("3-Way proof " + i - + " not computed correctly!"); + + " not computed correctly!"); return false; } - X_checksums[i] = - cm.commit(new BigInteger(new Long(x[i]).toString()).mod(q), - // The checksum - r_checksum_randomness_l2Proof[i]); // The randomness - S_checksums[i] = X_checksums[i].multiply(B_MdCorrector_l2Proof[i]).mod(p).multiply(Y_UV2_serverV_P[i]).mod(p); + X[i] = + cm.commit(new BigInteger(new Long(x[i]).toString()).mod(q), + // The checksum + r[i]); // The randomness + S[i] = X[i].multiply(B[i]).mod(p).multiply(Y[i]).mod(p); } // Next check that the sum of squares does not have excessive bits: - if(bcProofs.length > Integer.toBinaryString(checkCoVector.length).length()+2*l_UV) { + if(bcProofs.length > Integer.toBinaryString(c.length).length()+2*l) { System.out.println("Sum of squares has too many bits: " - + bcProofs.length - + ", the limit is " - + (Integer.toBinaryString(checkCoVector.length).length()+2*l_UV)); + + bcProofs.length + + ", the limit is " + + (Integer.toBinaryString(c.length).length()+2*l)); return false; } // Check the square proofs: - SquareCommitment sc = new SquareCommitment(g_UV2, h_UV2); + SquareCommitment sc = new SquareCommitment(g, h); for(int i = 0; i < scProofs.length; i++) { // First check that the square commitment encodes the correct // number i.e. the A in scProofs is the commitment to s. - if(!scProofs[i].getCommitment()[0].equals(S_checksums[i])) { + if(!scProofs[i].getCommitment()[0].equals(S[i])) { System.out.println("S[" + i + "] computed incroorectly."); return false; } @@ -757,12 +727,12 @@ public boolean serverVerify_uv2(L2NormBoundProof2 l2Proof, BigInteger[] Y_UV2_se if(!l2Proof.getCommitment()[0].equals(z)) { System.out.println("Commitment to square sum wasn't computed " - + "correctly."); + + "correctly."); return false; } // Then check each bits - BitCommitment bc = new BitCommitment(g_UV2, h_UV2); + BitCommitment bc = new BitCommitment(g, h); BigInteger zz = BigInteger.ONE; DEBUG("Checking " + bcProofs.length + " bit commitments"); @@ -771,7 +741,7 @@ public boolean serverVerify_uv2(L2NormBoundProof2 l2Proof, BigInteger[] Y_UV2_se for(int i = 0; i < bcProofs.length; i++) { if(!bc.verify(bcProofs[i])) { System.out.println("Bit commitment verification " + i - + " failed."); + + " failed."); return false; } @@ -781,7 +751,7 @@ public boolean serverVerify_uv2(L2NormBoundProof2 l2Proof, BigInteger[] Y_UV2_se // enough bits! NativeBigInteger Z = - (NativeBigInteger)bcProofs[i].getCommitment()[0]; + (NativeBigInteger)bcProofs[i].getCommitment()[0]; ZZ = ZZ.multiply(Z.modPow(e, p)).mod(p); } @@ -852,8 +822,8 @@ else if(arg.equals("-l")) { l = Integer.parseInt(args[i++]); if(l > 52) { System.out.println("The system does not support l > 52. This will make " - + "the field order too high so that it is not a small" - + " field any more."); + + "the field order too high so that it is not a small" + + " field any more."); System.exit(0); } } @@ -882,7 +852,7 @@ else if(arg.equals("-bench")) { // Setup the parameters: P4PParameters.initialize(k, false); - SecureRandom rand = null; + SecureRandom rand = null; try { rand = SecureRandom.getInstance("SHA1PRNG"); } @@ -908,15 +878,12 @@ else if(arg.equals("-bench")) { System.out.println("zkpIterations = " + zkpIterations); // Generate the data and the checksum coefficient vector: - long[] data_uv2_main = new long[m]; + long[] data = new long[m]; int[][] c = new int[zkpIterations][]; - NativeBigInteger[] two_generators_for_g_h = P4PParameters.getGenerators(2); + NativeBigInteger[] bi = P4PParameters.getGenerators(2); - - // chanllenger vector the dimensionality of the vector = m - for(int zkp_jter = 0; zkp_jter < zkpIterations; zkp_jter++){ - c[zkp_jter] = new int[m]; - } + for(int j = 0; j < zkpIterations; j++) + c[j] = new int[m]; int nfails = 0; @@ -934,22 +901,16 @@ else if(arg.equals("-bench")) { if(worstcase) shouldPass = true; // Test the worst case else shouldPass = rand.nextBoolean(); - if(shouldPass) { - delta = 0.5; - }else { - delta = 2.0; - } - double l2_L_delta = (double)L*delta; - double sqrt_l2 = 0.; - // Generate data in randVector // - data_uv2_main = Util.randVector(m, F, l2_L_delta); - // Generate Data in randVector // - + if(shouldPass) delta = 0.5; + else delta = 2.0; + double l2 = (double)L*delta; + double ll2 = 0.; + data = Util.randVector(m, F, l2); for(int j = 0; j < m; j++) { - sqrt_l2 += (double)data_uv2_main[j]*(double)data_uv2_main[j]; + ll2 += (double)data[j]*(double)data[j]; } - sqrt_l2 = Math.sqrt(sqrt_l2); + ll2 = Math.sqrt(ll2); // for(int j = 0; j < zkpIterations; j++) { @@ -972,28 +933,28 @@ else if(arg.equals("-bench")) { c[j][kk] = (randBytes[byteIndex] & (1< 0 ? 1 : 0; if(c[j][kk] == 1) // flip half of the 1's c[j][kk] = (randBytes[byteIndex] - & (1<<(offset+1))) > 0 ? 1 : -1; + & (1<<(offset+1))) > 0 ? 1 : -1; } } randChallengeTime += (System.currentTimeMillis() - t0); // Lets test how much time an inner product takes t0 = System.currentTimeMillis(); - Util.innerProduct(c[0], data_uv2_main); + Util.innerProduct(c[0], data); innerProductTime += (System.currentTimeMillis()-t0); - UserVector2 uv = new UserVector2(data_uv2_main, F, l, two_generators_for_g_h[0], two_generators_for_g_h[1]); - data_uv2_main = uv.getUserData(); + UserVector2 uv = new UserVector2(data, F, l, bi[0], bi[1]); + data = uv.getUserData(); uv.generateShares(); uv.setChecksumCoefficientVectors(c); proverWatch.start(); L2NormBoundProof2 peerProof = - (L2NormBoundProof2)uv.getL2NormBoundProof2(false); + (L2NormBoundProof2)uv.getL2NormBoundProof2(false); L2NormBoundProof2 serverProof = - (L2NormBoundProof2)uv.getL2NormBoundProof2(true); + (L2NormBoundProof2)uv.getL2NormBoundProof2(true); proverWatch.pause(); - shouldPass = l2_L_delta < L; + shouldPass = l2 < L; verifierWatch.start(); uv.verify2(peerProof); // Must verify peer proof first boolean didPass = uv.verify2(serverProof); @@ -1002,41 +963,41 @@ else if(arg.equals("-bench")) { if(shouldPass != didPass) { nfails++; System.out.println("Test No. " + i + " failed. shouldPass = " - + shouldPass + ", result = " + didPass - + ". l2_L_delta = " + l2_L_delta - + ". sqrt_l2 = " + sqrt_l2); + + shouldPass + ", result = " + didPass + + ". l2 = " + l2 + + ". ll2 = " + ll2); } else System.out.println("Test No. " + i - + " passed. shouldPass = didPass = " - + shouldPass - + ". l2_L_delta = " + l2_L_delta - + ". sqrt_l2 = " + sqrt_l2); + + " passed. shouldPass = didPass = " + + shouldPass + + ". l2 = " + l2 + + ". ll2 = " + ll2); } verifierWatch.stop(); proverWatch.stop(); long end = System.currentTimeMillis(); System.out.println("UserVector L2 norm ZKP: " + nLoops - + " loops. Failed " + nfails + " times. ms per loop:"); + + " loops. Failed " + nfails + " times. ms per loop:"); System.out.println("\n Prover time Verifier time Total"); System.out.println("============================================================"); System.out.println(" " + (double)proverWatch.getElapsedTime()/(double)nLoops - + " " - + (double)verifierWatch.getElapsedTime()/(double)nLoops - + " " - + (double)(proverWatch.getElapsedTime()+verifierWatch.getElapsedTime())/(double)nLoops); + + " " + + (double)verifierWatch.getElapsedTime()/(double)nLoops + + " " + + (double)(proverWatch.getElapsedTime()+verifierWatch.getElapsedTime())/(double)nLoops); System.out.println("============================================================"); System.out.println("Total time: " + (end-start) + " ms. Average: " - + (double)(end-start)/(double)nLoops + " ms per loop" - + ". Failure rate: " + (double)nfails/(double)nLoops); + + (double)(end-start)/(double)nLoops + " ms per loop" + + ". Failure rate: " + (double)nfails/(double)nLoops); System.out.println("Time for doing 1 experiement (ms): " - + (double)(end-start)/(double)nLoops); + + (double)(end-start)/(double)nLoops); System.out.println("Time for doing 1 inner product (ms): " - + (double)innerProductTime/(double)nLoops); + + (double)innerProductTime/(double)nLoops); System.out.println("Time for generating N challenge vectors (ms): " - + (double)randChallengeTime/(double)nLoops); + + (double)randChallengeTime/(double)nLoops); } From 4e75a72520abb69d11f5122a3b9bca86fd3ef1c3 Mon Sep 17 00:00:00 2001 From: Retriever <16319106+SheldonHH@users.noreply.github.com> Date: Mon, 13 Dec 2021 10:03:33 +0800 Subject: [PATCH 2/2] add Original_Dr.Duan --- .../p4p/p4p/util/P4PParameters.class | Bin 6681 -> 6462 bytes out/production/p4p/p4p/util/Util.class | Bin 11175 -> 10201 bytes src/java/p4p/util/P4PParameters.java | 213 ++++---- src/java/p4p/util/Util.java | 495 +++++++++--------- 4 files changed, 343 insertions(+), 365 deletions(-) diff --git a/out/production/p4p/p4p/util/P4PParameters.class b/out/production/p4p/p4p/util/P4PParameters.class index 4189b87661460baf9789fa54e620d4dff8c3ebbc..8eac611ed6de3acb93ef8701609418f00a1b0123 100644 GIT binary patch delta 2713 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 security_parameters + * The security parameter. We must guarantee |p| >= k */ protected static int securityParameter; private static boolean initialized = false; - + /** * Initialize the system parameters with the given security parameter. */ - + // FIXME: there should also be a method so that the parameters // can be read from config file. This way we only distribute the // public keys to the users. - - public static void initialize(int security_parameters, boolean force) { + + public static void initialize(int k, boolean force) { if(initialized && !force) { System.out.println("System parameters already initialized."); dump(); return; } - - assert(security_parameters>0); - securityParameter = security_parameters; - + + assert(k>0); + securityParameter = k; + System.out.println("securityParameter = " + securityParameter); System.out.print("Setting up system paramenters. This may take a while," - + " depending on the security parameter used ..."); - int isProbablePrime_counter= 0; - if(force || security_parameters != STOCK_KEYLENGTH) { + + " depending on the security parameter used ..."); + + if(force || k != STOCK_KEYLENGTH) { while(true) { System.out.print("."); q = BigInteger.probablePrime(securityParameter - 1, rand); p = (q.add(q)).add(BigInteger.ONE); // 2*q + 1 - isProbablePrime_counter++; - if(p.isProbablePrime(100)){ + + if(p.isProbablePrime(100)) break; - } } } - else { + else { System.out.println("\nUsing stock p and q."); p = stockP; q = stockQ; } - // p = new NativeBigInteger(pp); + // p = new NativeBigInteger(pp); // q = new NativeBigInteger(qq); - - System.out.println("\np = " + p + "\nq = " + q); - - // Now lets find a generator of G_Q: cbxndsjmq - System.out.print("Finding th`bhgyhng x h22 ni)_≤≠ ikalenerator ."); - if(force || security_parameters != STOCK_KEYLENGTH) { - int cnt_mod_1000 = 0; + + System.out.println("\np = " + p + "\nq = " + q); + + // Now lets find a generator of G_Q: + System.out.print("Finding the generator ."); + if(force || k != STOCK_KEYLENGTH) { + int cnt = 0; while(true) { - cnt_mod_1000++; - if(cnt_mod_1000%1000 ==0){ - System.out.print("cnt_mod_1000%1000 ==0"); - } + cnt++; + if(cnt%1000 ==0) System.out.print("."); generator = new NativeBigInteger(Util.randomBigInteger(q)); - if(!BigInteger.ONE.equals(generator) && - BigInteger.ONE.equals(generator.modPow(q, p))) { + if(!BigInteger.ONE.equals(generator) && + BigInteger.ONE.equals(generator.modPow(q, p))) { System.out.println("generator = " + generator); break; } } - + System.out.println("done"); } else { System.out.println("\nUsing stock generator."); generator = stockGenerator; } - - + + // Generate a lot of generators for use with vector commitment: // FIXME: many applications may not need the following. generators = new NativeBigInteger[MAX_GENERATORS]; - int counter_r = 0; for(int i = 0; i < MAX_GENERATORS; i++) { BigInteger r = Util.randomBigInteger(q); - - while(r.equals(BigInteger.ZERO)){ + while(r.equals(BigInteger.ZERO)) r = Util.randomBigInteger(q); - - } - // r can't be 0 - + generators[i] = new NativeBigInteger(generator.modPow(r, p)); - counter_r++; } - + System.out.println("Length of p: " + p.bitLength()); System.out.println("Length of q: " + q.bitLength()); - - if(p.bitLength() < security_parameters) + + if(p.bitLength() < k) throw new RuntimeException("p is too small!"); - int p_bitlength = p.bitLength(); + initialized = true; } - + /** * Print out the system parameters. @@ -233,13 +224,13 @@ public static void dump() { System.out.println("Length of p: " + p.bitLength()); System.out.println("Length of q: " + q.bitLength()); } - + /** * Note: NativeBigInteger seems to be unable to handle negative * exponents properly. We should avoid using modPow(e1.negate(), p) * before we fix the implementation. */ - + /** * Get the first N stock generators in G_q. This maybe useful for vector @@ -248,9 +239,9 @@ public static void dump() { public static NativeBigInteger[] getGenerators(int N) { if(!initialized) throw new RuntimeException("System parameters haven't been " - + "setup yet!"); + + "setup yet!"); NativeBigInteger[] v = new NativeBigInteger[N]; - + for(int i = 0; i < N; i++) { v[i] = generators[i]; } @@ -263,16 +254,16 @@ public static NativeBigInteger[] getGenerators(int N) { public static NativeBigInteger[] getFreshGenerators(int N) { if(!initialized) throw new RuntimeException("System parameters haven't been " - + "setup yet!"); - + + "setup yet!"); + NativeBigInteger[] v = new NativeBigInteger[N]; - + for(int i = 0; i < N; i++) { BigInteger r = Util.randomBigInteger(q); while(r.equals(BigInteger.ZERO)) r = Util.randomBigInteger(q); // r can't be 0 - + v[i] = new NativeBigInteger(generator.modPow(r, p)); } return v; @@ -284,7 +275,7 @@ public static NativeBigInteger[] getFreshGenerators(int N) { public static NativeBigInteger getGenerator() { if(!initialized) throw new RuntimeException("System parameters haven't been " - + "setup yet!"); + + "setup yet!"); return generator; } @@ -294,8 +285,8 @@ public static NativeBigInteger getGenerator() { public static NativeBigInteger getFreshGenerator() { if(!initialized) throw new RuntimeException("System parameters haven't been " - + "setup yet!"); - + + "setup yet!"); + BigInteger r = Util.randomBigInteger(q); while(r.equals(BigInteger.ZERO)) r = Util.randomBigInteger(q); @@ -308,20 +299,20 @@ public static NativeBigInteger getFreshGenerator() { public void sanityCheck() { if(!initialized) throw new RuntimeException("System parameters haven't been " - + "setup yet!"); - - if(!p.isProbablePrime(100)) + + "setup yet!"); + + if(!p.isProbablePrime(100)) throw new RuntimeException("p is not prime!"); - if(!q.isProbablePrime(100)) + if(!q.isProbablePrime(100)) throw new RuntimeException("q is not prime!"); - + if(!generator.modPow(q, p).equals(BigInteger.ONE)) throw new RuntimeException("generator does not have the " - + " correct order!"); + + " correct order!"); } - /** + /** * Debug helper */ static protected boolean debug = false; @@ -329,7 +320,7 @@ public static void DEBUG(String msg) { if(debug) System.out.println(msg); } - + public static void DEBUG_(String msg) { if(debug) System.out.print(msg); diff --git a/src/java/p4p/util/Util.java b/src/java/p4p/util/Util.java index d15b3f4..decc9b8 100644 --- a/src/java/p4p/util/Util.java +++ b/src/java/p4p/util/Util.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Regents of the University of California. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. The name of the University may not be used to endorse or promote products + * 3. The name of the University may not be used to endorse or promote products * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND @@ -35,47 +35,46 @@ import java.security.SecureRandom; import java.security.MessageDigest; import java.security.GeneralSecurityException; -import java.util.Arrays; import net.i2p.util.NativeBigInteger; public class Util extends P4PParameters { public static SecureRandom rand = new SecureRandom(); - + // Warming up: static { rand.nextBoolean(); } - - private static int close_t_uniform_q_minus_1 = 20; + + private static int t = 20; /** - * This parameter controls how "close" our random numbers generated by the - * following two functions are to a true uniform distribution over - * [0, ..., q-1). We essentially generate t more random bites and do mod q. - * The statisical distance to a true uniform distribution is 2^{-t}. See - * - * Victor Shoup, A Computational Introduction to Number Theory + * This parameter controls how "close" our random numbers generated by the + * following two functions are to a true uniform distribution over + * [0, ..., q-1). We essentially generate t more random bites and do mod q. + * The statisical distance to a true uniform distribution is 2^{-t}. See + * + * Victor Shoup, A Computational Introduction to Number Theory * and Algebra, pp 157. http://www.shoup.net/ntb/ */ /** - * Randomly generates a BigInteger between 1 to n-1, inclusive. - * - * @param set_size the size of the set + * Randomly generates a BigInteger between 1 to n-1, inclusive. + * + * @param m the size of the set * @return a BigInteger uniformly randomly distributed between [1, n-1] */ - public static BigInteger randomBigInteger(BigInteger set_size) { + public static BigInteger randomBigInteger(BigInteger m) { while(true) { - BigInteger r = new BigInteger(set_size.bitLength()+close_t_uniform_q_minus_1, rand); + BigInteger r = new BigInteger(m.bitLength()+t, rand); if(!r.equals(BigInteger.ZERO)) - return r.mod(set_size); + return r.mod(m); } } /** - * A hash function mapping the message to an element in Z_q. We just - * compute SHA-512 hash of the messages and catenate them until we have + * A hash function mapping the message to an element in Z_q. We just + * compute SHA-512 hash of the messages and catenate them until we have * enough bits. * * @param msg the array of messages @@ -83,30 +82,30 @@ public static BigInteger randomBigInteger(BigInteger set_size) { * @return an element in Z_q which is a hash of the given messages. * */ - public static BigInteger secureHash(BigInteger[] msg, BigInteger size_set_secureHash) - throws GeneralSecurityException { + public static BigInteger secureHash(BigInteger[] msg, BigInteger q) + throws GeneralSecurityException { MessageDigest md = MessageDigest.getInstance("SHA-512"); - final int HASH_LENGTH = md.getDigestLength(); + final int HASH_LENGTH = md.getDigestLength(); // The length of the hash in bytes - int k = size_set_secureHash.bitLength()+1; + int k = q.bitLength()+1; // The required length of output in bits - - int nRounds = k/(HASH_LENGTH*8+close_t_uniform_q_minus_1)+1; + + int nRounds = k/(HASH_LENGTH*8+t)+1; byte[] hash = new byte[HASH_LENGTH*nRounds]; - + for(int i = 0; i < nRounds; i++) { md.reset(); for(int j = 0; j < msg.length; j++) md.update(msg[j].toByteArray()); // hash all the messages - + md.update((byte)i); // Also include the current index md.digest(hash, i*HASH_LENGTH, HASH_LENGTH); } - + // Now we got all the bits. Make a BigInteger out of it: - return new BigInteger(hash).mod(size_set_secureHash); + return new BigInteger(hash).mod(q); } - + /** * Converts a short into its little-endian byte string representation. @@ -119,7 +118,7 @@ public static void bytesFromShort(byte[] array, int offset, short value) { array[offset+0] = (byte) ((value>>0)&0xFF); array[offset+1] = (byte) ((value>>8)&0xFF); } - + /** * Converts an int into its little-endian byte string representation. * @@ -133,7 +132,7 @@ public static void bytesFromInt(byte[] array, int offset, int value) { array[offset+2] = (byte) ((value>>16)&0xFF); array[offset+3] = (byte) ((value>>24)&0xFF); } - + /** * Converts an int into its little-endian byte string representation, and * return an array containing it. @@ -146,7 +145,7 @@ public static byte[] bytesFromInt(int value) { bytesFromInt(array, 0, value); return array; } - + /** * Converts an int into a little-endian byte string representation of the * specified length. @@ -159,17 +158,17 @@ public static byte[] bytesFromInt(int value) { public static void bytesFromInt(byte[] array, int offset, int length, int value) { assert(length==1 || length==2 || length==4); - + switch (length) { - case 1: - array[offset] = (byte) value; - break; - case 2: - bytesFromShort(array, offset, (short) value); - break; - case 4: - bytesFromInt(array, offset, value); - break; + case 1: + array[offset] = (byte) value; + break; + case 2: + bytesFromShort(array, offset, (short) value); + break; + case 4: + bytesFromInt(array, offset, value); + break; } } @@ -202,9 +201,9 @@ public static void bytesFromLong(byte[] array, int offset, long value) { */ public static short bytesToShort(byte[] array, int offset) { return (short) ((((short) array[offset+0] & 0xFF) << 0) | - (((short) array[offset+1] & 0xFF) << 8)); + (((short) array[offset+1] & 0xFF) << 8)); } - + /** * Converts to an unsigned short from its little-endian byte string * representation. @@ -216,7 +215,7 @@ public static short bytesToShort(byte[] array, int offset) { public static int bytesToUnsignedShort(byte[] array, int offset) { return (((int) bytesToShort(array, offset)) & 0xFFFF); } - + /** * Converts to an int from its little-endian byte string representation. * @@ -226,11 +225,11 @@ public static int bytesToUnsignedShort(byte[] array, int offset) { */ public static int bytesToInt(byte[] array, int offset) { return (int) ((((int) array[offset+0] & 0xFF) << 0) | - (((int) array[offset+1] & 0xFF) << 8) | - (((int) array[offset+2] & 0xFF) << 16) | - (((int) array[offset+3] & 0xFF) << 24)); + (((int) array[offset+1] & 0xFF) << 8) | + (((int) array[offset+2] & 0xFF) << 16) | + (((int) array[offset+3] & 0xFF) << 24)); } - + /** * Converts to an int from a little-endian byte string representation of the * specified length. @@ -242,16 +241,16 @@ public static int bytesToInt(byte[] array, int offset) { */ public static int bytesToInt(byte[] array, int offset, int length) { assert(length==1 || length==2 || length==4); - + switch (length) { - case 1: - return array[offset]; - case 2: - return bytesToShort(array, offset); - case 4: - return bytesToInt(array, offset); - default: - return -1; + case 1: + return array[offset]; + case 2: + return bytesToShort(array, offset); + case 4: + return bytesToInt(array, offset); + default: + return -1; } } @@ -270,11 +269,11 @@ public static String bytesToString(byte[] array, int offset, int length) { if (array[offset+i] == 0) break; } - + return new String(array, offset, i); } - - /** + + /** * Masks out and shifts a bit substring. * * @param bits the bit string. @@ -288,8 +287,8 @@ public static int extract(int bits, int lowest, int size) { else return ((bits >> lowest) & ((1<> lowest) & ((1L<> extra); } - - /** + + /** * Tests if a bit is set in a bit string. * * @param flag the flag to test. @@ -338,7 +337,7 @@ public static boolean test(long flag, long bits) { public static String toHexString(int i) { return toHexString(i, 8); } - + /** * Creates a padded upper-case string representation of the integer * argument in base 16, padding to at most the specified number of digits. @@ -364,8 +363,8 @@ public static String toHexString(int i, int pad) { */ public static int divRoundUp(int a, int b) { assert(a >= 0 && b > 0); - - return ((a + (b-1)) / b); + + return ((a + (b-1)) / b); } /** @@ -374,37 +373,37 @@ public static int divRoundUp(int a, int b) { * @param v1 one vector * @param v2 another vector * @return inner product of v1 and v2 - * @throws IllegalArgumentException if the dimesionalities of the two + * @throws IllegalArgumentException if the dimesionalities of the two * vectors do not match. */ - + public static long innerProduct(long[] v1, long[] v2) { - if(v1.length != v2.length) + if(v1.length != v2.length) throw new IllegalArgumentException("dimesionalities do not match!"); - long s = 0; + long s = 0; for(int i = 0; i < v1.length; i++) s += v1[i]*v2[i]; - + return s; } - + /** * Computes the inner product of one integer array and one long array. * * @param v1 the integer vector * @param v2 the long vector * @return inner product of v1 and v2 - * @throws RuntimeException if the dimesionalities of the two vectors do + * @throws RuntimeException if the dimesionalities of the two vectors do * not match. */ public static long innerProduct(int[] v1, long[] v2) { - if(v1.length != v2.length) + if(v1.length != v2.length) throw new RuntimeException("dimesionalities do not match!"); - long s = 0; + long s = 0; for(int i = 0; i < v1.length; i++) s += v1[i]*v2[i]; - + return s; } @@ -415,31 +414,31 @@ public static long innerProduct(int[] v1, long[] v2) { * @param v1 one double vector * @param v2 the other double vector * @return inner product of v1 and v2 - * @throws RuntimeException if the dimesionalities of the two vectors do + * @throws RuntimeException if the dimesionalities of the two vectors do * not match. */ public static double innerProduct(double[] v1, double[] v2) { - if(v1.length != v2.length) + if(v1.length != v2.length) throw new RuntimeException("dimesionalities do not match!"); double s = 0; for(int i = 0; i < v1.length; i++) s += v1[i]*v2[i]; - + return s; } /** - * A java and simplified version of daxpy, constant times a vector plus a - * vector. Unlike its BLAS counterpart, it does NOT use unrolled loop. This + * A java and simplified version of daxpy, constant times a vector plus a + * vector. Unlike its BLAS counterpart, it does NOT use unrolled loop. This * function is for verifying the computation. NO optimization is done. - * + * * * This function does * * y = a*x + y * - * where a is a scaler and x, y are vectors. + * where a is a scaler and x, y are vectors. * */ public static void laxpy(long a, long[] x, long[] y) { @@ -456,80 +455,73 @@ public static void laxpy(double a, double[] x, double[] y) { /** - * Returns a number whose value is between [-m/2, m/2) and differs + * Returns a number whose value is between [-m/2, m/2) and differs * from data by a multiple of m. * - * @param data_long_integer_mod a long integer. - * @param modulus the modulus. + * @param data a long integer. + * @param m the modulus. * @return a number between [-m/2, m/2) that differs from data by a multiple of m. */ - public static long mod(long data_long_integer_mod, long modulus) { - long mod_result_long = data_long_integer_mod % modulus; - if(mod_result_long < 0){ - mod_result_long += modulus; - } - - - double upperBound = Math.floor((double)modulus/2.); - if(mod_result_long >= Math.floor((double)modulus/2.)){ - mod_result_long -= modulus; - } - - return mod_result_long; + public static long mod(long data, long m) { + long r = data%m; + if(r < 0) r += m; + if(r >= Math.floor((double)m/2.)) + r -= m; + return r; } /** - * Converts the integers in the given array data into double - * precision floating point numbers. The integers should be between + * Converts the integers in the given array data into double + * precision floating point numbers. The integers should be between * * [-floor(F/2), floor(F/2)] if F is odd * [-floor(F/2), floor(F/2)-1] if F is even - * + * * and the real numbers will be between [-R, R]. *

- * This provides a mapping between the finite field [-F/2, F/2] where our - * P4P computations are performed and the field of real numbers where many + * This provides a mapping between the finite field [-F/2, F/2] where our + * P4P computations are performed and the field of real numbers where many * applications run. * * @param data the array of longs to be converted * @param offset starting position in the array * @param len then number of elements to be cpnverted. - * @param F the size of the finite field where private P4P + * @param F the size of the finite field where private P4P * computation is carried out - * @param R the maximum value of the floating point number that + * @param R the maximum value of the floating point number that * the system supports. * @return an array of doubles between [-R, R]. */ - public static double[] itor(long[] data, int offset, int len, long F, + public static double[] itor(long[] data, int offset, int len, long F, double R) { double [] v = new double[len]; - + double alpha = 2.d*R/F; for(int i = 0; i < len; i++) v[i] = (double)data[offset+i]*alpha; - + return v; } /** - * Converts the integers in the given array data into double - * precision floating point numbers. The integers should be between + * Converts the integers in the given array data into double + * precision floating point numbers. The integers should be between * * [-floor(F/2), floor(F/2)] if F is odd * [-floor(F/2), floor(F/2)-1] if F is even - * + * * and the real numbers will be between [-R, R]. *

- * This provides a mapping between the finite field [-F/2, F/2] where our - * P4P computations are performed and the field of real numbers where many + * This provides a mapping between the finite field [-F/2, F/2] where our + * P4P computations are performed and the field of real numbers where many * applications run. * * @param data the array of longs to be converted - * @param F the size of the finite field where private P4P + * @param F the size of the finite field where private P4P * computation is carried out - * @param R the maximum value of the floating point number that + * @param R the maximum value of the floating point number that * the system supports. * @return an array of doubles between [-R, R]. */ @@ -537,53 +529,53 @@ public static double[] itor(long[] data, long F, double R) { return itor(data, 0, data.length, F, R); /* double [] v = new double[data.length]; - + double alpha = 2.d*R/F; for(int i = 0; i < data.length; i++) v[i] = (double)data[i]*alpha; - + return v; */ } /** - * Converts the integers in the given array data into double - * precision floating point numbers. The integers should be between + * Converts the integers in the given array data into double + * precision floating point numbers. The integers should be between * * [-floor(F/2), floor(F/2)] if F is odd * [-floor(F/2), floor(F/2)-1] if F is even - * + * * and the real numbers will be between [-R, R]. *

- * This provides a mapping between the finite field [-F/2, F/2] where our - * P4P computations are performed and the field of real numbers where many + * This provides a mapping between the finite field [-F/2, F/2] where our + * P4P computations are performed and the field of real numbers where many * applications run. * * @param data the array of longs to be converted - * @param F the size of the finite field where private P4P + * @param F the size of the finite field where private P4P * computation is carried out - * @param R the maximum value of the floating point number that + * @param R the maximum value of the floating point number that * the system supports. * @return an array of doubles between [-R, R]. */ public static double[][] itor(long[][] data, long F, double R) { double [][] v = new double[data.length][data[0].length]; - + for(int i = 0; i < data.length; i++) v[i] = Util.itor(data[i], F, R); - + return v; } /** - * Converts the double precision floating point numbers in the given array - * data into integers field. The integers should be between + * Converts the double precision floating point numbers in the given array + * data into integers field. The integers should be between * * [-floor(F/2), floor(F/2)] if F is odd * [-floor(F/2), floor(F/2)-1] if F is even - * + * * and the real numbers will be between [-R, R]. *

* This provides a mapping between the finite field [-F/2, F/2] where our @@ -593,40 +585,40 @@ public static double[][] itor(long[][] data, long F, double R) { * @param data the array of doubles to be converted * @param offset starting position in the array * @param len then number of elements to be cpnverted. - * @param F the size of the finite field where private P4P + * @param F the size of the finite field where private P4P * computation is carried out - * @param R the maximum value of the floating point number that + * @param R the maximum value of the floating point number that * the system supports. * @return an array of integers between [-F/2, F/2). */ - public static long[] rtoi(double[] data, int offset, int len, long F, + public static long[] rtoi(double[] data, int offset, int len, long F, double R) { long [] v = new long[len]; - + double alpha = 2.d*R/F; for(int i = 0; i < len; i++) v[i] = Math.round(data[i+offset]/alpha); - + return v; } /** - * Converts the double precision floating point numbers in the given array - * data into integers field. The integers should be between + * Converts the double precision floating point numbers in the given array + * data into integers field. The integers should be between * * [-floor(F/2), floor(F/2)] if F is odd * [-floor(F/2), floor(F/2)-1] if F is even - * + * * and the real numbers will be between [-R, R]. *

- * This provides a mapping between the finite field [-F/2, F/2] where our + * This provides a mapping between the finite field [-F/2, F/2] where our * P4P computations are performed and the field of real numbers where many * applications run. * * @param data the array of doubles to be converted - * @param F the size of the finite field where private P4P + * @param F the size of the finite field where private P4P * computation is carried out - * @param R the maximum value of the floating point number that + * @param R the maximum value of the floating point number that * the system supports. * @return an array of integers between [-F/2, F/2). */ @@ -634,22 +626,22 @@ public static long[] rtoi(double[] data, long F, double R) { return rtoi(data, 0, data.length, F, R); /* long [] v = new long[data.length]; - + double alpha = 2.d*R/F; for(int i = 0; i < data.length; i++) v[i] = Math.round(data[i]/alpha); - + return v; */ } /** - * Converts the double precision floating point numbers in the given array - * data into integers field. The integers should be between + * Converts the double precision floating point numbers in the given array + * data into integers field. The integers should be between * * [-floor(F/2), floor(F/2)] if F is odd * [-floor(F/2), floor(F/2)-1] if F is even - * + * * and the real numbers will be between [-R, R]. *

* This provides a mapping between the finite field [-F/2, F/2] where our @@ -657,42 +649,42 @@ public static long[] rtoi(double[] data, long F, double R) { * applications run. * * @param data the array of doubles to be converted - * @param F the size of the finite field where private P4P + * @param F the size of the finite field where private P4P * computation is carried out - * @param R the maximum value of the floating point number that + * @param R the maximum value of the floating point number that * the system supports. * @return an array of integers of length len between [-F/2, F/2). */ public static long[][] rtoi(double[][] data, long F, double R) { long [][] v = new long[data.length][data[0].length]; - + for(int i = 0; i < data.length; i++) v[i] = Util.rtoi(data[i], F, R); - + return v; } - + /** * Returns the minimum value in the given double array. * - * @param data the array of doubles + * @param data the array of doubles * @return the minimum value in data */ public static double min(double[] data) { - double min = Double.MAX_VALUE; + double min = Double.MAX_VALUE; for(int i = 0; i < data.length; i++) min = min > data[i] ? data[i] : min; return min; } - + /** * Returns the maximum value in the given double array. * - * @param data the array of doubles + * @param data the array of doubles * @return the maximum value in data */ public static double max(double[] data) { - double max = Double.MIN_VALUE; + double max = Double.MIN_VALUE; for(int i = 0; i < data.length; i++) max = max < data[i] ? data[i] : max; return max; @@ -701,29 +693,29 @@ public static double max(double[] data) { /** * Returns the maximum value in the given double array. * - * @param data the array of doubles + * @param data the array of doubles * @return the maximum value in data */ public static double max(double[][] data) { - double max = Double.MIN_VALUE; + double max = Double.MIN_VALUE; for(int i = 0; i < data.length; i++) { double mx = Util.max(data[i]); max = max < mx ? mx : max; } return max; } - + /** * Returns the maximum absolute value in the given double array. * - * @param data_array_double the array of doubles + * @param data the array of doubles * @return the maximum absolute value in data */ - public static double maxAbs(double[] data_array_double) { - return maxAbs(data_array_double, 0, data_array_double.length); + public static double maxAbs(double[] data) { + return maxAbs(data, 0, data.length); /* - double max = 0.; + double max = 0.; for(int i = 0; i < data.length; i++) { double mx = Math.abs(data[i]); max = max < mx ? mx : max; @@ -736,151 +728,146 @@ public static double maxAbs(double[] data_array_double) { /** * Returns the maximum absolute value in the given long array. * - * @param data the array of longs + * @param data the array of longs * @return the maximum absolute value in data */ public static long maxAbs(long[] data) { // return maxAbs(data, 0, data.length); - - long max = 0; + + long max = 0; for(int i = 0; i < data.length; i++) { long mx = (long)Math.abs(data[i]); max = max < mx ? mx : max; } return max; - + } - + /** * Returns the maximum absolute value in the given long array. * - * @param data the array of longs + * @param data the array of longs * @return the maximum absolute value in data */ public static long maxAbs(long[] data, int offset, int len) { - long max = 0; + long max = 0; for(int i = 0; i < len; i++) { long mx = (long)Math.abs(data[offset+i]); max = max < mx ? mx : max; } return max; } - + public static double maxAbs(double[] data, int offset, int len) { - double max = 0.; + double max = 0.; for(int i = 0; i < len; i++) { double mx = Math.abs(data[offset+i]); max = max < mx ? mx : max; } return max; } - + /** * Returns the maximum absolute value in the given double array. * - * @param data_array_double the array of doubles + * @param data the array of doubles * @return the maximum absolute value in data */ - public static double maxAbs(double[][] data_array_double) { - double max = 0.; - for(int i = 0; i < data_array_double.length; i++) { - double mx = Util.maxAbs(data_array_double[i]); + public static double maxAbs(double[][] data) { + double max = 0.; + for(int i = 0; i < data.length; i++) { + double mx = Util.maxAbs(data[i]); max = max < mx ? mx : max; } return max; } - + /** * Returns the maximum value in the given long array. * - * @param data_arrays_long the array of longs + * @param data the array of longs * @return the maximum value in data */ - public static long max(long[] data_arrays_long) { - long max = Long.MIN_VALUE; - for(int i = 0; i < data_arrays_long.length; i++) - max = max < data_arrays_long[i] ? data_arrays_long[i] : max; + public static long max(long[] data) { + long max = Long.MIN_VALUE; + for(int i = 0; i < data.length; i++) + max = max < data[i] ? data[i] : max; return max; } /** * Generates a random vector in Z_F with approximately the given L2-norm. * The algorithm is as follows: first a random m-dimensional vector over - * Z_F is generated by selecting each elements randomly from Z_F. The - * vector is then scaled to the desired length, rounding each element to - * the nearest long. Note that Z_F is defined as + * Z_F is generated by selecting each elements randomly from Z_F. The + * vector is then scaled to the desired length, rounding each element to + * the nearest long. Note that Z_F is defined as * * [-floor(F/2), floor(F/2)] if F is odd - * [-floor(F/2), floor(F/2)-1] if F is even + * [-floor(F/2), floor(F/2)-1] if F is even * - * - * NOTE: - * F is to big. A random vector generated this way is so big + * + * NOTE: + * F is to big. A random vector generated this way is so big * that the scaling factor is essentially 0, resulting in a zero - * vector. Instead, we restrict each element between [-L, L]. We + * vector. Instead, we restrict each element between [-L, L]. We * are choosing from a set with (2L)^m elements, instead of F^m, - * where L is chosen to be 1000. This function is only for test. - * Should be OK. - * @param dimension the dimensionality of the vector - * @param Z_F_order_of_Group_Util the order of the group Z_F - * @param l2_norm_5dot49755813888E11 the desired l2-norm of the vector. If it is 0, then a random + * where L is chosen to be 1000. This function is only for test. + * Should be OK. + * @param m the dimensionality of the vector + * @param F the order of the group Z_F + * @param l2 the desired l2-norm of the vector. If it is 0, then a random * vector in (Z_F)^m is generated. * @return a random vector over Z_F L2-norm equal l2 */ -// order of Z_F - public static long[] randVector(int dimension, long Z_F_order_of_Group_Util_RandV_long, double l2_norm_5dot49_Util_randVector) { - long[] data_Util_randVector = new long[dimension]; + + public static long[] randVector(int m, long F, double l2) { + long[] data = new long[m]; BigInteger bigF = null; - if(l2_norm_5dot49_Util_randVector <=0){ - bigF = new BigInteger(Long.toString(Z_F_order_of_Group_Util_RandV_long)); - } - double myL2_square = 0.; - int L_10000 = 10000; - int[] l2_positive_counter_for_10_dimension = new int[2]; - for(int dimension_id = 0; dimension_id < dimension; dimension_id++) { - if(l2_norm_5dot49_Util_randVector > 0) { - data_Util_randVector[dimension_id] = rand.nextInt(2*L_10000+1)-L_10000; - myL2_square += (double)((double)data_Util_randVector[dimension_id]*(double)data_Util_randVector[dimension_id]); - l2_positive_counter_for_10_dimension[0]++; + if(l2 <=0) bigF = new BigInteger(Long.toString(F)); + double myL2 = 0.; + int L = 10000; + for(int i = 0; i < m; i++) { + if(l2 > 0) { + /** + * NOTE: F is to big. A random vector generated this way is so + * big that the scaling factor is essentially 0, resulting in a + * zero vector. Instead, we restrict each element between + * [-L, L]. We are choosing from a set with (2L)^m elements, + * instead of F^m. This function is only for testing. Should be + * OK. + */ + data[i] = rand.nextInt(2*L+1)-L; + myL2 += (double)((double)data[i]*(double)data[i]); + /** + * Let dmax = Double.MAX_VALUE = 1.7976931348623157E308 and + * lmax = Long.MAX_VALUE = 9223372036854775807L. The maximum + * L2-norm of data can be m*(lmax*lmax) = 8.5071e+037. Using a + * double to hold the value, m can be as large as 2.1132e+270. + * More than enough for our purpose and no overflow would + * happen. + */ } else { - data_Util_randVector[dimension_id] = randomBigInteger(bigF).longValue(); + data[i] = randomBigInteger(bigF).longValue(); // A random long in [0, F-1] - data_Util_randVector[dimension_id] -= Math.floor((double) Z_F_order_of_Group_Util_RandV_long / 2.); + data[i] -= Math.floor((double)F/2.); // Shift to Z_F - l2_positive_counter_for_10_dimension[1]++; } } - System.out.println("l2_positive_counter_for_10_dimension: " + Arrays.toString(l2_positive_counter_for_10_dimension)); - - System.out.println("data_Util_randVector: "+ Arrays.toString(data_Util_randVector)); - - - - - if(l2_norm_5dot49_Util_randVector > 0) { - double myL2_SQRT = Math.sqrt(myL2_square); - double scale_Util_randV = l2_norm_5dot49_Util_randVector/myL2_SQRT; - for(int i = 0; i < dimension; i++) { - long data_half_M_scale = 0; - long data_ADD_half = (long)(((double)data_Util_randVector[i]+0.5)*scale_Util_randV); - long data_MINUS_half = (long)(((double)data_Util_randVector[i]-0.5)*scale_Util_randV); - if(data_Util_randVector[i] > 0) { - data_half_M_scale = data_ADD_half; - data_Util_randVector[i] = data_half_M_scale; - } - else{ - data_half_M_scale = data_MINUS_half; - data_Util_randVector[i] = data_half_M_scale; - } + if(l2 > 0) { + myL2 = Math.sqrt(myL2); + double scale = l2/myL2; + for(int i = 0; i < m; i++) { + if(data[i] > 0) data[i] = (long)(((double)data[i]+0.5)*scale); + else data[i] = (long)(((double)data[i]-0.5)*scale); // Round to the closest long } } - return data_Util_randVector; + return data; } @@ -888,23 +875,23 @@ public static long[] randVector(int dimension, long Z_F_order_of_Group_Util_Rand * Adds two vectors in the field Z_F. * @param v1 one vector * @param v2 the other vector - * @param vector_sum the vector where the resulting v1+v2 should + * @param s the vector where the resulting v1+v2 should * be stored. - * @param group_order_F_Util the order of the group Z_F - * @throws IllegalArgumentException if the dimesionalities of the + * @param F the order of the group Z_F + * @throws IllegalArgumentException if the dimesionalities of the * vectors do not match. */ - public static void vectorAdd(long[] v1, long[] v2, long[] vector_sum, long group_order_F_Util) { - int vector_dimension = vector_sum.length; // dimensionality of vector - if(v1.length != vector_dimension || v2.length != vector_dimension) + public static void vectorAdd(long[] v1, long[] v2, long[] s, long F) { + int m = s.length; + if(v1.length != m || v2.length != m) throw new IllegalArgumentException("dimesionalities do not match!"); - for(int dimension_id = 0; dimension_id < vector_dimension; dimension_id++) { - // Assuming F is at least a few bits less than a long, a single + for(int j = 0; j < m; j++) { + // Assuming F is at least a few bits less than a long, a single // addition won't cause overflow. So we can do mod afterwards. - // But we do need to do mod once for a few additions since the - // shares can be any number in Z_F. - vector_sum[dimension_id] = mod(v1[dimension_id] + v2[dimension_id], group_order_F_Util); + // But we do need to do mod once for a few additions since the + // shares can be any number in Z_F. + s[j] = mod(v1[j] + v2[j], F); } } }