@@ -18,7 +18,7 @@ import (
1818var (
1919// The base64 encoder used when producing the string representation of
2020// hashes.
21- base64Encoder = base64 .RawStdEncoding
21+ base64Encoding = base64 .RawStdEncoding
2222
2323// The number of iterations to use when generating the hash. This was chosen
2424// to make it about as fast as bcrypt hashes. Increasing this causes hashes
3434
3535// A salt size of 16 is the default in passlib. A minimum of 8 can be safely
3636// used.
37- saltSize = 16
37+ defaultSaltSize = 16
3838
3939// The simulated hash is used when trying to simulate password checks for
4040// users that don't exist.
@@ -84,7 +84,7 @@ func Compare(hashed string, password string) (bool, error) {
8484if err != nil {
8585return false ,xerrors .Errorf ("parse iter from hash: %w" ,err )
8686}
87- salt ,err := base64Encoder .DecodeString (parts [3 ])
87+ salt ,err := base64Encoding .DecodeString (parts [3 ])
8888if err != nil {
8989return false ,xerrors .Errorf ("decode salt: %w" ,err )
9090}
@@ -99,7 +99,7 @@ func Compare(hashed string, password string) (bool, error) {
9999// Hash generates a hash using pbkdf2.
100100// See the Compare() comment for rationale.
101101func Hash (password string ) (string ,error ) {
102- salt := make ([]byte ,saltSize )
102+ salt := make ([]byte ,defaultSaltSize )
103103_ ,err := rand .Read (salt )
104104if err != nil {
105105return "" ,xerrors .Errorf ("read random bytes for salt: %w" ,err )
@@ -112,12 +112,12 @@ func Hash(password string) (string, error) {
112112func hashWithSaltAndIter (password string ,salt []byte ,iter int )string {
113113var (
114114hash = pbkdf2 .Key ([]byte (password ),salt ,iter ,hashLength ,sha256 .New )
115- encHash = make ([]byte ,base64Encoder .EncodedLen (len (hash )))
116- encSalt = make ([]byte ,base64Encoder .EncodedLen (len (salt )))
115+ encHash = make ([]byte ,base64Encoding .EncodedLen (len (hash )))
116+ encSalt = make ([]byte ,base64Encoding .EncodedLen (len (salt )))
117117)
118118
119- base64Encoder .Encode (encHash ,hash )
120- base64Encoder .Encode (encSalt ,salt )
119+ base64Encoding .Encode (encHash ,hash )
120+ base64Encoding .Encode (encSalt ,salt )
121121
122122return fmt .Sprintf ("$%s$%d$%s$%s" ,hashScheme ,iter ,encSalt ,encHash )
123123}