Merge pull request #7 from StableLib/fixes

extra25519: gofmt and update path to curve25519

extra25519/extra25519_test.go

@@ -9,8 +9,8 @@ import (
 	"crypto/rand"
 	"testing"
 
-	"code.google.com/p/go.crypto/curve25519"
 	"github.com/agl/ed25519"
+	"golang.org/x/crypto/curve25519"
 )
 
 func TestCurve25519Conversion(t *testing.T) {
@@ -52,7 +52,7 @@ func TestElligator(t *testing.T) {
 
 func BenchmarkKeyGeneration(b *testing.B) {
 	var publicKey, representative, privateKey [32]byte
-	
+
 	// Find the private key that results in a point that's in the image of the map.
 	for {
 		rand.Reader.Read(privateKey[:])
@@ -63,7 +63,7 @@ func BenchmarkKeyGeneration(b *testing.B) {
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		ScalarBaseMult(&publicKey, &representative, &privateKey);
+		ScalarBaseMult(&publicKey, &representative, &privateKey)
 	}
 }
 
@@ -73,6 +73,6 @@ func BenchmarkMap(b *testing.B) {
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		RepresentativeToPublicKey(&publicKey, &representative);
+		RepresentativeToPublicKey(&publicKey, &representative)
 	}
 }