diff options
author | Bo <bohende@gmail.com> | 2017-11-13 04:24:42 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2017-11-13 04:24:42 +0800 |
commit | cb8bbe70819839e6399c44fff6a75ab3d16b8791 (patch) | |
tree | 1beb6efbe63416f7921f4914d228cc7d78b49c09 /vendor/golang.org/x/crypto/scrypt/scrypt.go | |
parent | f47adc9ea8f16544a023ea9b67d1ed320750c5e7 (diff) | |
download | go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar.gz go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar.bz2 go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar.lz go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar.xz go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar.zst go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.zip |
puppeth: handle encrypted ssh keys (closes #15442) (#15443)
* cmd/puppeth: handle encrypted ssh keys
* cmd/puppeth: fix unconvert linter error
Diffstat (limited to 'vendor/golang.org/x/crypto/scrypt/scrypt.go')
-rw-r--r-- | vendor/golang.org/x/crypto/scrypt/scrypt.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vendor/golang.org/x/crypto/scrypt/scrypt.go b/vendor/golang.org/x/crypto/scrypt/scrypt.go index 7455395cf..ff28aaef6 100644 --- a/vendor/golang.org/x/crypto/scrypt/scrypt.go +++ b/vendor/golang.org/x/crypto/scrypt/scrypt.go @@ -4,7 +4,7 @@ // Package scrypt implements the scrypt key derivation function as defined in // Colin Percival's paper "Stronger Key Derivation via Sequential Memory-Hard -// Functions" (http://www.tarsnap.com/scrypt/scrypt.pdf). +// Functions" (https://www.tarsnap.com/scrypt/scrypt.pdf). package scrypt // import "golang.org/x/crypto/scrypt" import ( @@ -220,9 +220,10 @@ func smix(b []byte, r, N int, v, xy []uint32) { // // dk, err := scrypt.Key([]byte("some password"), salt, 16384, 8, 1, 32) // -// The recommended parameters for interactive logins as of 2009 are N=16384, -// r=8, p=1. They should be increased as memory latency and CPU parallelism -// increases. Remember to get a good random salt. +// The recommended parameters for interactive logins as of 2017 are N=32768, r=8 +// and p=1. The parameters N, r, and p should be increased as memory latency and +// CPU parallelism increases; consider setting N to the highest power of 2 you +// can derive within 100 milliseconds. Remember to get a good random salt. func Key(password, salt []byte, N, r, p, keyLen int) ([]byte, error) { if N <= 1 || N&(N-1) != 0 { return nil, errors.New("scrypt: N must be > 1 and a power of 2") |