aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2015-12-06 14:27:27 +0100
committerJakob Unterwurzacher2015-12-06 14:41:51 +0100
commit37c67393e64bd5ba26d92d15405a57418899a85d (patch)
tree120db9fef81264bf2a86e4e471f74b9e02f9bb4b
parent71b94828edb00d3a86bbe366f49295d81f91c28c (diff)
tests: recreate v0.5 example filesystems with -scryptn=10
Cuts the mount time in half, from 0.788s to 0.321s.
l---------integration_tests/example_filesystems/v0.5/AOtl_i4xQWDyG0_zUqntOw==1
l---------integration_tests/example_filesystems/v0.5/By5HbeLik3V5zkv7Ls1pbg==1
l---------integration_tests/example_filesystems/v0.5/Pf35wlWlf43N68EbhIgTcQ==1
-rw-r--r--integration_tests/example_filesystems/v0.5/VxphQR1cIIFkEKhP8f18NQ==bin56 -> 0 bytes
l---------integration_tests/example_filesystems/v0.5/gNdxbufjfWaFvNeyEZ-mUg==1
-rw-r--r--integration_tests/example_filesystems/v0.5/gocryptfs.conf6
-rw-r--r--integration_tests/example_filesystems/v0.5/gocryptfs.diriv2
-rw-r--r--integration_tests/example_filesystems/v0.5/j2BpGUT5kOtia20PWQ2rEA==bin0 -> 56 bytes
-rw-r--r--integration_tests/example_filesystems_test.go4
9 files changed, 8 insertions, 8 deletions
diff --git a/integration_tests/example_filesystems/v0.5/AOtl_i4xQWDyG0_zUqntOw== b/integration_tests/example_filesystems/v0.5/AOtl_i4xQWDyG0_zUqntOw==
new file mode 120000
index 0000000..7c52a28
--- /dev/null
+++ b/integration_tests/example_filesystems/v0.5/AOtl_i4xQWDyG0_zUqntOw==
@@ -0,0 +1 @@
+LFInXW9Djd1p8VfnwbhBaQy7MowhfNUDhsPPXXEiAfrfaVar6Ec= \ No newline at end of file
diff --git a/integration_tests/example_filesystems/v0.5/By5HbeLik3V5zkv7Ls1pbg== b/integration_tests/example_filesystems/v0.5/By5HbeLik3V5zkv7Ls1pbg==
deleted file mode 120000
index 9f74ead..0000000
--- a/integration_tests/example_filesystems/v0.5/By5HbeLik3V5zkv7Ls1pbg==
+++ /dev/null
@@ -1 +0,0 @@
-l7TSsTckQSyPjfmEJGNd8dRrbJCA68YIqD_ZYpKu4UQxlM-8RqA= \ No newline at end of file
diff --git a/integration_tests/example_filesystems/v0.5/Pf35wlWlf43N68EbhIgTcQ== b/integration_tests/example_filesystems/v0.5/Pf35wlWlf43N68EbhIgTcQ==
new file mode 120000
index 0000000..596cc3d
--- /dev/null
+++ b/integration_tests/example_filesystems/v0.5/Pf35wlWlf43N68EbhIgTcQ==
@@ -0,0 +1 @@
+OrWiZIVoBo4qbbJdsPy1MCwlvGTE4t_ackP4lbcLdKiTA-Zf \ No newline at end of file
diff --git a/integration_tests/example_filesystems/v0.5/VxphQR1cIIFkEKhP8f18NQ== b/integration_tests/example_filesystems/v0.5/VxphQR1cIIFkEKhP8f18NQ==
deleted file mode 100644
index aa686c6..0000000
--- a/integration_tests/example_filesystems/v0.5/VxphQR1cIIFkEKhP8f18NQ==
+++ /dev/null
Binary files differ
diff --git a/integration_tests/example_filesystems/v0.5/gNdxbufjfWaFvNeyEZ-mUg== b/integration_tests/example_filesystems/v0.5/gNdxbufjfWaFvNeyEZ-mUg==
deleted file mode 120000
index 2eecd29..0000000
--- a/integration_tests/example_filesystems/v0.5/gNdxbufjfWaFvNeyEZ-mUg==
+++ /dev/null
@@ -1 +0,0 @@
-fgxzwbsvjcQzLLJCh8iXmdL89StySXpiXyLSyGLWuDmDxNVH \ No newline at end of file
diff --git a/integration_tests/example_filesystems/v0.5/gocryptfs.conf b/integration_tests/example_filesystems/v0.5/gocryptfs.conf
index 4aa8951..f839664 100644
--- a/integration_tests/example_filesystems/v0.5/gocryptfs.conf
+++ b/integration_tests/example_filesystems/v0.5/gocryptfs.conf
@@ -1,8 +1,8 @@
{
- "EncryptedKey": "eEjly8AC1f/7HSiBwZlCWtzYXx+le7HpKu2qf8mcNo6ua2J0N4wasewjkzntU6r2ROdp3hjFQyHtZrCf",
+ "EncryptedKey": "zIY8foMncKrAG8USA1/AQ+R8z+xRge3QZqDpGRIDAeNOkMeQQsnMsJzFJbZHcGlRbUye0CwRghR/UX4R",
"ScryptObject": {
- "Salt": "MHr2o3kUQAHPE7Wc+p4eDDhKrpA8AOwzOo14JYoU89s=",
- "N": 65536,
+ "Salt": "BFQklFzt3j9ZDa8zcR9pwHfa8nDdLqyCzNp5kA+V6Y0=",
+ "N": 1024,
"R": 8,
"P": 1,
"KeyLen": 32
diff --git a/integration_tests/example_filesystems/v0.5/gocryptfs.diriv b/integration_tests/example_filesystems/v0.5/gocryptfs.diriv
index 25e74aa..3670294 100644
--- a/integration_tests/example_filesystems/v0.5/gocryptfs.diriv
+++ b/integration_tests/example_filesystems/v0.5/gocryptfs.diriv
@@ -1 +1 @@
-«¯úDÈ|å¯?jq \ No newline at end of file
+é×Vë¹LÅ×lû×g‘k# \ No newline at end of file
diff --git a/integration_tests/example_filesystems/v0.5/j2BpGUT5kOtia20PWQ2rEA== b/integration_tests/example_filesystems/v0.5/j2BpGUT5kOtia20PWQ2rEA==
new file mode 100644
index 0000000..1ad2358
--- /dev/null
+++ b/integration_tests/example_filesystems/v0.5/j2BpGUT5kOtia20PWQ2rEA==
Binary files differ
diff --git a/integration_tests/example_filesystems_test.go b/integration_tests/example_filesystems_test.go
index c74e383..8081feb 100644
--- a/integration_tests/example_filesystems_test.go
+++ b/integration_tests/example_filesystems_test.go
@@ -78,8 +78,8 @@ func TestExampleFsV05(t *testing.T) {
mount(cDir, pDir, "-extpass", "echo test")
checkExampleContent(t, pDir)
unmount(pDir)
- mount(cDir, pDir, "-masterkey", "e7f38c71-0da80f68-d3b2cd7d-ee4f49e5-"+
- "f8bc98cd-d7976950-85204c54-3081b302")
+ mount(cDir, pDir, "-masterkey", "199eae55-36bff4af-83b9a3a2-4fa16f65-"+
+ "1549ccdb-2d08d1f0-b1b26965-1b61f896")
checkExampleContent(t, pDir)
unmount(pDir)
err = os.Remove(pDir)