diriv: use "DirIV" flag to discern and support mounting old filesystems

1 files changed, 11 insertions, 1 deletions

diff --git a/pathfs_frontend/names.go b/pathfs_frontend/names.go
index 9c6e010..122b3dd 100644
--- a/pathfs_frontend/names.go
+++ b/pathfs_frontend/names.go
@@ -1,14 +1,24 @@
 package pathfs_frontend
 
-// This file handles filename encryption
+// This file forwards file encryption operations to cryptfs
+
+import (
+	"github.com/rfjakob/gocryptfs/cryptfs"
+)
 
 func (fs *FS) encryptPath(plainPath string) (string, error) {
+	if !fs.dirIV {
+		return fs.CryptFS.TranslatePathZeroIV(plainPath, cryptfs.OpEncrypt)
+	}
 	fs.dirIVLock.RLock()
 	defer fs.dirIVLock.RUnlock()
 	return fs.CryptFS.EncryptPathDirIV(plainPath, fs.backingDir)
 }
 
 func (fs *FS) decryptPath(cipherPath string) (string, error) {
+	if !fs.dirIV {
+		return fs.CryptFS.TranslatePathZeroIV(cipherPath, cryptfs.OpDecrypt)
+	}
 	fs.dirIVLock.RLock()
 	defer fs.dirIVLock.RUnlock()
 	return fs.CryptFS.DecryptPathDirIV(cipherPath, fs.backingDir)