aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
authorleonklingele <git@leonklingele.de>2016-12-21 09:42:44 +0100
committer无闻 <u@gogs.io>2016-12-21 03:42:44 -0500
commit7cb440273c077238ed1ccc40a9ac73666b289d37 (patch)
treed8d6a16614dad597e9453c9cec2e4a661dc278cf /models
parentd96f2a71849ed312c3c69177f1cb7b4a174421da (diff)
Don't use custom PBKDF2 function (#3952)
Instead, use golang.org/x/crypto/pbkdf2
Diffstat (limited to 'models')
-rw-r--r--models/user.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/models/user.go b/models/user.go
index 3e4f0f4b..0fcccae0 100644
--- a/models/user.go
+++ b/models/user.go
@@ -32,6 +32,8 @@ import (
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/markdown"
"github.com/gogits/gogs/modules/setting"
+
+ "golang.org/x/crypto/pbkdf2"
)
type UserType int
@@ -315,7 +317,7 @@ func (u *User) NewGitSig() *git.Signature {
// EncodePasswd encodes password to safe format.
func (u *User) EncodePasswd() {
- newPasswd := base.PBKDF2([]byte(u.Passwd), []byte(u.Salt), 10000, 50, sha256.New)
+ newPasswd := pbkdf2.Key([]byte(u.Passwd), []byte(u.Salt), 10000, 50, sha256.New)
u.Passwd = fmt.Sprintf("%x", newPasswd)
}