d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-13 15:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into engine

Browse Source
This commit is contained in:
Adrian Gallagher
2019-08-09 15:46:24 +10:00
parent e8c9a9a2a4 2078ba907f
commit 8ecd8a0c16
353 changed files with 4966 additions and 4196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/config_encryption.go
View File

@@ -9,8 +9,8 @@ import (
"fmt"
"io"
"github.com/thrasher-/gocryptotrader/common"
gctcrypto "github.com/thrasher-/gocryptotrader/common/crypto"
"github.com/thrasher-corp/gocryptotrader/common"
"github.com/thrasher-corp/gocryptotrader/common/crypto"
"golang.org/x/crypto/scrypt"
)
@@ -191,7 +191,7 @@ func getScryptDK(key, salt []byte) ([]byte, error) {
func makeNewSessionDK(key []byte) ([]byte, error) {
var err error
storedSalt, err = gctcrypto.GetRandomSalt([]byte(SaltPrefix), SaltRandomLength)
storedSalt, err = crypto.GetRandomSalt([]byte(SaltPrefix), SaltRandomLength)
if err != nil {
return nil, err
}