From 2b8cbd944149afe51fadddbd67ee4499d1d86250 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sat, 6 Feb 2016 19:20:54 +0100
Subject: 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
---
 cryptfs/names_test.go | 58 ---------------------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 cryptfs/names_test.go

(limited to 'cryptfs/names_test.go')

diff --git a/cryptfs/names_test.go b/cryptfs/names_test.go
deleted file mode 100644
index 0207f0a..0000000
--- a/cryptfs/names_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package cryptfs
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestEncryptPathNoIV(t *testing.T) {
-	var s []string
-	s = append(s, "foo")
-	s = append(s, "foo12312312312312312313123123123")
-	s = append(s, "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890")
-
-	key := make([]byte, KEY_LEN)
-	fs := NewCryptFS(key, true, false, true)
-
-	for _, n := range s {
-		c := fs.EncryptPathNoIV(n)
-		d, err := fs.DecryptPathNoIV(c)
-		if err != nil {
-			t.Errorf("Got error from DecryptPathNoIV: %s", err)
-		}
-		if d != n {
-			t.Errorf("Content mismatch, n != d: n=%s c=%s d=%s", n, c, d)
-		}
-	}
-}
-
-func TestPad16(t *testing.T) {
-	var s [][]byte
-	s = append(s, []byte("foo"))
-	s = append(s, []byte("12345678901234567"))
-	s = append(s, []byte("12345678901234567abcdefg"))
-
-	key := make([]byte, KEY_LEN)
-	fs := NewCryptFS(key, true, false, true)
-
-	for i := range s {
-		orig := s[i]
-		padded := fs.pad16(orig)
-		if len(padded) <= len(orig) {
-			t.Errorf("Padded length not bigger than orig: %d", len(padded))
-		}
-		if len(padded)%16 != 0 {
-			t.Errorf("Length is not aligend: %d", len(padded))
-		}
-		unpadded, err := fs.unPad16(padded)
-		if err != nil {
-			t.Error("unPad16 returned error:", err)
-		}
-		if len(unpadded) != len(orig) {
-			t.Errorf("Size mismatch: orig=%d unpadded=%d", len(s[i]), len(unpadded))
-		}
-		if !bytes.Equal(orig, unpadded) {
-			t.Error("Content mismatch orig vs unpadded")
-		}
-	}
-}
-- 
cgit v1.2.3