Browse Source

macaroons: use fast scrypt options in itest and unit tests

master
Oliver Gugger 4 years ago
parent
commit
847d27f8a6
No known key found for this signature in database
GPG Key ID: 8E4256593F177720
  1. 13
      macaroons/security.go
  2. 14
      macaroons/security_rpctest.go
  3. 12
      macaroons/security_test.go
  4. 5
      macaroons/store.go

13
macaroons/security.go

@ -0,0 +1,13 @@
// +build !rpctest
package macaroons
import "github.com/btcsuite/btcwallet/snacl"
var (
// Below are the default scrypt parameters that are used when creating
// the encryption key for the macaroon database with snacl.NewSecretKey.
scryptN = snacl.DefaultN
scryptR = snacl.DefaultR
scryptP = snacl.DefaultP
)

14
macaroons/security_rpctest.go

@ -0,0 +1,14 @@
// +build rpctest
package macaroons
import "github.com/btcsuite/btcwallet/waddrmgr"
var (
// Below are the reduced scrypt parameters that are used when creating
// the encryption key for the macaroon database with snacl.NewSecretKey.
// We use very low values for our itest/rpctest to speed things up.
scryptN = waddrmgr.FastScryptOptions.N
scryptR = waddrmgr.FastScryptOptions.R
scryptP = waddrmgr.FastScryptOptions.P
)

12
macaroons/security_test.go

@ -0,0 +1,12 @@
package macaroons
import "github.com/btcsuite/btcwallet/waddrmgr"
func init() {
// Below are the reduced scrypt parameters that are used when creating
// the encryption key for the macaroon database with snacl.NewSecretKey.
// We use very low values for our itest/rpctest to speed things up.
scryptN = waddrmgr.FastScryptOptions.N
scryptR = waddrmgr.FastScryptOptions.R
scryptP = waddrmgr.FastScryptOptions.P
}

5
macaroons/store.go

@ -106,8 +106,9 @@ func (r *RootKeyStorage) CreateUnlock(password *[]byte) error {
}
// We haven't yet stored a key, so create a new one.
encKey, err := snacl.NewSecretKey(password, snacl.DefaultN,
snacl.DefaultR, snacl.DefaultP)
encKey, err := snacl.NewSecretKey(
password, scryptN, scryptR, scryptP,
)
if err != nil {
return err
}

Loading…
Cancel
Save