diff options
| author | Jakob Unterwurzacher | 2017-03-05 22:25:41 +0100 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2017-03-05 22:25:41 +0100 |
| commit | 5b54577d2ec553055c06e05841f626c10368c6b6 (patch) | |
| tree | 9b1739d5b9ccc597186662f4b235c7c71af6c0a9 /internal/fusefrontend_reverse | |
| parent | d0bc7970f721cee607d993406d97d32e2c660abe (diff) | |
nametransform: fix Raw64 not affecting longnames
HashLongName() incorrectly hardcoded the call to base64.URLEncoding.
Diffstat (limited to 'internal/fusefrontend_reverse')
| -rw-r--r-- | internal/fusefrontend_reverse/ctlsock_interface.go | 3 | ||||
| -rw-r--r-- | internal/fusefrontend_reverse/reverse_longnames.go | 2 | ||||
| -rw-r--r-- | internal/fusefrontend_reverse/rfs.go | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/internal/fusefrontend_reverse/ctlsock_interface.go b/internal/fusefrontend_reverse/ctlsock_interface.go index 1f02fc1..4b3ffe6 100644 --- a/internal/fusefrontend_reverse/ctlsock_interface.go +++ b/internal/fusefrontend_reverse/ctlsock_interface.go @@ -6,7 +6,6 @@ import ( "syscall" "github.com/rfjakob/gocryptfs/internal/ctlsock" - "github.com/rfjakob/gocryptfs/internal/nametransform" ) var _ ctlsock.Interface = &ReverseFS{} // Verify that interface is implemented. @@ -24,7 +23,7 @@ func (rfs *ReverseFS) EncryptPath(plainPath string) (string, error) { dirIV := derivePathIV(cipherPath, ivPurposeDirIV) encryptedPart := rfs.nameTransform.EncryptName(part, dirIV) if rfs.args.LongNames && len(encryptedPart) > syscall.NAME_MAX { - encryptedPart = nametransform.HashLongName(encryptedPart) + encryptedPart = rfs.nameTransform.HashLongName(encryptedPart) } cipherPath = filepath.Join(cipherPath, encryptedPart) } diff --git a/internal/fusefrontend_reverse/reverse_longnames.go b/internal/fusefrontend_reverse/reverse_longnames.go index 24335bd..1d19643 100644 --- a/internal/fusefrontend_reverse/reverse_longnames.go +++ b/internal/fusefrontend_reverse/reverse_longnames.go @@ -68,7 +68,7 @@ func (rfs *ReverseFS) findLongnameParent(dir string, dirIV []byte, longname stri if len(cName) <= syscall.NAME_MAX { log.Panic("logic error or wrong shortNameMax constant?") } - hName := nametransform.HashLongName(cName) + hName := rfs.nameTransform.HashLongName(cName) longnameParentCache[hName] = plaintextName if longname == hName { hit = plaintextName diff --git a/internal/fusefrontend_reverse/rfs.go b/internal/fusefrontend_reverse/rfs.go index 1bcbe45..fab3027 100644 --- a/internal/fusefrontend_reverse/rfs.go +++ b/internal/fusefrontend_reverse/rfs.go @@ -319,7 +319,7 @@ func (rfs *ReverseFS) OpenDir(cipherPath string, context *fuse.Context) ([]fuse. } else { cName = rfs.nameTransform.EncryptName(entries[i].Name, dirIV) if len(cName) > syscall.NAME_MAX { - cName = nametransform.HashLongName(cName) + cName = rfs.nameTransform.HashLongName(cName) dotNameFile := fuse.DirEntry{ Mode: syscall.S_IFREG | 0600, Name: cName + nametransform.LongNameSuffix, |