From 4ee612b36ef9854512d92c08cc6b6e7b756d1b9a Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sat, 4 Jun 2016 15:20:22 +0200 Subject: [PATCH] tests: recreate v0.7 example filesystem with -scryptn=10 Speeds TestExampleFSv07 from 0.46 seconds to 0.07 seconds. --- .../v0.7/4tRF1LdULRFLiXwfze671Q== | 1 + .../v0.7/AgD7i9tiAUp42SYjULQt1w== | Bin 60 -> 0 bytes .../v0.7/FQnvM-qOnCYSnk368ugdWg== | 1 - .../v0.7/Pvg7Oy_Ar8Ar93EZZQV_Lw== | 1 - .../v0.7/RWPXmXkRFrWw1aOpq7C-NQ== | Bin 0 -> 60 bytes .../v0.7/dwPcZNei4HN4qPA6FxoG_A== | 1 + .../example_filesystems/v0.7/gocryptfs.conf | 6 +++--- .../example_filesystems/v0.7/gocryptfs.diriv | 2 +- integration_tests/example_filesystems_test.go | 4 ++-- 9 files changed, 8 insertions(+), 8 deletions(-) create mode 120000 integration_tests/example_filesystems/v0.7/4tRF1LdULRFLiXwfze671Q== delete mode 100644 integration_tests/example_filesystems/v0.7/AgD7i9tiAUp42SYjULQt1w== delete mode 120000 integration_tests/example_filesystems/v0.7/FQnvM-qOnCYSnk368ugdWg== delete mode 120000 integration_tests/example_filesystems/v0.7/Pvg7Oy_Ar8Ar93EZZQV_Lw== create mode 100644 integration_tests/example_filesystems/v0.7/RWPXmXkRFrWw1aOpq7C-NQ== create mode 120000 integration_tests/example_filesystems/v0.7/dwPcZNei4HN4qPA6FxoG_A== diff --git a/integration_tests/example_filesystems/v0.7/4tRF1LdULRFLiXwfze671Q== b/integration_tests/example_filesystems/v0.7/4tRF1LdULRFLiXwfze671Q== new file mode 120000 index 0000000..f06d136 --- /dev/null +++ b/integration_tests/example_filesystems/v0.7/4tRF1LdULRFLiXwfze671Q== @@ -0,0 +1 @@ +_IdSjAmPQOJW6QkskuyQJS9bFTjntqx9kdg4Z3y8EzKBnIb_Ihqz4w== \ No newline at end of file diff --git a/integration_tests/example_filesystems/v0.7/AgD7i9tiAUp42SYjULQt1w== b/integration_tests/example_filesystems/v0.7/AgD7i9tiAUp42SYjULQt1w== deleted file mode 100644 index 6c0d1e80394467e091084ad5ef210506dbe582bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60 zcmV-C0K@+P0uahfgJe|}{TpaL9!obFY|7=1Q;y?1@(i*D( diff --git a/integration_tests/example_filesystems/v0.7/FQnvM-qOnCYSnk368ugdWg== b/integration_tests/example_filesystems/v0.7/FQnvM-qOnCYSnk368ugdWg== deleted file mode 120000 index 2b7a4b4..0000000 --- a/integration_tests/example_filesystems/v0.7/FQnvM-qOnCYSnk368ugdWg== +++ /dev/null @@ -1 +0,0 @@ -cHxK1r_WYNd43oz_foCmzgt5jWrSvpiD-Ngy94L8LndrP9Kic-xlEg== \ No newline at end of file diff --git a/integration_tests/example_filesystems/v0.7/Pvg7Oy_Ar8Ar93EZZQV_Lw== b/integration_tests/example_filesystems/v0.7/Pvg7Oy_Ar8Ar93EZZQV_Lw== deleted file mode 120000 index e527253..0000000 --- a/integration_tests/example_filesystems/v0.7/Pvg7Oy_Ar8Ar93EZZQV_Lw== +++ /dev/null @@ -1 +0,0 @@ -cdrpE7F_WZBEDSu1DI2k880I-9dsPjhD8AU8faPjh4omHmDcdcHlyimF \ No newline at end of file diff --git a/integration_tests/example_filesystems/v0.7/RWPXmXkRFrWw1aOpq7C-NQ== b/integration_tests/example_filesystems/v0.7/RWPXmXkRFrWw1aOpq7C-NQ== new file mode 100644 index 0000000000000000000000000000000000000000..6ddcd1e831a8527c57a235e85309c51bb189befc GIT binary patch literal 60 zcmV-C0K@+P0wG6OKbI}Vprm{f*q4zapS>WV|4D;bqo~%A<7^egjc0tRR7}%dgd#Me SN}j?bFxvUkUlt^dELHtF+8jmz literal 0 HcmV?d00001 diff --git a/integration_tests/example_filesystems/v0.7/dwPcZNei4HN4qPA6FxoG_A== b/integration_tests/example_filesystems/v0.7/dwPcZNei4HN4qPA6FxoG_A== new file mode 120000 index 0000000..c0c731f --- /dev/null +++ b/integration_tests/example_filesystems/v0.7/dwPcZNei4HN4qPA6FxoG_A== @@ -0,0 +1 @@ +Ygqk_pYyxE_ac_ufVgxKCPxWHMGqQ8xUohIaHcmgeLU4uQB3_UmicPKB \ No newline at end of file diff --git a/integration_tests/example_filesystems/v0.7/gocryptfs.conf b/integration_tests/example_filesystems/v0.7/gocryptfs.conf index c2997f2..80c2673 100644 --- a/integration_tests/example_filesystems/v0.7/gocryptfs.conf +++ b/integration_tests/example_filesystems/v0.7/gocryptfs.conf @@ -1,8 +1,8 @@ { - "EncryptedKey": "rjkwSNwi3nCUKMLaDttlYweHSDgyhbDx5sWv/a+h+cG1co5IXoXF9ZQSxXl1Qwm/XhY/dvTvnGZRREde", + "EncryptedKey": "0crm+qEf00XPxQrc8NIMp/0rgfaLb8wzTj+3G1slSytjsLHctj/fOKkGJIFyBk7xzvnWdkhyxxvHgfMS", "ScryptObject": { - "Salt": "mX6madEb9nbE+xgo840s9d2ro88f/5GuEiimQ+C7Z1I=", - "N": 65536, + "Salt": "yZn+QMjR2ENZ6MoiURpqEqr8mgnCX8WN87KJafgiXhU=", + "N": 1024, "R": 8, "P": 1, "KeyLen": 32 diff --git a/integration_tests/example_filesystems/v0.7/gocryptfs.diriv b/integration_tests/example_filesystems/v0.7/gocryptfs.diriv index 4606c90..3adef3c 100644 --- a/integration_tests/example_filesystems/v0.7/gocryptfs.diriv +++ b/integration_tests/example_filesystems/v0.7/gocryptfs.diriv @@ -1 +1 @@ -¤7vßØFT5ÌÖË£N× \ No newline at end of file +ßiȤ·\?…Œ=ÑÎMc \ No newline at end of file diff --git a/integration_tests/example_filesystems_test.go b/integration_tests/example_filesystems_test.go index e3df950..6380109 100644 --- a/integration_tests/example_filesystems_test.go +++ b/integration_tests/example_filesystems_test.go @@ -170,8 +170,8 @@ func TestExampleFSv07(t *testing.T) { mount(cDir, pDir, "-extpass", "echo test") checkExampleFS(t, pDir) unmount(pDir) - mount(cDir, pDir, "-masterkey", "bee8d0c5-74ec49ff-24b8793d-91d488a9-"+ - "6117c58b-357eafaa-162ce3cf-8a061a28") + mount(cDir, pDir, "-masterkey", "ed7f6d83-40cce86c-0e7d79c2-a9438710-"+ + "575221bf-30a0eb60-2821fa8f-7f3123bf") checkExampleFS(t, pDir) unmount(pDir) err = os.Remove(pDir)