From f1244b6d06a4932e8a51adedf351ec83262c2db5 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Mon, 6 Mar 2017 22:53:49 +0100 Subject: [PATCH] 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. --- .../example_filesystems_test.go | 2 +- .../v1.3/QcgCeorWnF7I_noMeo6K-Q | Bin 60 -> 0 bytes .../v1.3/WxU6ZeEPEFVBGNZko7LPGA | 1 - .../v1.3/ZrAj9K21B20StwGO2pjERg | 1 - tests/example_filesystems/v1.3/gocryptfs.conf | 6 +++--- tests/example_filesystems/v1.3/gocryptfs.diriv | 3 ++- ...ame.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs | Bin 0 -> 60 bytes ...hUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs.name | 1 + ...ame.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo | Bin 60 -> 0 bytes ...-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo.name | 1 - .../v1.3/gv65k_g2NQyBsSv_5dzMVQ | 1 + .../v1.3/mGj2_hdnHe34Sp0iIQUwuw | Bin 0 -> 60 bytes .../v1.3/uD4PVrDBY5y2k_qLKNOFvA | 1 + 13 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 tests/example_filesystems/v1.3/QcgCeorWnF7I_noMeo6K-Q delete mode 120000 tests/example_filesystems/v1.3/WxU6ZeEPEFVBGNZko7LPGA delete mode 120000 tests/example_filesystems/v1.3/ZrAj9K21B20StwGO2pjERg create mode 100644 tests/example_filesystems/v1.3/gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs create mode 100644 tests/example_filesystems/v1.3/gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs.name delete mode 100644 tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo delete mode 100644 tests/example_filesystems/v1.3/gocryptfs.longname.U-3R657d236Aq17_QJq8BnSEkc5OUnSC01Z5rPDOICo.name create mode 120000 tests/example_filesystems/v1.3/gv65k_g2NQyBsSv_5dzMVQ create mode 100644 tests/example_filesystems/v1.3/mGj2_hdnHe34Sp0iIQUwuw create mode 120000 tests/example_filesystems/v1.3/uD4PVrDBY5y2k_qLKNOFvA 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 666c1b91cc0114629af176008c10fc93fb87bf89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60 zcmV-C0K@+P0&EPRJJg0;%_G?v#`Mec6Kr#bFd}UtNB(#N`=Tu&LA`{vdZ-(8v-)a| S*-!#!Ldr;ATYx$Ahs|y@v>XQj 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 0000000000000000000000000000000000000000..e5c0a582d4b02dffe5517ae47381baf7b28a5519 GIT binary patch literal 60 zcmV-C0K@+P0?#k!scOBN{=!!11vnm2qQ7k;v+!w+WDZ+? Sz)j_98<7 literal 0 HcmV?d00001 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 8ed6884ba04d3a819f27e55d9072817c2cadbbcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60 zcmV-C0K@+P0vDyAD09c@nz1^Vu9-Pbdns_xzTxs|;XoKC|KzeunGY8kG!aXo?{w=o SUI@?|*}w3@>EMW>bG$)k0vy>-mEAAfaQWq%)~ML$$HMOr0j1- SY~on*;3y0s6)iWmCsJ@vT^xG= literal 0 HcmV?d00001 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