aboutsummaryrefslogtreecommitdiff
path: root/integration_tests
diff options
context:
space:
mode:
authorJakob Unterwurzacher2016-02-06 19:20:54 +0100
committerJakob Unterwurzacher2016-02-06 19:22:35 +0100
commit2b8cbd944149afe51fadddbd67ee4499d1d86250 (patch)
tree76361984cc4394bbb9b19ae987aeaff71fb6073b /integration_tests
parentadcfbd79a8b8bb85cbee25996ab622a05de0dbc1 (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 'integration_tests')
-rw-r--r--integration_tests/cli_test.go15
-rw-r--r--integration_tests/helpers.go6
2 files changed, 11 insertions, 10 deletions
diff --git a/integration_tests/cli_test.go b/integration_tests/cli_test.go
index 5e8902d..062a90d 100644
--- a/integration_tests/cli_test.go
+++ b/integration_tests/cli_test.go
@@ -7,7 +7,8 @@ import (
"os/exec"
"testing"
- "github.com/rfjakob/gocryptfs/cryptfs"
+ "github.com/rfjakob/gocryptfs/internal/configfile"
+ "github.com/rfjakob/gocryptfs/internal/nametransform"
)
// Test -init flag
@@ -26,7 +27,7 @@ func TestInit(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- _, err = os.Stat(dir + cryptfs.ConfDefaultName)
+ _, err = os.Stat(dir + configfile.ConfDefaultName)
if err != nil {
t.Fatal(err)
}
@@ -96,22 +97,22 @@ func TestInitPlaintextNames(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- _, err = os.Stat(dir + cryptfs.ConfDefaultName)
+ _, err = os.Stat(dir + configfile.ConfDefaultName)
if err != nil {
t.Fatal(err)
}
- _, err = os.Stat(dir + cryptfs.DIRIV_FILENAME)
+ _, err = os.Stat(dir + nametransform.DirIVFilename)
if err == nil {
t.Errorf("gocryptfs.diriv should not have been created with -plaintextnames")
}
- _, cf, err := cryptfs.LoadConfFile(dir+cryptfs.ConfDefaultName, "test")
+ _, cf, err := configfile.LoadConfFile(dir+configfile.ConfDefaultName, "test")
if err != nil {
t.Fatal(err)
}
- if !cf.IsFeatureFlagSet(cryptfs.FlagPlaintextNames) {
+ if !cf.IsFeatureFlagSet(configfile.FlagPlaintextNames) {
t.Error("PlaintextNames flag should be set but isnt")
}
- if cf.IsFeatureFlagSet(cryptfs.FlagEMENames) || cf.IsFeatureFlagSet(cryptfs.FlagDirIV) {
+ if cf.IsFeatureFlagSet(configfile.FlagEMENames) || cf.IsFeatureFlagSet(configfile.FlagDirIV) {
t.Error("FlagEMENames and FlagDirIV should be not set")
}
}
diff --git a/integration_tests/helpers.go b/integration_tests/helpers.go
index 5145b30..e5458c9 100644
--- a/integration_tests/helpers.go
+++ b/integration_tests/helpers.go
@@ -10,7 +10,7 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/cryptfs"
+ "github.com/rfjakob/gocryptfs/internal/nametransform"
)
// Note: the code assumes that all have a trailing slash
@@ -42,7 +42,7 @@ func resetTmpDir() {
fmt.Println(err)
os.Exit(1)
}
- err = cryptfs.WriteDirIV(defaultCipherDir)
+ err = nametransform.WriteDirIV(defaultCipherDir)
if err != nil {
fmt.Println(err)
os.Exit(1)
@@ -58,9 +58,9 @@ func mount(c string, p string, extraArgs ...string) {
args = append(args, c)
args = append(args, p)
cmd := exec.Command(gocryptfsBinary, args...)
+ cmd.Stderr = os.Stderr
if testing.Verbose() {
cmd.Stdout = os.Stdout
- cmd.Stderr = os.Stderr
}
err := cmd.Run()
if err != nil {