Change TaggingDet function in order to correct functionning.

ldsec · May 2, 2018 · 2d111f2 · 2d111f2
1 parent 0c05ac8
commit 2d111f2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/lib/proofs/aggregation_proofs_test.go b/lib/proofs/aggregation_proofs_test.go
@@ -19,22 +19,22 @@ func TestAggregationProof(t *testing.T) {
 	det2 := testCipherVect1
 	det3 := testCipherVect2
 
-	protocolsunlynx.TaggingDet(det1, secKey, secKey, pubKey, true)
+	protocolsunlynx.TaggingDet(&det1, secKey, secKey, pubKey, true)
 	deterministicGroupAttributes := make(libunlynx.DeterministCipherVector, len(det1))
 	for j, c := range det1 {
 		deterministicGroupAttributes[j] = libunlynx.DeterministCipherText{Point: c.C}
 	}
 	newDetResponse1 := libunlynx.FilteredResponseDet{Fr: libunlynx.FilteredResponse{GroupByEnc: testCipherVect2, AggregatingAttributes: testCipherVect1}, DetTagGroupBy: deterministicGroupAttributes.Key()}
 
-	protocolsunlynx.TaggingDet(det2, secKey, secKey, pubKey, true)
+	protocolsunlynx.TaggingDet(&det2, secKey, secKey, pubKey, true)
 
 	deterministicGroupAttributes = make(libunlynx.DeterministCipherVector, len(det2))
 	for j, c := range det2 {
 		deterministicGroupAttributes[j] = libunlynx.DeterministCipherText{Point: c.C}
 	}
 	newDetResponse2 := libunlynx.FilteredResponseDet{Fr: libunlynx.FilteredResponse{GroupByEnc: testCipherVect1, AggregatingAttributes: testCipherVect1}, DetTagGroupBy: deterministicGroupAttributes.Key()}
 
-	protocolsunlynx.TaggingDet(det3, secKey, secKey, pubKey, true)
+	protocolsunlynx.TaggingDet(&det3, secKey, secKey, pubKey, true)
 	deterministicGroupAttributes = make(libunlynx.DeterministCipherVector, len(det3))
 	for j, c := range det3 {
 		deterministicGroupAttributes[j] = libunlynx.DeterministCipherText{Point: c.C}

diff --git a/lib/proofs/collective_aggregation_proofs_test.go b/lib/proofs/collective_aggregation_proofs_test.go
@@ -19,22 +19,22 @@ func TestCollectiveAggregationProof(t *testing.T) {
 	det2 := testCipherVect1
 	det3 := testCipherVect2
 
-	protocolsunlynx.TaggingDet(det1, secKey, secKey, pubKey, true)
+	protocolsunlynx.TaggingDet(&det1, secKey, secKey, pubKey, true)
 	deterministicGroupAttributes := make(libunlynx.DeterministCipherVector, len(det1))
 	for j, c := range det1 {
 		deterministicGroupAttributes[j] = libunlynx.DeterministCipherText{Point: c.C}
 	}
 	newDetResponse1 := libunlynx.FilteredResponseDet{Fr: libunlynx.FilteredResponse{GroupByEnc: testCipherVect2, AggregatingAttributes: testCipherVect1}, DetTagGroupBy: deterministicGroupAttributes.Key()}
 
-	protocolsunlynx.TaggingDet(det2, secKey, secKey, pubKey, true)
+	protocolsunlynx.TaggingDet(&det2, secKey, secKey, pubKey, true)
 
 	deterministicGroupAttributes = make(libunlynx.DeterministCipherVector, len(det2))
 	for j, c := range det2 {
 		deterministicGroupAttributes[j] = libunlynx.DeterministCipherText{Point: c.C}
 	}
 	newDetResponse2 := libunlynx.FilteredResponseDet{Fr: libunlynx.FilteredResponse{GroupByEnc: testCipherVect1, AggregatingAttributes: testCipherVect1}, DetTagGroupBy: deterministicGroupAttributes.Key()}
 
-	protocolsunlynx.TaggingDet(det3, secKey, secKey, pubKey, true)
+	protocolsunlynx.TaggingDet(&det3, secKey, secKey, pubKey, true)
 	deterministicGroupAttributes = make(libunlynx.DeterministCipherVector, len(det3))
 	for j, c := range det3 {
 		deterministicGroupAttributes[j] = libunlynx.DeterministCipherText{Point: c.C}

diff --git a/protocols/deterministic_tagging_protocol.go b/protocols/deterministic_tagging_protocol.go
@@ -212,13 +212,13 @@ func (p *DeterministicTaggingProtocol) Dispatch() error {
 					j = len(deterministicTaggingTarget.Data)
 				}
 				tmp := deterministicTaggingTarget.Data[i:j]
-				TaggingDet(tmp, p.Private(), *p.SurveySecretKey, p.Public(), p.Proofs)
+				TaggingDet(&tmp, p.Private(), *p.SurveySecretKey, p.Public(), p.Proofs)
 				copy(deterministicTaggingTarget.Data[i:j], tmp)
 			}(i)
 		}
 		wg.Wait()
 	} else {
-		TaggingDet(deterministicTaggingTarget.Data, p.Private(), *p.SurveySecretKey, p.Public(), p.Proofs)
+		TaggingDet(&deterministicTaggingTarget.Data, p.Private(), *p.SurveySecretKey, p.Public(), p.Proofs)
 	}
 
 	var TaggedData []libunlynx.DeterministCipherText
@@ -269,24 +269,24 @@ func sendingDet(p DeterministicTaggingProtocol, detTarget DeterministicTaggingMe
 }
 
 // TaggingDet performs one step in the distributed deterministic tagging process and creates corresponding proof
-func TaggingDet(cv libunlynx.CipherVector, privKey, secretContrib kyber.Scalar, pubKey kyber.Point, proofs bool) {
-	switchedVect := libunlynx.NewCipherVector(len(cv))
-	switchedVect.DeterministicTagging(&cv, privKey, secretContrib)
+func TaggingDet(cv *libunlynx.CipherVector, privKey, secretContrib kyber.Scalar, pubKey kyber.Point, proofs bool) {
+	switchedVect := libunlynx.NewCipherVector(len(*cv))
+	switchedVect.DeterministicTagging(cv, privKey, secretContrib)
 
 	if proofs {
-		p1 := libunlynxproofs.VectorDeterministicTagProofCreation(cv, *switchedVect, secretContrib, privKey)
+		p1 := libunlynxproofs.VectorDeterministicTagProofCreation(*cv, *switchedVect, secretContrib, privKey)
 		//proof publication
 		commitSecret := libunlynx.SuiTe.Point().Mul(secretContrib, libunlynx.SuiTe.Point().Base())
-		publishedProof := libunlynxproofs.PublishedDeterministicTaggingProof{Dhp: p1, VectBefore: cv, VectAfter: *switchedVect, K: pubKey, SB: commitSecret}
+		publishedProof := libunlynxproofs.PublishedDeterministicTaggingProof{Dhp: p1, VectBefore: *cv, VectAfter: *switchedVect, K: pubKey, SB: commitSecret}
 		_ = publishedProof
 	}
 
-	cv = *switchedVect
+	*cv = *switchedVect
 }
 
 // CipherVectorToDeterministicTag creates a tag (grouping key) from a cipher vector
 func CipherVectorToDeterministicTag(cipherVect libunlynx.CipherVector, privKey, secContrib kyber.Scalar, pubKey kyber.Point, proofs bool) libunlynx.GroupingKey {
-	TaggingDet(cipherVect, privKey, secContrib, pubKey, proofs)
+	TaggingDet(&cipherVect, privKey, secContrib, pubKey, proofs)
 	deterministicGroupAttributes := make(libunlynx.DeterministCipherVector, len(cipherVect))
 	for j, c := range cipherVect {
 		deterministicGroupAttributes[j] = libunlynx.DeterministCipherText{Point: c.C}

diff --git a/simul/local_aggregation_simul.go b/simul/local_aggregation_simul.go
@@ -87,7 +87,7 @@ func (sim *LocalAggregationSimulation) Run(config *onet.SimulationConfig) error
 			groupCipherVect = *tmp
 			cr := libunlynx.FilteredResponse{GroupByEnc: testCipherVect1, AggregatingAttributes: testCipherVect1}
 			det1 := groupCipherVect
-			protocolsunlynx.TaggingDet(det1, secKey, newSecKey, pubKey, sim.Proofs)
+			protocolsunlynx.TaggingDet(&det1, secKey, newSecKey, pubKey, sim.Proofs)
 
 			deterministicGroupAttributes := make(libunlynx.DeterministCipherVector, len(det1))
 			for j, c := range det1 {

diff --git a/simul/proofs_verification_simul.go b/simul/proofs_verification_simul.go
@@ -151,7 +151,7 @@ func (sim *ProofsVerificationSimulation) Run(config *onet.SimulationConfig) erro
 
 			cipherVectGr = *tmp
 			det1 := cipherVectGr
-			protocolsunlynx.TaggingDet(det1, secKey, secKey, pubKey, false)
+			protocolsunlynx.TaggingDet(&det1, secKey, secKey, pubKey, false)
 			deterministicGroupAttributes := make(libunlynx.DeterministCipherVector, len(det1))
 
 			for j, c := range det1 {