From 857507e8b100626ae0471fae793efc52bf552821 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sun, 28 May 2017 18:09:02 +0200 Subject: fusefrontend_reverse: move pathiv to its own package We will also need it in forward mode. --- internal/fusefrontend_reverse/rfile.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'internal/fusefrontend_reverse/rfile.go') diff --git a/internal/fusefrontend_reverse/rfile.go b/internal/fusefrontend_reverse/rfile.go index 9a680bb..b19ad5e 100644 --- a/internal/fusefrontend_reverse/rfile.go +++ b/internal/fusefrontend_reverse/rfile.go @@ -14,6 +14,7 @@ import ( "github.com/hanwen/go-fuse/fuse/nodefs" "github.com/rfjakob/gocryptfs/internal/contentenc" + "github.com/rfjakob/gocryptfs/internal/pathiv" "github.com/rfjakob/gocryptfs/internal/tlog" ) @@ -60,8 +61,8 @@ func (rfs *ReverseFS) newFile(relPath string, flags uint32) (nodefs.File, fuse.S tlog.Debug.Printf("ino%d: newFile: found in the inode table", st.Ino) derivedIVs = v.(derivedIVContainer) } else { - derivedIVs.id = derivePathIV(relPath, ivPurposeFileID) - derivedIVs.block0IV = derivePathIV(relPath, ivPurposeBlock0IV) + derivedIVs.id = pathiv.Derive(relPath, pathiv.PurposeFileID) + derivedIVs.block0IV = pathiv.Derive(relPath, pathiv.PurposeBlock0IV) // Nlink > 1 means there is more than one path to this file. // Store the derived values so we always return the same data, // regardless of the path that is used to access the file. -- cgit v1.2.3