IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9826 from agnivade/hexencoding

Browse Source 
Use hex.EncodeToString to encode to hex
This commit is contained in:
Carl Bergquist 2017-11-09 17:58:35 +01:00 committed by GitHub
commit 56fe1308ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/util/encoding.go
View File

@ -8,7 +8,6 @@ import (
"encoding/base64" "encoding/base64"
"encoding/hex" "encoding/hex"
"errors" "errors"
"fmt"
"hash" "hash"
"strings" "strings"
) )
@ -30,7 +29,7 @@ func GetRandomString(n int, alphabets ...byte) string {
func EncodePassword(password string, salt string) string { func EncodePassword(password string, salt string) string {
newPasswd := PBKDF2([]byte(password), []byte(salt), 10000, 50, sha256.New) newPasswd := PBKDF2([]byte(password), []byte(salt), 10000, 50, sha256.New)
return fmt.Sprintf("%x", newPasswd) return hex.EncodeToString(newPasswd)
} }
// Encode string to md5 hex value. // Encode string to md5 hex value.