From 88aa823cd04c9ebd1443175b097dd5ad7575c525 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Fri, 19 Apr 2019 12:22:32 -0400
Subject: [PATCH] internal/group: rename to internal/edwards25519

---
 .../{group/ge.go => edwards25519/edwards25519.go}  |  4 ++--
 ristretto255.go                                    | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename internal/{group/ge.go => edwards25519/edwards25519.go} (98%)

diff --git a/internal/group/ge.go b/internal/edwards25519/edwards25519.go
similarity index 98%
rename from internal/group/ge.go
rename to internal/edwards25519/edwards25519.go
index 812c42d..8c7bcde 100644
--- a/internal/group/ge.go
+++ b/internal/edwards25519/edwards25519.go
@@ -3,13 +3,13 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Package group implements group logic for the twisted Edwards curve
+// Package edwards25519 implements group logic for the twisted Edwards curve
 //
 //     -x^2 + y^2 = 1 + -(121665/121666)*x^2*y^2
 //
 // This is better known as the Edwards curve equivalent to curve25519, and is
 // the curve used by the Ed25519 signature scheme.
-package group
+package edwards25519
 
 import (
 	"math/big"
diff --git a/ristretto255.go b/ristretto255.go
index 12da86f..7a16a1b 100644
--- a/ristretto255.go
+++ b/ristretto255.go
@@ -8,7 +8,7 @@
 package ristretto255
 
 import (
-	"github.com/gtank/ristretto255/internal/group"
+	"github.com/gtank/ristretto255/internal/edwards25519"
 	"github.com/gtank/ristretto255/internal/radix51"
 )
 
@@ -27,7 +27,7 @@ var (
 
 // Element is an element of the ristretto255 prime-order group.
 type Element struct {
-	r group.ExtendedGroupElement
+	r edwards25519.ExtendedGroupElement
 }
 
 // Equal returns 1 if e is equivalent to ee, and 0 otherwise.
@@ -57,18 +57,18 @@ func (e *Element) FromUniformBytes(b []byte) {
 	f := &radix51.FieldElement{}
 
 	f.FromBytes(b[:32])
-	p1 := &group.ExtendedGroupElement{}
+	p1 := &edwards25519.ExtendedGroupElement{}
 	mapToPoint(p1, f)
 
 	f.FromBytes(b[32:])
-	p2 := &group.ExtendedGroupElement{}
+	p2 := &edwards25519.ExtendedGroupElement{}
 	mapToPoint(p2, f)
 
 	e.r.Add(p1, p2)
 }
 
 // mapToPoint implements MAP from Section 3.2.4 of draft-hdevalence-cfrg-ristretto-00.
-func mapToPoint(out *group.ExtendedGroupElement, t *radix51.FieldElement) {
+func mapToPoint(out *edwards25519.ExtendedGroupElement, t *radix51.FieldElement) {
 	// r = SQRT_M1 * t^2
 	r := &radix51.FieldElement{}
 	r.Mul(sqrtM1, r.Square(t))
@@ -83,9 +83,9 @@ func mapToPoint(out *group.ExtendedGroupElement, t *radix51.FieldElement) {
 
 	// v = (c - r*D) * (r + D)
 	rPlusD := &radix51.FieldElement{}
-	rPlusD.Add(r, group.D)
+	rPlusD.Add(r, edwards25519.D)
 	v := &radix51.FieldElement{}
-	v.Mul(v.Sub(c, v.Mul(r, group.D)), rPlusD)
+	v.Mul(v.Sub(c, v.Mul(r, edwards25519.D)), rPlusD)
 
 	// (was_square, s) = SQRT_RATIO_M1(u, v)
 	s := &radix51.FieldElement{}