Documentation improvements, code cleaned up #2

Merged
pdyraga merged 31 commits from master-with-bson into master 2018-06-05 19:08:37 -04:00
2 changed files with 0 additions and 21 deletions
Showing only changes of commit b715df420a - Show all commits

No files matched your search

-6
View File
@@ -118,7 +118,6 @@ func TestGenerateHidingPolynomial(t *testing.T) {
tkh.Random = rand.Reader tkh.Random = rand.Reader
if err := tkh.initNumerialValues(); err != nil { if err := tkh.initNumerialValues(); err != nil {
t.Error(err) t.Error(err)
return
} }
if err := tkh.generateHidingPolynomial(); err != nil { if err := tkh.generateHidingPolynomial(); err != nil {
t.Error(err) t.Error(err)
@@ -126,7 +125,6 @@ func TestGenerateHidingPolynomial(t *testing.T) {
p := tkh.polynomialCoefficients p := tkh.polynomialCoefficients
if len(p) != tkh.Threshold { if len(p) != tkh.Threshold {
t.Fail() t.Fail()
return
} }
if n(p[0]) != n(tkh.d) { if n(p[0]) != n(tkh.d) {
t.Fail() t.Fail()
@@ -159,11 +157,9 @@ func TestCreateShares(t *testing.T) {
tkh.Random = rand.Reader tkh.Random = rand.Reader
if err := tkh.initNumerialValues(); err != nil { if err := tkh.initNumerialValues(); err != nil {
t.Error(err) t.Error(err)
return
} }
if err := tkh.generateHidingPolynomial(); err != nil { if err := tkh.generateHidingPolynomial(); err != nil {
t.Error(err) t.Error(err)
return
} }
if shares := tkh.createShares(); len(shares) != 100 { if shares := tkh.createShares(); len(shares) != 100 {
@@ -223,7 +219,6 @@ func TestComputeV(t *testing.T) {
for i := 0; i < 100; i++ { for i := 0; i < 100; i++ {
if err := tkh.computeV(); err != nil { if err := tkh.computeV(); err != nil {
t.Error(err) t.Error(err)
return
} }
if tkh.v.Cmp(tkh.nSquare) > 0 { if tkh.v.Cmp(tkh.nSquare) > 0 {
t.Error("v is too big") t.Error("v is too big")
@@ -235,5 +230,4 @@ func TestComputeV(t *testing.T) {
t.Error(`v has never been bigger than n. It is suspicious in the sense< t.Error(`v has never been bigger than n. It is suspicious in the sense<
than it was taken in the range 0...n**2 -1 than it was taken in the range 0...n**2 -1
`) `)
} }
-15
View File
@@ -115,12 +115,10 @@ func TestDecryptAndProduceZNP(t *testing.T) {
c, err := pd.Encrypt(big.NewInt(876), rand.Reader) c, err := pd.Encrypt(big.NewInt(876), rand.Reader)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
znp, err := pd.DecryptAndProduceZNP(c.C, rand.Reader) znp, err := pd.DecryptAndProduceZNP(c.C, rand.Reader)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
if !znp.Verify() { if !znp.Verify() {
@@ -174,13 +172,11 @@ func TestEncryptingDecryptingSimple(t *testing.T) {
tpks, err := tkh.Generate() tpks, err := tkh.Generate()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
message := b(100) message := b(100)
c, err := tpks[1].Encrypt(message, rand.Reader) c, err := tpks[1].Encrypt(message, rand.Reader)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
share1 := tpks[0].Decrypt(c.C) share1 := tpks[0].Decrypt(c.C)
message2, err := tpks[0].CombinePartialDecryptions([]*PartialDecryption{share1}) message2, err := tpks[0].CombinePartialDecryptions([]*PartialDecryption{share1})
@@ -197,13 +193,11 @@ func TestEncryptingDecrypting(t *testing.T) {
tpks, err := tkh.Generate() tpks, err := tkh.Generate()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
message := b(100) message := b(100)
c, err := tpks[1].Encrypt(message, rand.Reader) c, err := tpks[1].Encrypt(message, rand.Reader)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
share1 := tpks[0].Decrypt(c.C) share1 := tpks[0].Decrypt(c.C)
share2 := tpks[1].Decrypt(c.C) share2 := tpks[1].Decrypt(c.C)
@@ -272,23 +266,19 @@ func TestCombinePartialDecryptionsZKP(t *testing.T) {
tpks, err := tkh.Generate() tpks, err := tkh.Generate()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
message := b(100) message := b(100)
c, err := tpks[1].Encrypt(message, rand.Reader) c, err := tpks[1].Encrypt(message, rand.Reader)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
share1, err := tpks[0].DecryptAndProduceZNP(c.C, rand.Reader) share1, err := tpks[0].DecryptAndProduceZNP(c.C, rand.Reader)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
share2, err := tpks[1].DecryptAndProduceZNP(c.C, rand.Reader) share2, err := tpks[1].DecryptAndProduceZNP(c.C, rand.Reader)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
message2, err := tpks[0].CombinePartialDecryptionsZKP([]*PartialDecryptionZKP{share1, share2}) message2, err := tpks[0].CombinePartialDecryptionsZKP([]*PartialDecryptionZKP{share1, share2})
if err != nil { if err != nil {
@@ -338,28 +328,23 @@ func TestVerifyDecryption(t *testing.T) {
pk := &tpks[0].ThresholdKey pk := &tpks[0].ThresholdKey
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
expt := b(101) expt := b(101)
cypher, err := tpks[0].Encrypt(expt, rand.Reader) cypher, err := tpks[0].Encrypt(expt, rand.Reader)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
pd1, err := tpks[0].DecryptAndProduceZNP(cypher.C, rand.Reader) pd1, err := tpks[0].DecryptAndProduceZNP(cypher.C, rand.Reader)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
pd2, err := tpks[1].DecryptAndProduceZNP(cypher.C, rand.Reader) pd2, err := tpks[1].DecryptAndProduceZNP(cypher.C, rand.Reader)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
pds := []*PartialDecryptionZKP{pd1, pd2} pds := []*PartialDecryptionZKP{pd1, pd2}
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return
} }
if err = pk.VerifyDecryption(cypher.C, b(101), pds); err != nil { if err = pk.VerifyDecryption(cypher.C, b(101), pds); err != nil {