From 57612a278bdd26de611b543be311748ca4dc42ca Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sat, 25 Feb 2017 18:51:17 +0100 Subject: configfile: rename "kdf.go" -> "scrypt.go" This really only handles scrypt and no other key-derivation functions. Renaming the files prevents confusion once we introduce HKDF. renamed: internal/configfile/kdf.go -> internal/configfile/scrypt.go renamed: internal/configfile/kdf_test.go -> internal/configfile/scrypt_test.go --- internal/configfile/kdf_test.go | 60 ----------------------------------------- 1 file changed, 60 deletions(-) delete mode 100644 internal/configfile/kdf_test.go (limited to 'internal/configfile/kdf_test.go') diff --git a/internal/configfile/kdf_test.go b/internal/configfile/kdf_test.go deleted file mode 100644 index c1a656a..0000000 --- a/internal/configfile/kdf_test.go +++ /dev/null @@ -1,60 +0,0 @@ -package configfile - -import ( - "testing" -) - -/* -Results on a 2.7GHz Pentium G630: - -gocryptfs/cryptfs$ go test -bench=. -PASS -BenchmarkScrypt10-2 300 6021435 ns/op ... 6ms -BenchmarkScrypt11-2 100 11861460 ns/op -BenchmarkScrypt12-2 100 23420822 ns/op -BenchmarkScrypt13-2 30 47666518 ns/op -BenchmarkScrypt14-2 20 92561590 ns/op ... 92ms -BenchmarkScrypt15-2 10 183971593 ns/op -BenchmarkScrypt16-2 3 368506365 ns/op -BenchmarkScrypt17-2 2 755502608 ns/op ... 755ms -ok github.com/rfjakob/gocryptfs/cryptfs 18.772s -*/ - -func benchmarkScryptN(n int, b *testing.B) { - kdf := NewScryptKDF(n) - for i := 0; i < b.N; i++ { - kdf.DeriveKey("test") - } -} - -func BenchmarkScrypt10(b *testing.B) { - benchmarkScryptN(10, b) -} - -func BenchmarkScrypt11(b *testing.B) { - benchmarkScryptN(11, b) -} - -func BenchmarkScrypt12(b *testing.B) { - benchmarkScryptN(12, b) -} - -func BenchmarkScrypt13(b *testing.B) { - benchmarkScryptN(13, b) -} - -func BenchmarkScrypt14(b *testing.B) { - benchmarkScryptN(14, b) -} - -func BenchmarkScrypt15(b *testing.B) { - benchmarkScryptN(15, b) -} - -func BenchmarkScrypt16(b *testing.B) { - benchmarkScryptN(16, b) -} - -func BenchmarkScrypt17(b *testing.B) { - benchmarkScryptN(17, b) -} -- cgit v1.2.3