diff options
| author | Dave Henderson <dhenderson@gmail.com> | 2025-03-09 20:14:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-10 00:14:46 +0000 |
| commit | bfa6b9dcef7592e6dd8225aaa0d0ab5aef5b3f84 (patch) | |
| tree | 7e844defee92dc3af320df20baa6f9b421d4a4c9 /crypto | |
| parent | 7942441e61471f578a57910b3aa93636f5a0310d (diff) | |
chore(refactoring): Refactor/modernizations (#2345)
chore(refactoring): Refactor with modernization refactorings
* range over int
* replace interface{} with any
* replace common map operations with maps.Copy/maps.Clone
* simplifying loops with slices.Contains/ContainsFunc
* modernize benchmarks with b.Loop
* modernize tests with t.Context
* use fmt.Appendf
* range over strings.SplitSeq
* use new stdlib crypto/pbkdf2 package
---------
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/pbkdf2.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/pbkdf2.go b/crypto/pbkdf2.go index 0cc44d7e..f7b9090a 100644 --- a/crypto/pbkdf2.go +++ b/crypto/pbkdf2.go @@ -2,17 +2,16 @@ package crypto import ( "crypto" + "crypto/pbkdf2" "crypto/sha1" //nolint: gosec "crypto/sha256" "crypto/sha512" "fmt" "hash" "sync" - - "golang.org/x/crypto/pbkdf2" ) -var hashFuncs = sync.OnceValue[map[crypto.Hash]func() hash.Hash](func() map[crypto.Hash]func() hash.Hash { +var hashFuncs = sync.OnceValue(func() map[crypto.Hash]func() hash.Hash { h := make(map[crypto.Hash]func() hash.Hash) h[crypto.SHA1] = sha1.New h[crypto.SHA224] = sha256.New224 @@ -53,5 +52,6 @@ func PBKDF2(password, salt []byte, iter, keylen int, hashFunc crypto.Hash) ([]by if !ok { return nil, fmt.Errorf("hashFunc not supported: %v", hashFunc) } - return pbkdf2.Key(password, salt, iter, keylen, h), nil + + return pbkdf2.Key(h, string(password), salt, iter, keylen) } |