diff options
author | Jakob Unterwurzacher | 2016-02-06 19:20:54 +0100 |
---|---|---|
committer | Jakob Unterwurzacher | 2016-02-06 19:22:35 +0100 |
commit | 2b8cbd944149afe51fadddbd67ee4499d1d86250 (patch) | |
tree | 76361984cc4394bbb9b19ae987aeaff71fb6073b /cryptfs/config_test.go | |
parent | adcfbd79a8b8bb85cbee25996ab622a05de0dbc1 (diff) |
Major refactoring: Split up "cryptfs" into several internal packages
"git status" for reference:
deleted: cryptfs/cryptfs.go
deleted: cryptfs/names_core.go
modified: integration_tests/cli_test.go
modified: integration_tests/helpers.go
renamed: cryptfs/config_file.go -> internal/configfile/config_file.go
renamed: cryptfs/config_test.go -> internal/configfile/config_test.go
renamed: cryptfs/config_test/.gitignore -> internal/configfile/config_test/.gitignore
renamed: cryptfs/config_test/PlaintextNames.conf -> internal/configfile/config_test/PlaintextNames.conf
renamed: cryptfs/config_test/StrangeFeature.conf -> internal/configfile/config_test/StrangeFeature.conf
renamed: cryptfs/config_test/v1.conf -> internal/configfile/config_test/v1.conf
renamed: cryptfs/config_test/v2.conf -> internal/configfile/config_test/v2.conf
renamed: cryptfs/kdf.go -> internal/configfile/kdf.go
renamed: cryptfs/kdf_test.go -> internal/configfile/kdf_test.go
renamed: cryptfs/cryptfs_content.go -> internal/contentenc/content.go
new file: internal/contentenc/content_api.go
renamed: cryptfs/content_test.go -> internal/contentenc/content_test.go
renamed: cryptfs/file_header.go -> internal/contentenc/file_header.go
renamed: cryptfs/intrablock.go -> internal/contentenc/intrablock.go
renamed: cryptfs/address_translation.go -> internal/contentenc/offsets.go
new file: internal/cryptocore/crypto_api.go
renamed: cryptfs/gcm_go1.4.go -> internal/cryptocore/gcm_go1.4.go
renamed: cryptfs/gcm_go1.5.go -> internal/cryptocore/gcm_go1.5.go
renamed: cryptfs/nonce.go -> internal/cryptocore/nonce.go
renamed: cryptfs/openssl_aead.go -> internal/cryptocore/openssl_aead.go
renamed: cryptfs/openssl_benchmark.bash -> internal/cryptocore/openssl_benchmark.bash
renamed: cryptfs/openssl_test.go -> internal/cryptocore/openssl_test.go
new file: internal/nametransform/name_api.go
new file: internal/nametransform/names_core.go
renamed: cryptfs/names_diriv.go -> internal/nametransform/names_diriv.go
renamed: cryptfs/names_noiv.go -> internal/nametransform/names_noiv.go
renamed: cryptfs/names_test.go -> internal/nametransform/names_test.go
new file: internal/nametransform/pad16.go
renamed: cryptfs/log.go -> internal/toggledlog/log.go
renamed: cryptfs/log_go1.4.go -> internal/toggledlog/log_go1.4.go
renamed: cryptfs/log_go1.5.go -> internal/toggledlog/log_go1.5.go
modified: main.go
modified: masterkey.go
modified: pathfs_frontend/file.go
modified: pathfs_frontend/file_holes.go
modified: pathfs_frontend/fs.go
modified: pathfs_frontend/fs_dir.go
modified: pathfs_frontend/names.go
modified: test.bash
Diffstat (limited to 'cryptfs/config_test.go')
-rw-r--r-- | cryptfs/config_test.go | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/cryptfs/config_test.go b/cryptfs/config_test.go deleted file mode 100644 index 11599c0..0000000 --- a/cryptfs/config_test.go +++ /dev/null @@ -1,83 +0,0 @@ -package cryptfs - -import ( - "fmt" - "testing" - "time" -) - -func TestLoadV1(t *testing.T) { - _, _, err := LoadConfFile("config_test/v1.conf", "test") - if err == nil { - t.Errorf("Outdated v1 config file must fail to load but it didn't") - } else if testing.Verbose() { - fmt.Print(err) - } -} - -// Load a known-good config file and verify that it takes at least 100ms -// (brute-force protection) -func TestLoadV2(t *testing.T) { - t1 := time.Now() - - _, _, err := LoadConfFile("config_test/v2.conf", "foo") - if err != nil { - t.Errorf("Could not load v2 config file: %v", err) - } - - elapsed := time.Since(t1) - if elapsed < 100*time.Millisecond { - t.Errorf("scrypt calculation runs too fast: %d ms", elapsed/time.Millisecond) - } -} - -func TestLoadV2PwdError(t *testing.T) { - if !testing.Verbose() { - Warn.Enabled = false - } - _, _, err := LoadConfFile("config_test/v2.conf", "wrongpassword") - if err == nil { - t.Errorf("Loading with wrong password must fail but it didn't") - } -} - -func TestLoadV2Feature(t *testing.T) { - _, _, err := LoadConfFile("config_test/PlaintextNames.conf", "test") - if err != nil { - t.Errorf("Could not load v2 PlaintextNames config file: %v", err) - } -} - -func TestLoadV2StrangeFeature(t *testing.T) { - _, _, err := LoadConfFile("config_test/StrangeFeature.conf", "test") - if err == nil { - t.Errorf("Loading unknown feature must fail but it didn't") - } else if testing.Verbose() { - fmt.Print(err) - } -} - -func TestCreateConfFile(t *testing.T) { - err := CreateConfFile("config_test/tmp.conf", "test", false, 10) - if err != nil { - t.Fatal(err) - } - _, _, err = LoadConfFile("config_test/tmp.conf", "test") - if err != nil { - t.Fatal(err) - } - -} - -func TestIsFeatureFlagKnown(t *testing.T) { - var cf ConfFile - if !cf.isFeatureFlagKnown(FlagDirIV) { - t.Errorf("This flag should be known") - } - if !cf.isFeatureFlagKnown(FlagPlaintextNames) { - t.Errorf("This flag should be known") - } - if cf.isFeatureFlagKnown("StrangeFeatureFlag") { - t.Errorf("This flag should be NOT known") - } -} |