aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJakob Unterwurzacher2017-03-06 22:53:49 +0100
committerJakob Unterwurzacher2017-03-07 20:56:50 +0100
commitf1244b6d06a4932e8a51adedf351ec83262c2db5 (patch)
treef746b80288d8e4f7cf7244d042b206085a0a9390 /tests
parent2362e67a9e5c6f1c96e987e8753eca295f283875 (diff)
tests: recreate v1.3 example filesystem
The filesystem was created with a gocryptfs version that ignored the HKDF flag (hence everything was actually encrypted WITHOUT hkdf). Fix it by recreating it.
Diffstat (limited to 'tests')
-rw-r--r--tests/example_filesystems/example_filesystems_test.go2
-rw-r--r--tests/example_filesystems/v1.3/QcgCeorWnF7I_noMeo6K-Qbin60 -> 0 bytes
l---------tests/example_filesystems/v1.3/WxU6ZeEPEFVBGNZko7LPGA1
l---------tests/example_filesystems/v1.3/ZrAj9K21B20StwGO2pjERg1
-rw-r--r--tests/example_filesystems/v1.3/gocryptfs.conf6
-rw-r--r--tests/example_filesystems/v1.3/gocryptfs.diriv3
-rw-r--r--tests/example_filesystems/v1.3/gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Csbin0 -> 60 bytes
-rw-r--r--tests/example_filesystems/v1.3/gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs.name1
-rw-r--r--tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICobin60 -> 0 bytes
-rw-r--r--tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo.name1
l---------tests/example_filesystems/v1.3/gv65k_g2NQyBsSv_5dzMVQ1
-rw-r--r--tests/example_filesystems/v1.3/mGj2_hdnHe34Sp0iIQUwuwbin0 -> 60 bytes
l---------tests/example_filesystems/v1.3/uD4PVrDBY5y2k_qLKNOFvA1
13 files changed, 9 insertions, 8 deletions
diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go
index f72e0b9..03ff411 100644
--- a/tests/example_filesystems/example_filesystems_test.go
+++ b/tests/example_filesystems/example_filesystems_test.go
@@ -245,7 +245,7 @@ func TestExampleFSv13(t *testing.T) {
pDir = pDir + "_m"
test_helpers.MountOrFatal(t, cDir, pDir, "-masterkey",
- "40de3f45-7210f8aa-2d7fe885-604d2802-32a7d832-aa756e95-ff2e06bf-1802e456",
+ "fd890dab-86bf61cf-ec5ad460-ad3ed01f-9c52d546-2a31783d-a56b088d-3d05232e",
opensslOpt)
checkExampleFSLongnames(t, pDir)
test_helpers.UnmountPanic(pDir)
diff --git a/tests/example_filesystems/v1.3/QcgCeorWnF7I_noMeo6K-Q b/tests/example_filesystems/v1.3/QcgCeorWnF7I_noMeo6K-Q
deleted file mode 100644
index 666c1b9..0000000
--- a/tests/example_filesystems/v1.3/QcgCeorWnF7I_noMeo6K-Q
+++ /dev/null
Binary files differ
diff --git a/tests/example_filesystems/v1.3/WxU6ZeEPEFVBGNZko7LPGA b/tests/example_filesystems/v1.3/WxU6ZeEPEFVBGNZko7LPGA
deleted file mode 120000
index f3ebc5e..0000000
--- a/tests/example_filesystems/v1.3/WxU6ZeEPEFVBGNZko7LPGA
+++ /dev/null
@@ -1 +0,0 @@
-UwLqHBQ8wn2TtxECb7D44WoT_zsk4y_OUjBhrboYjVwc_st8tPX0jg \ No newline at end of file
diff --git a/tests/example_filesystems/v1.3/ZrAj9K21B20StwGO2pjERg b/tests/example_filesystems/v1.3/ZrAj9K21B20StwGO2pjERg
deleted file mode 120000
index fb4ea39..0000000
--- a/tests/example_filesystems/v1.3/ZrAj9K21B20StwGO2pjERg
+++ /dev/null
@@ -1 +0,0 @@
-6MMwNmTI01yd9FmF60rt-AYDd9hr_-aZSICYKhxAhGaoYZUQiVraaRip \ No newline at end of file
diff --git a/tests/example_filesystems/v1.3/gocryptfs.conf b/tests/example_filesystems/v1.3/gocryptfs.conf
index dcb446c..e6b4aec 100644
--- a/tests/example_filesystems/v1.3/gocryptfs.conf
+++ b/tests/example_filesystems/v1.3/gocryptfs.conf
@@ -1,8 +1,8 @@
{
- "Creator": "gocryptfs v1.2.1-17-g5b54577-dirty",
- "EncryptedKey": "dfneWTRGfme/SnCcuBmQ4WBbcU3V2HvZKpp6JMafFYEvrfs6+8QQM6iY1zAuctKvAp//IcfGFmNS2YYG+xkfEA==",
+ "Creator": "gocryptfs v1.2.1-23-gd78a8d1-dirty",
+ "EncryptedKey": "WGhKfCvV/LBZdwpWz3Fs+9UFUJbtTooBiZMuthd8Hz3nq0g+zU7H+68ZkrCLdcC08PUNHVbvDdlGpRh0czbbyA==",
"ScryptObject": {
- "Salt": "fHYTB0o+D9sTm2sIpNih1maN3SdGfM08al3WBhVNQ78=",
+ "Salt": "LkS43fRGN3SfcFbVhPLo3uKh3h+4LYLNlqEUf+JIWf4=",
"N": 1024,
"R": 8,
"P": 1,
diff --git a/tests/example_filesystems/v1.3/gocryptfs.diriv b/tests/example_filesystems/v1.3/gocryptfs.diriv
index 5ef76e0..d507f03 100644
--- a/tests/example_filesystems/v1.3/gocryptfs.diriv
+++ b/tests/example_filesystems/v1.3/gocryptfs.diriv
@@ -1 +1,2 @@
-;1c‰¡übú »÷…G"w \ No newline at end of file
+N¦8‘mm$;ù¹;ó\
+6¶ \ No newline at end of file
diff --git a/tests/example_filesystems/v1.3/gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs b/tests/example_filesystems/v1.3/gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs
new file mode 100644
index 0000000..e5c0a58
--- /dev/null
+++ b/tests/example_filesystems/v1.3/gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs
Binary files differ
diff --git a/tests/example_filesystems/v1.3/gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs.name b/tests/example_filesystems/v1.3/gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs.name
new file mode 100644
index 0000000..c0aceae
--- /dev/null
+++ b/tests/example_filesystems/v1.3/gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs.name
@@ -0,0 +1 @@
+K9GWSIcjWZgvd3TpclEcrWUw_QmLRotdyEFxkXLyVDiLZlqC6oJ_LcouD_9ZTkFL72LaB3P0nx7dMeyjd9m1k_aLS1Mqbnj5F7PwiVSVnKugBsooIa7enIuH1x_riP9ppeDEUNPsDXtDlqESe75rc9dYptYmYC_MsG3ve8n78YCU5h8fUBL271v2yv8Tbgc0u7d5ygLqPgTYdBMXsSgOXxviMU73y9UlA3DWfDArb36N0FHpiiphXgu6_uzckiig9o-SFv-o2eyyKjHNClsWAP32opj-T4DuWU7Q_5858hiedJISv8zI0NTYYkeCluSZ_EkIXidzKB5vcswetGSJmg \ No newline at end of file
diff --git a/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo b/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo
deleted file mode 100644
index 8ed6884..0000000
--- a/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo
+++ /dev/null
Binary files differ
diff --git a/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo.name b/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo.name
deleted file mode 100644
index 477e442..0000000
--- a/tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo.name
+++ /dev/null
@@ -1 +0,0 @@
-oGplYtEMq6lIULihgghjAqWgwYd9E0oZ0PmYoSiGRAjjjQr3YpMWKEkC9zTnLPF1w8DuERO43QBD6LCqhsjuxeAmkZovYDbTS0O4plCWufTLpgxMuLJb_hu_vsi9vex8CmKDzcbGrkgzCuyVDjYb6hCuqxpxAXsgQlqgCkWg2e4N_O2UWvoBpz4rmvnvxr7mpIo6SBkBsSJGluRswsg__aqGa-heLn4hwTPapt8Xk441ka_mPwC9gnUHVgJJ6H9gg5TEi883PuG0S9OC5h_9ZcgHVjyxw7xg4CUpEeKpoGpqvkRHNqO4jvTXewNBevQ4JBhT0lRrxdSwa5DWu_G7jw \ No newline at end of file
diff --git a/tests/example_filesystems/v1.3/gv65k_g2NQyBsSv_5dzMVQ b/tests/example_filesystems/v1.3/gv65k_g2NQyBsSv_5dzMVQ
new file mode 120000
index 0000000..79876d9
--- /dev/null
+++ b/tests/example_filesystems/v1.3/gv65k_g2NQyBsSv_5dzMVQ
@@ -0,0 +1 @@
+ra2NOzuRPOI9tj-Hc7RIYJcZNCJKWY1bo4681ABZi5eEMkK9iZCQ8A \ No newline at end of file
diff --git a/tests/example_filesystems/v1.3/mGj2_hdnHe34Sp0iIQUwuw b/tests/example_filesystems/v1.3/mGj2_hdnHe34Sp0iIQUwuw
new file mode 100644
index 0000000..d653f78
--- /dev/null
+++ b/tests/example_filesystems/v1.3/mGj2_hdnHe34Sp0iIQUwuw
Binary files differ
diff --git a/tests/example_filesystems/v1.3/uD4PVrDBY5y2k_qLKNOFvA b/tests/example_filesystems/v1.3/uD4PVrDBY5y2k_qLKNOFvA
new file mode 120000
index 0000000..d121261
--- /dev/null
+++ b/tests/example_filesystems/v1.3/uD4PVrDBY5y2k_qLKNOFvA
@@ -0,0 +1 @@
+pAes0cNmAncysGM-LxZ-jXvIpdLwc2qQNXvrEw0l1-dM5X74-kBXgF7P \ No newline at end of file