src/scrypt.go: Rename XxxError to ErrXxx

2 files changed, 10 insertions, 10 deletions

diff --git a/src/scrypt.go b/src/scrypt.go
index 267cb08..8451467 100644
--- a/src/scrypt.go
+++ b/src/scrypt.go
@@ -30,9 +30,9 @@ const (
 
 
 var (
-	BadNError           = errors.New("scrypt: N must be > 1 and a power of 2")
-	ParamsTooLargeError = errors.New("scrypt: parameters are too large")
-	SaltTooSmallError   = errors.New("scrypt: salt is too small")
+	ErrBadN           = errors.New("scrypt: N must be > 1 and a power of 2")
+	ErrParamsTooLarge = errors.New("scrypt: parameters are too large")
+	ErrSaltTooSmall   = errors.New("scrypt: salt is too small")
 )
 
 
@@ -285,14 +285,14 @@ func smix(b []byte, r int, N int, v []uint32, xy []uint32) {
 
 func validateParams(N int, r int, p int) error {
 	if N <= 1 || N & (N - 1) != 0 {
-		return BadNError
+		return ErrBadN
 	}
 
 	if ((uint64(r) * uint64(p)) >= (1 << 30)) ||
 			r > maxInt / 128 / p ||
 			r > maxInt / 256 ||
 			N > maxInt / 128 / r {
-		return ParamsTooLargeError
+		return ErrParamsTooLarge
 	}
 
 	return nil
@@ -354,7 +354,7 @@ func SaltFrom(r io.Reader) ([]byte, error) {
 
 func HashFrom(password []byte, salt []byte) ([]byte, error) {
 	if len(salt) < saltMinLength {
-		return nil, SaltTooSmallError
+		return nil, ErrSaltTooSmall
 	}
 
 	hash, err := scrypt(
diff --git a/tests/scrypt.go b/tests/scrypt.go
index b7d87f1..58e4341 100644
--- a/tests/scrypt.go
+++ b/tests/scrypt.go
@@ -332,10 +332,10 @@ var good = []scryptTestVector {
 
 const halfMax = maxInt / 2
 var bad = []scryptTestVector {
-	{"p", "s", 0,  1,       1,       nil, BadNError},            // N == 0
-	{"p", "s", 1,  1,       1,       nil, BadNError},            // N == 1
-	{"p", "s", 7,  8,       1,       nil, BadNError},            // N is not power of 2
-	{"p", "s", 16, halfMax, halfMax, nil, ParamsTooLargeError},  // p * r too large
+	{"p", "s", 0,  1,       1,       nil, ErrBadN},            // N == 0
+	{"p", "s", 1,  1,       1,       nil, ErrBadN},            // N == 1
+	{"p", "s", 7,  8,       1,       nil, ErrBadN},            // N is not power of 2
+	{"p", "s", 16, halfMax, halfMax, nil, ErrParamsTooLarge},  // p * r too large
 }
 
 func test_validParams() {