KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #678 from restic/fix-676

Browse source 
Update github.com/elithrar/simple-scrypt
This commit is contained in:
Alexander Neumann 2016-11-19 19:22:44 +01:00
commit 07380878fb
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vendor/manifest vendored
View file

@ -10,7 +10,7 @@
{ {
"importpath": "github.com/elithrar/simple-scrypt", "importpath": "github.com/elithrar/simple-scrypt",
"repository": "https://github.com/elithrar/simple-scrypt", "repository": "https://github.com/elithrar/simple-scrypt",
"revision": "cbb1ebac08e2ca5495a43f4ef5555e61a7ec7677", "revision": "2325946f714c95de4a6088202c402fbdfa64163b",
"branch": "master" "branch": "master"
}, },
{ {

2
vendor/src/github.com/elithrar/simple-scrypt/scrypt.go vendored
View file

@ -260,7 +260,7 @@ func Calibrate(timeout time.Duration, memMiBytes int, params Params) (Params, er
var again bool var again bool
memBytes := memMiBytes << 20 memBytes := memMiBytes << 20
// If we'd use more memory then the allowed, we can tune the memory usage // If we'd use more memory then the allowed, we can tune the memory usage
for 128*p.R*p.N > memBytes { for 128*int64(p.R)*int64(p.N) > int64(memBytes) {
if p.R > 1 { if p.R > 1 {
// by lowering r // by lowering r
p.R-- p.R--

4
vendor/src/github.com/elithrar/simple-scrypt/scrypt_test.go vendored
View file

@ -23,11 +23,11 @@ var testParams = []struct {
{true, Params{1048576, 8, 2, 64, 128}}, {true, Params{1048576, 8, 2, 64, 128}},
{false, Params{-1, 8, 1, 16, 32}}, // invalid N {false, Params{-1, 8, 1, 16, 32}}, // invalid N
{false, Params{0, 8, 1, 16, 32}}, // invalid N {false, Params{0, 8, 1, 16, 32}}, // invalid N
{false, Params{1 << 31, 8, 1, 16, 32}}, // invalid N {false, Params{1<<31 - 1, 8, 1, 16, 32}}, // invalid N
{false, Params{16384, 0, 12, 16, 32}}, // invalid R {false, Params{16384, 0, 12, 16, 32}}, // invalid R
{false, Params{16384, 8, 0, 16, 32}}, // invalid R > maxInt/128/P {false, Params{16384, 8, 0, 16, 32}}, // invalid R > maxInt/128/P
{false, Params{16384, 1 << 24, 1, 16, 32}}, // invalid R > maxInt/256 {false, Params{16384, 1 << 24, 1, 16, 32}}, // invalid R > maxInt/256
{false, Params{1 << 31, 8, 0, 16, 32}}, // invalid p < 0 {false, Params{1<<31 - 1, 8, 0, 16, 32}}, // invalid p < 0
{false, Params{4096, 8, 1, 5, 32}}, // invalid SaltLen {false, Params{4096, 8, 1, 5, 32}}, // invalid SaltLen
{false, Params{4096, 8, 1, 16, 2}}, // invalid DKLen {false, Params{4096, 8, 1, 16, 2}}, // invalid DKLen
} }