Use latest DeDiS Advanced Crypto Library for Go

seancomeau · Jul 24, 2016 · 0aeac52 · 0aeac52
1 parent 888f65a
commit 0aeac52
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/client/client.go b/client/client.go
@@ -188,7 +188,7 @@ func (c *Client) UploadKeys(idx int) {
 	rand := c.suite.Cipher(abstract.RandomKey)
 	keyPts := make([]abstract.Point, len(c.servers))
 	for i := range keyPts {
-		secret := c.g.Secret().Pick(rand)
+		secret := c.g.Scalar().Pick(rand)
 		public := c.g.Point().Mul(gen, secret)
 		keyPts[i] = public
 		c.keys[i] = MarshalPoint(public)
@@ -224,8 +224,8 @@ func (c *Client) UploadKeys(idx int) {
 func (c *Client) ShareSecret() {
 	gen := c.g.Point().Base()
 	rand := c.suite.Cipher(abstract.RandomKey)
-	secret1 := c.g.Secret().Pick(rand)
-	secret2 := c.g.Secret().Pick(rand)
+	secret1 := c.g.Scalar().Pick(rand)
+	secret2 := c.g.Scalar().Pick(rand)
 	public1 := c.g.Point().Mul(gen, secret1)
 	public2 := c.g.Point().Mul(gen, secret2)
 

diff --git a/lib/utils.go b/lib/utils.go
@@ -93,7 +93,7 @@ func Encrypt(g abstract.Group, msg []byte, pks []abstract.Point) ([]abstract.Poi
 	remainder := msg
 	for ; len(remainder) != 0 ;  {
 		msgPt, remainder = g.Point().Pick(remainder, random.Stream)
-		k := g.Secret().Pick(random.Stream)
+		k := g.Scalar().Pick(random.Stream)
 		c1 := g.Point().Mul(nil, k)
 		var c2 abstract.Point = nil
 		for _, pk := range pks {
@@ -111,7 +111,7 @@ func Encrypt(g abstract.Group, msg []byte, pks []abstract.Point) ([]abstract.Poi
 }
 
 func EncryptKey(g abstract.Group, msgPt abstract.Point, pks []abstract.Point) (abstract.Point, abstract.Point) {
-	k := g.Secret().Pick(random.Stream)
+	k := g.Scalar().Pick(random.Stream)
 	c1 := g.Point().Mul(nil, k)
 	var c2 abstract.Point = nil
 	for _, pk := range pks {
@@ -126,14 +126,14 @@ func EncryptKey(g abstract.Group, msgPt abstract.Point, pks []abstract.Point) (a
 }
 
 func EncryptPoint(g abstract.Group, msgPt abstract.Point, pk abstract.Point) (abstract.Point, abstract.Point) {
-	k := g.Secret().Pick(random.Stream)
+	k := g.Scalar().Pick(random.Stream)
 	c1 := g.Point().Mul(nil, k)
 	c2 := g.Point().Mul(pk, k)
 	c2 = c2.Add(c2, msgPt)
 	return c1, c2
 }
 
-func Decrypt(g abstract.Group, c1 abstract.Point, c2 abstract.Point, sk abstract.Secret) abstract.Point {
+func Decrypt(g abstract.Group, c1 abstract.Point, c2 abstract.Point, sk abstract.Scalar) abstract.Point {
 	return g.Point().Sub(c2, g.Point().Mul(c1, sk))
 }
 

diff --git a/server/server.go b/server/server.go
@@ -50,13 +50,13 @@ type Server struct {
 	//crypto
 	suite      abstract.Suite
 	g          abstract.Group
-	sk         abstract.Secret //secret and public elgamal key
+	sk         abstract.Scalar //secret and public elgamal key
 	pk         abstract.Point
 	pkBin      []byte
 	pks        []abstract.Point //all servers pks
 	nextPks    []abstract.Point
 	nextPksBin [][]byte
-	ephSecret  abstract.Secret
+	ephSecret  abstract.Scalar
 
 	//used during key shuffle
 	pi             []int
@@ -108,10 +108,10 @@ type Round struct {
 func NewServer(port1 int, port2 int, id int, servers []string, FSMode bool) *Server {
 	suite := edwards.NewAES128SHA256Ed25519(false)
 	rand := suite.Cipher(abstract.RandomKey)
-	sk := suite.Secret().Pick(rand)
+	sk := suite.Scalar().Pick(rand)
 	pk := suite.Point().Mul(nil, sk)
 	pkBin := MarshalPoint(pk)
-	ephSecret := suite.Secret().Pick(rand)
+	ephSecret := suite.Scalar().Pick(rand)
 
 	rounds := make([]*Round, MaxRounds)
 
@@ -475,7 +475,7 @@ func (s *Server) shuffleKeys(_ uint64) {
 			rand := s.suite.Cipher(abstract.RandomKey)
 			var prover proof.Prover
 			var err error
-			Xbarss[i], Ybarss[i], prover = shuffle.Shuffle2(s.pi, s.g, nil, pk, Xss[i], Yss[i], rand)
+			Xbarss[i], Ybarss[i], prover = shuffle.Shuffle(s.g, nil, pk, Xss[i], Yss[i], rand)
 			prfs[i], err = proof.HashProve(s.suite, "PairShuffle", rand, prover)
 			if err != nil {
 				log.Fatal("Shuffle proof failed: " + err.Error())
@@ -704,7 +704,7 @@ func (s *Server) shareSecret(clientPublic abstract.Point) (abstract.Point, abstr
 	s.secretLock.Lock()
 	rand := s.suite.Cipher(abstract.RandomKey)
 	gen := s.g.Point().Base()
-	secret := s.g.Secret().Pick(rand)
+	secret := s.g.Scalar().Pick(rand)
 	public := s.g.Point().Mul(gen, secret)
 	sharedSecret := s.g.Point().Mul(clientPublic, secret)
 	s.secretLock.Unlock()