summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2021-08-23 15:05:15 +0200
committerJakob Unterwurzacher2021-08-23 15:05:15 +0200
commit69d88505fd7f4cb0d9e4f1918de296342fe05858 (patch)
treebbe102cb74b8d17b39ef16e3ab9b32cf94a314a4
parentc9abfc8f06e1e0ce8e8b7ca480507647572a5df7 (diff)
go mod: declare module version v2
Our git version is v2+ for some time now, but go.mod still declared v1. Hopefully making both match makes https://pkg.go.dev/github.com/rfjakob/gocryptfs/v2 work. All the import paths have been fixed like this: find . -name \*.go | xargs sed -i s%github.com/rfjakob/gocryptfs/%github.com/rfjakob/gocryptfs/v2/%
-rw-r--r--cli_args.go10
-rw-r--r--cli_args_test.go2
-rw-r--r--contrib/findholes/main.go2
-rw-r--r--contrib/getdents-debug/getdents/getdents.go2
-rw-r--r--contrib/getdents-debug/readdirnames/readdirnames.go2
-rw-r--r--daemonize.go6
-rw-r--r--fsck.go8
-rw-r--r--go.mod2
-rw-r--r--gocryptfs-xray/paths_ctlsock.go2
-rw-r--r--gocryptfs-xray/xray_main.go14
-rw-r--r--gocryptfs-xray/xray_tests/xray_test.go2
-rw-r--r--help.go2
-rw-r--r--info.go8
-rw-r--r--init_dir.go16
-rw-r--r--internal/configfile/config_file.go14
-rw-r--r--internal/configfile/config_test.go2
-rw-r--r--internal/configfile/scrypt.go6
-rw-r--r--internal/configfile/scrypt_test.go2
-rw-r--r--internal/contentenc/content.go8
-rw-r--r--internal/contentenc/content_test.go2
-rw-r--r--internal/contentenc/file_header.go2
-rw-r--r--internal/contentenc/offsets.go2
-rw-r--r--internal/contentenc/offsets_test.go2
-rw-r--r--internal/cryptocore/cryptocore.go6
-rw-r--r--internal/cryptocore/cryptocore_test.go2
-rw-r--r--internal/ctlsocksrv/ctlsock_serve.go4
-rw-r--r--internal/ensurefds012/ensurefds012.go6
-rw-r--r--internal/fido2/fido2.go6
-rw-r--r--internal/fusefrontend/args.go2
-rw-r--r--internal/fusefrontend/ctlsock_interface.go8
-rw-r--r--internal/fusefrontend/dircache.go2
-rw-r--r--internal/fusefrontend/file.go14
-rw-r--r--internal/fusefrontend/file_allocate_truncate.go4
-rw-r--r--internal/fusefrontend/file_holes.go2
-rw-r--r--internal/fusefrontend/file_setattr.go4
-rw-r--r--internal/fusefrontend/node.go6
-rw-r--r--internal/fusefrontend/node_dir_ops.go10
-rw-r--r--internal/fusefrontend/node_helpers.go4
-rw-r--r--internal/fusefrontend/node_open_create.go6
-rw-r--r--internal/fusefrontend/node_prepare_syscall.go4
-rw-r--r--internal/fusefrontend/node_xattr.go6
-rw-r--r--internal/fusefrontend/node_xattr_darwin.go2
-rw-r--r--internal/fusefrontend/node_xattr_linux.go2
-rw-r--r--internal/fusefrontend/prepare_syscall_test.go4
-rw-r--r--internal/fusefrontend/root_node.go14
-rw-r--r--internal/fusefrontend/xattr_unit_test.go6
-rw-r--r--internal/fusefrontend_reverse/ctlsock_interface.go2
-rw-r--r--internal/fusefrontend_reverse/excluder.go6
-rw-r--r--internal/fusefrontend_reverse/excluder_test.go2
-rw-r--r--internal/fusefrontend_reverse/file.go2
-rw-r--r--internal/fusefrontend_reverse/file_helpers.go6
-rw-r--r--internal/fusefrontend_reverse/node.go8
-rw-r--r--internal/fusefrontend_reverse/node_dir_ops.go10
-rw-r--r--internal/fusefrontend_reverse/node_helpers.go6
-rw-r--r--internal/fusefrontend_reverse/root_node.go12
-rw-r--r--internal/fusefrontend_reverse/rpath.go8
-rw-r--r--internal/fusefrontend_reverse/virtualnode.go6
-rw-r--r--internal/inomap/inomap.go2
-rw-r--r--internal/nametransform/badname.go2
-rw-r--r--internal/nametransform/diriv.go8
-rw-r--r--internal/nametransform/longnames.go4
-rw-r--r--internal/nametransform/names.go2
-rw-r--r--internal/nametransform/perms.go4
-rw-r--r--internal/openfiletable/open_file_table.go2
-rw-r--r--internal/pathiv/pathiv.go2
-rw-r--r--internal/readpassword/extpass_test.go2
-rw-r--r--internal/readpassword/passfile.go4
-rw-r--r--internal/readpassword/read.go4
-rw-r--r--internal/serialize_reads/sr.go2
-rw-r--r--internal/speed/speed.go4
-rw-r--r--internal/speed/speed_test.go2
-rw-r--r--internal/stupidgcm/prefer.go4
-rw-r--r--internal/stupidgcm/without_openssl.go2
-rw-r--r--internal/syscallcompat/eintr.go2
-rw-r--r--internal/syscallcompat/getdents_linux.go8
-rw-r--r--internal/syscallcompat/getdents_test.go2
-rw-r--r--internal/syscallcompat/open_nofollow.go2
-rw-r--r--internal/syscallcompat/quirks.go8
-rw-r--r--internal/syscallcompat/quirks_darwin.go8
-rw-r--r--internal/syscallcompat/quirks_linux.go8
-rw-r--r--internal/syscallcompat/sys_common.go2
-rw-r--r--internal/syscallcompat/sys_darwin.go2
-rw-r--r--internal/syscallcompat/sys_linux.go4
-rw-r--r--main.go18
-rw-r--r--masterkey.go8
-rw-r--r--mount.go22
-rw-r--r--profiling.go4
-rw-r--r--sendusr1.go2
-rw-r--r--tests/cli/cli_test.go24
-rw-r--r--tests/cli/zerokey.go2
-rw-r--r--tests/defaults/acl_test.go6
-rw-r--r--tests/defaults/ctlsock_test.go4
-rw-r--r--tests/defaults/diriv_test.go2
-rw-r--r--tests/defaults/main_test.go4
-rw-r--r--tests/defaults/performance_test.go2
-rw-r--r--tests/deterministic_names/deterministic_names_test.go4
-rw-r--r--tests/example_filesystems/example_filesystems_test.go4
-rw-r--r--tests/example_filesystems/example_test_helpers.go2
-rw-r--r--tests/fsck/fsck_test.go4
-rw-r--r--tests/hkdf_sanity/sanity_test.go2
-rw-r--r--tests/matrix/concurrency_test.go6
-rw-r--r--tests/matrix/dir_test.go4
-rw-r--r--tests/matrix/fallocate_test.go6
-rw-r--r--tests/matrix/matrix_test.go10
-rw-r--r--tests/plaintextnames/file_holes_test.go4
-rw-r--r--tests/plaintextnames/plaintextnames_test.go4
-rw-r--r--tests/reverse/correctness_test.go8
-rw-r--r--tests/reverse/ctlsock_test.go4
-rw-r--r--tests/reverse/exclude_test.go8
-rw-r--r--tests/reverse/main_test.go2
-rw-r--r--tests/reverse/one_file_system_test.go2
-rw-r--r--tests/root_test/root_test.go4
-rw-r--r--tests/sharedstorage/sharedstorage_test.go2
-rw-r--r--tests/test_helpers/helpers.go6
-rw-r--r--tests/xattr/xattr_fd_test.go2
-rw-r--r--tests/xattr/xattr_integration_test.go4
116 files changed, 298 insertions, 298 deletions
diff --git a/cli_args.go b/cli_args.go
index d7e3217..d082113 100644
--- a/cli_args.go
+++ b/cli_args.go
@@ -4,7 +4,7 @@ import (
// Should be initialized before anything else.
// This import line MUST be in the alphabetically first source code file of
// package main!
- _ "github.com/rfjakob/gocryptfs/internal/ensurefds012"
+ _ "github.com/rfjakob/gocryptfs/v2/internal/ensurefds012"
"fmt"
"net"
@@ -18,10 +18,10 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/stupidgcm"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// argContainer stores the parsed CLI options and arguments
diff --git a/cli_args_test.go b/cli_args_test.go
index 97f9473..9bb9654 100644
--- a/cli_args_test.go
+++ b/cli_args_test.go
@@ -4,7 +4,7 @@ import (
"reflect"
"testing"
- "github.com/rfjakob/gocryptfs/internal/stupidgcm"
+ "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm"
)
// TestPrefixOArgs checks that the "-o x,y,z" parsing works correctly.
diff --git a/contrib/findholes/main.go b/contrib/findholes/main.go
index 17597ae..ce234b7 100644
--- a/contrib/findholes/main.go
+++ b/contrib/findholes/main.go
@@ -6,7 +6,7 @@ import (
"fmt"
"os"
- "github.com/rfjakob/gocryptfs/contrib/findholes/holes"
+ "github.com/rfjakob/gocryptfs/v2/contrib/findholes/holes"
)
func main() {
diff --git a/contrib/getdents-debug/getdents/getdents.go b/contrib/getdents-debug/getdents/getdents.go
index a3cdac4..781a23d 100644
--- a/contrib/getdents-debug/getdents/getdents.go
+++ b/contrib/getdents-debug/getdents/getdents.go
@@ -1,6 +1,6 @@
/*
Small tool to try to debug unix.Getdents problems on CIFS mounts
-( https://github.com/rfjakob/gocryptfs/issues/483 )
+( https://github.com/rfjakob/gocryptfs/v2/issues/483 )
Example output:
diff --git a/contrib/getdents-debug/readdirnames/readdirnames.go b/contrib/getdents-debug/readdirnames/readdirnames.go
index dc33512..1a29290 100644
--- a/contrib/getdents-debug/readdirnames/readdirnames.go
+++ b/contrib/getdents-debug/readdirnames/readdirnames.go
@@ -1,6 +1,6 @@
/*
Small tool to try to debug unix.Getdents problems on CIFS mounts
-( https://github.com/rfjakob/gocryptfs/issues/483 )
+( https://github.com/rfjakob/gocryptfs/v2/issues/483 )
Example output:
diff --git a/daemonize.go b/daemonize.go
index 6fdd1e4..097a544 100644
--- a/daemonize.go
+++ b/daemonize.go
@@ -7,9 +7,9 @@ import (
"os/signal"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// The child sends us USR1 if the mount was successful. Exit with error code
diff --git a/fsck.go b/fsck.go
index 388071f..4978fdd 100644
--- a/fsck.go
+++ b/fsck.go
@@ -14,10 +14,10 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/fusefrontend"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/fusefrontend"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
type fsckObj struct {
diff --git a/go.mod b/go.mod
index 34491bf..12c5e1a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/rfjakob/gocryptfs
+module github.com/rfjakob/gocryptfs/v2
go 1.16
diff --git a/gocryptfs-xray/paths_ctlsock.go b/gocryptfs-xray/paths_ctlsock.go
index 278916f..e0b526b 100644
--- a/gocryptfs-xray/paths_ctlsock.go
+++ b/gocryptfs-xray/paths_ctlsock.go
@@ -5,7 +5,7 @@ import (
"fmt"
"os"
- "github.com/rfjakob/gocryptfs/ctlsock"
+ "github.com/rfjakob/gocryptfs/v2/ctlsock"
)
func decryptPaths(socketPath string, sep0 bool) {
diff --git a/gocryptfs-xray/xray_main.go b/gocryptfs-xray/xray_main.go
index 20c31ab..ffcd239 100644
--- a/gocryptfs-xray/xray_main.go
+++ b/gocryptfs-xray/xray_main.go
@@ -8,13 +8,13 @@ import (
"os"
"runtime"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/fido2"
- "github.com/rfjakob/gocryptfs/internal/readpassword"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/fido2"
+ "github.com/rfjakob/gocryptfs/v2/internal/readpassword"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// GitVersion is the gocryptfs version according to git, set by build.bash
diff --git a/gocryptfs-xray/xray_tests/xray_test.go b/gocryptfs-xray/xray_tests/xray_test.go
index 2df83f2..6dc7c13 100644
--- a/gocryptfs-xray/xray_tests/xray_test.go
+++ b/gocryptfs-xray/xray_tests/xray_test.go
@@ -7,7 +7,7 @@ import (
"os/exec"
"testing"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func TestAesgcmXray(t *testing.T) {
diff --git a/help.go b/help.go
index d462b04..2a79e22 100644
--- a/help.go
+++ b/help.go
@@ -3,7 +3,7 @@ package main
import (
"fmt"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const tUsage = "" +
diff --git a/info.go b/info.go
index bbc5a10..f571420 100644
--- a/info.go
+++ b/info.go
@@ -7,10 +7,10 @@ import (
"os"
"strings"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// info pretty-prints the contents of the config file at "filename" for human
diff --git a/init_dir.go b/init_dir.go
index ae00565..8f11351 100644
--- a/init_dir.go
+++ b/init_dir.go
@@ -8,14 +8,14 @@ import (
"strings"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/fido2"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/readpassword"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/fido2"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/readpassword"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// isEmptyDir checks if "dir" exists and is an empty directory.
diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go
index 025e1c3..d457db6 100644
--- a/internal/configfile/config_file.go
+++ b/internal/configfile/config_file.go
@@ -12,10 +12,10 @@ import (
"os"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
@@ -223,10 +223,10 @@ func Load(filename string) (*ConfFile, error) {
The filesystem was created by gocryptfs v0.6 or earlier. This version of
gocryptfs can no longer mount the filesystem.
Please download gocryptfs v0.11 and upgrade your filesystem,
- see https://github.com/rfjakob/gocryptfs/wiki/Upgrading for instructions.
+ see https://github.com/rfjakob/gocryptfs/v2/wiki/Upgrading for instructions.
If you have trouble upgrading, join the discussion at
- https://github.com/rfjakob/gocryptfs/issues/29 .
+ https://github.com/rfjakob/gocryptfs/v2/issues/29 .
`+tlog.ColorReset)
@@ -312,7 +312,7 @@ func (cf *ConfFile) WriteFile() error {
err = fd.Sync()
if err != nil {
// This can happen on network drives: FRITZ.NAS mounted on MacOS returns
- // "operation not supported": https://github.com/rfjakob/gocryptfs/issues/390
+ // "operation not supported": https://github.com/rfjakob/gocryptfs/v2/issues/390
tlog.Warn.Printf("Warning: fsync failed: %v", err)
// Try sync instead
syscall.Sync()
diff --git a/internal/configfile/config_test.go b/internal/configfile/config_test.go
index c03be90..6986888 100644
--- a/internal/configfile/config_test.go
+++ b/internal/configfile/config_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"time"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
var testPw = []byte("test")
diff --git a/internal/configfile/scrypt.go b/internal/configfile/scrypt.go
index 54fe0c6..7ac822e 100644
--- a/internal/configfile/scrypt.go
+++ b/internal/configfile/scrypt.go
@@ -7,9 +7,9 @@ import (
"golang.org/x/crypto/scrypt"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
diff --git a/internal/configfile/scrypt_test.go b/internal/configfile/scrypt_test.go
index 8f7a5c8..30f37a1 100644
--- a/internal/configfile/scrypt_test.go
+++ b/internal/configfile/scrypt_test.go
@@ -17,7 +17,7 @@ BenchmarkScrypt14-2 20 92561590 ns/op ... 92ms
BenchmarkScrypt15-2 10 183971593 ns/op
BenchmarkScrypt16-2 3 368506365 ns/op
BenchmarkScrypt17-2 2 755502608 ns/op ... 755ms
-ok github.com/rfjakob/gocryptfs/cryptfs 18.772s
+ok github.com/rfjakob/gocryptfs/v2/cryptfs 18.772s
*/
func benchmarkScryptN(n int, b *testing.B) {
diff --git a/internal/contentenc/content.go b/internal/contentenc/content.go
index e023492..01cabb8 100644
--- a/internal/contentenc/content.go
+++ b/internal/contentenc/content.go
@@ -12,9 +12,9 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/stupidgcm"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// NonceMode determines how nonces are created.
@@ -179,7 +179,7 @@ func (be *ContentEnc) DecryptBlock(ciphertext []byte, blockNo uint64, fileID []b
nonce := ciphertext[:be.cryptoCore.IVLen]
if bytes.Equal(nonce, be.allZeroNonce) {
// Bug in tmpfs?
- // https://github.com/rfjakob/gocryptfs/issues/56
+ // https://github.com/rfjakob/gocryptfs/v2/issues/56
// http://www.spinics.net/lists/kernel/msg2370127.html
return nil, errors.New("all-zero nonce")
}
diff --git a/internal/contentenc/content_test.go b/internal/contentenc/content_test.go
index 998e9b8..9cc8753 100644
--- a/internal/contentenc/content_test.go
+++ b/internal/contentenc/content_test.go
@@ -3,7 +3,7 @@ package contentenc
import (
"testing"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
)
type testRange struct {
diff --git a/internal/contentenc/file_header.go b/internal/contentenc/file_header.go
index 6ce2e3b..8c9c054 100644
--- a/internal/contentenc/file_header.go
+++ b/internal/contentenc/file_header.go
@@ -11,7 +11,7 @@ import (
"fmt"
"log"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
)
const (
diff --git a/internal/contentenc/offsets.go b/internal/contentenc/offsets.go
index 3a0abf3..d3b9d7a 100644
--- a/internal/contentenc/offsets.go
+++ b/internal/contentenc/offsets.go
@@ -3,7 +3,7 @@ package contentenc
import (
"log"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// Contentenc methods that translate offsets between ciphertext and plaintext
diff --git a/internal/contentenc/offsets_test.go b/internal/contentenc/offsets_test.go
index c3b8fcd..768393c 100644
--- a/internal/contentenc/offsets_test.go
+++ b/internal/contentenc/offsets_test.go
@@ -4,7 +4,7 @@ import (
"fmt"
"testing"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
)
// TestSizeToSize tests CipherSizeToPlainSize and PlainSizeToCipherSize
diff --git a/internal/cryptocore/cryptocore.go b/internal/cryptocore/cryptocore.go
index 5729952..5da88db 100644
--- a/internal/cryptocore/cryptocore.go
+++ b/internal/cryptocore/cryptocore.go
@@ -12,9 +12,9 @@ import (
"github.com/rfjakob/eme"
- "github.com/rfjakob/gocryptfs/internal/siv_aead"
- "github.com/rfjakob/gocryptfs/internal/stupidgcm"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/siv_aead"
+ "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
diff --git a/internal/cryptocore/cryptocore_test.go b/internal/cryptocore/cryptocore_test.go
index e595ef6..319a900 100644
--- a/internal/cryptocore/cryptocore_test.go
+++ b/internal/cryptocore/cryptocore_test.go
@@ -3,7 +3,7 @@ package cryptocore
import (
"testing"
- "github.com/rfjakob/gocryptfs/internal/stupidgcm"
+ "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm"
)
// "New" should accept at least these param combinations
diff --git a/internal/ctlsocksrv/ctlsock_serve.go b/internal/ctlsocksrv/ctlsock_serve.go
index b63759e..85f5b65 100644
--- a/internal/ctlsocksrv/ctlsock_serve.go
+++ b/internal/ctlsocksrv/ctlsock_serve.go
@@ -11,8 +11,8 @@ import (
"os"
"syscall"
- "github.com/rfjakob/gocryptfs/ctlsock"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/ctlsock"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// Interface should be implemented by fusefrontend[_reverse]
diff --git a/internal/ensurefds012/ensurefds012.go b/internal/ensurefds012/ensurefds012.go
index 4e772c6..09b3fc2 100644
--- a/internal/ensurefds012/ensurefds012.go
+++ b/internal/ensurefds012/ensurefds012.go
@@ -5,7 +5,7 @@
//
// Use like this:
//
-// import _ "github.com/rfjakob/gocryptfs/internal/ensurefds012"
+// import _ "github.com/rfjakob/gocryptfs/v2/internal/ensurefds012"
//
// The import line MUST be in the alphabitcally first source code file of
// package main!
@@ -25,14 +25,14 @@
// l-wx------. 1 jakob jakob 64 Jan 5 15:54 3 -> /dev/null
// lrwx------. 1 jakob jakob 64 Jan 5 15:54 4 -> 'anon_inode:[eventpoll]'
//
-// See https://github.com/rfjakob/gocryptfs/issues/320 for details.
+// See https://github.com/rfjakob/gocryptfs/v2/issues/320 for details.
package ensurefds012
import (
"os"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
)
func init() {
diff --git a/internal/fido2/fido2.go b/internal/fido2/fido2.go
index 663d65c..fa6015e 100644
--- a/internal/fido2/fido2.go
+++ b/internal/fido2/fido2.go
@@ -9,9 +9,9 @@ import (
"os/exec"
"strings"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
type fidoCommand int
diff --git a/internal/fusefrontend/args.go b/internal/fusefrontend/args.go
index e20987b..677ffd6 100644
--- a/internal/fusefrontend/args.go
+++ b/internal/fusefrontend/args.go
@@ -42,7 +42,7 @@ type Args struct {
// Suid is true if the filesystem has been mounted with the "-suid" flag.
// If it is false, we can ignore the GETXATTR "security.capability" calls,
// which are a performance problem for writes. See
- // https://github.com/rfjakob/gocryptfs/issues/515 for details.
+ // https://github.com/rfjakob/gocryptfs/v2/issues/515 for details.
Suid bool
// Enable the FUSE kernel_cache option
KernelCache bool
diff --git a/internal/fusefrontend/ctlsock_interface.go b/internal/fusefrontend/ctlsock_interface.go
index 87f0dc3..2afe4e0 100644
--- a/internal/fusefrontend/ctlsock_interface.go
+++ b/internal/fusefrontend/ctlsock_interface.go
@@ -6,10 +6,10 @@ import (
"strings"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/ctlsocksrv"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/ctlsocksrv"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
var _ ctlsocksrv.Interface = &RootNode{} // Verify that interface is implemented.
diff --git a/internal/fusefrontend/dircache.go b/internal/fusefrontend/dircache.go
index 8c285fa..83a1e66 100644
--- a/internal/fusefrontend/dircache.go
+++ b/internal/fusefrontend/dircache.go
@@ -7,7 +7,7 @@ import (
"syscall"
"time"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
diff --git a/internal/fusefrontend/file.go b/internal/fusefrontend/file.go
index ef043ae..9481abf 100644
--- a/internal/fusefrontend/file.go
+++ b/internal/fusefrontend/file.go
@@ -17,13 +17,13 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/inomap"
- "github.com/rfjakob/gocryptfs/internal/openfiletable"
- "github.com/rfjakob/gocryptfs/internal/serialize_reads"
- "github.com/rfjakob/gocryptfs/internal/stupidgcm"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/inomap"
+ "github.com/rfjakob/gocryptfs/v2/internal/openfiletable"
+ "github.com/rfjakob/gocryptfs/v2/internal/serialize_reads"
+ "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// File implements the go-fuse v2 API (github.com/hanwen/go-fuse/v2/fs)
diff --git a/internal/fusefrontend/file_allocate_truncate.go b/internal/fusefrontend/file_allocate_truncate.go
index f4e6099..fddcfe8 100644
--- a/internal/fusefrontend/file_allocate_truncate.go
+++ b/internal/fusefrontend/file_allocate_truncate.go
@@ -11,8 +11,8 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// FALLOC_DEFAULT is a "normal" fallocate operation
diff --git a/internal/fusefrontend/file_holes.go b/internal/fusefrontend/file_holes.go
index cb44803..f35fa70 100644
--- a/internal/fusefrontend/file_holes.go
+++ b/internal/fusefrontend/file_holes.go
@@ -9,7 +9,7 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// Will a write to plaintext offset "targetOff" create a file hole in the
diff --git a/internal/fusefrontend/file_setattr.go b/internal/fusefrontend/file_setattr.go
index 0d6dc48..fe4bc47 100644
--- a/internal/fusefrontend/file_setattr.go
+++ b/internal/fusefrontend/file_setattr.go
@@ -7,8 +7,8 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
func (f *File) Setattr(ctx context.Context, in *fuse.SetAttrIn, out *fuse.AttrOut) (errno syscall.Errno) {
diff --git a/internal/fusefrontend/node.go b/internal/fusefrontend/node.go
index 0f63fdf..99d337f 100644
--- a/internal/fusefrontend/node.go
+++ b/internal/fusefrontend/node.go
@@ -9,9 +9,9 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// Node is a file or directory in the filesystem tree
diff --git a/internal/fusefrontend/node_dir_ops.go b/internal/fusefrontend/node_dir_ops.go
index c4ab861..97e4caa 100644
--- a/internal/fusefrontend/node_dir_ops.go
+++ b/internal/fusefrontend/node_dir_ops.go
@@ -12,11 +12,11 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const dsStoreName = ".DS_Store"
diff --git a/internal/fusefrontend/node_helpers.go b/internal/fusefrontend/node_helpers.go
index 8d1749d..46046f1 100644
--- a/internal/fusefrontend/node_helpers.go
+++ b/internal/fusefrontend/node_helpers.go
@@ -9,8 +9,8 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// toFuseCtx tries to extract a fuse.Context from a generic context.Context.
diff --git a/internal/fusefrontend/node_open_create.go b/internal/fusefrontend/node_open_create.go
index 6385bc1..eb45fb4 100644
--- a/internal/fusefrontend/node_open_create.go
+++ b/internal/fusefrontend/node_open_create.go
@@ -7,9 +7,9 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// Open - FUSE call. Open already-existing file.
diff --git a/internal/fusefrontend/node_prepare_syscall.go b/internal/fusefrontend/node_prepare_syscall.go
index 8a0e75c..2a4d6ab 100644
--- a/internal/fusefrontend/node_prepare_syscall.go
+++ b/internal/fusefrontend/node_prepare_syscall.go
@@ -4,11 +4,11 @@ import (
"sync/atomic"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
"github.com/hanwen/go-fuse/v2/fs"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
// prepareAtSyscall returns a (dirfd, cName) pair that can be used
diff --git a/internal/fusefrontend/node_xattr.go b/internal/fusefrontend/node_xattr.go
index ceb10f1..d5d8c5b 100644
--- a/internal/fusefrontend/node_xattr.go
+++ b/internal/fusefrontend/node_xattr.go
@@ -9,7 +9,7 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// -1 as uint32
@@ -24,7 +24,7 @@ var xattrNameIV = []byte("xattr_name_iv_xx")
var xattrStorePrefix = "user.gocryptfs."
// We get one read of this xattr for each write -
-// see https://github.com/rfjakob/gocryptfs/issues/515 for details.
+// see https://github.com/rfjakob/gocryptfs/v2/issues/515 for details.
var xattrCapability = "security.capability"
// isAcl returns true if the attribute name is for storing ACLs
@@ -41,7 +41,7 @@ func (n *Node) Getxattr(ctx context.Context, attr string, dest []byte) (uint32,
rn := n.rootNode()
// If we are not mounted with -suid, reading the capability xattr does not
// make a lot of sense, so reject the request and gain a massive speedup.
- // See https://github.com/rfjakob/gocryptfs/issues/515 .
+ // See https://github.com/rfjakob/gocryptfs/v2/issues/515 .
if !rn.args.Suid && attr == xattrCapability {
// Returning EOPNOTSUPP is what we did till
// ca9e912a28b901387e1dbb85f6c531119f2d5ef2 "fusefrontend: drop xattr user namespace restriction"
diff --git a/internal/fusefrontend/node_xattr_darwin.go b/internal/fusefrontend/node_xattr_darwin.go
index 31ba653..8c8a153 100644
--- a/internal/fusefrontend/node_xattr_darwin.go
+++ b/internal/fusefrontend/node_xattr_darwin.go
@@ -8,7 +8,7 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
// On Darwin we have to unset XATTR_NOSECURITY 0x0008
diff --git a/internal/fusefrontend/node_xattr_linux.go b/internal/fusefrontend/node_xattr_linux.go
index 212d4e1..4a356a5 100644
--- a/internal/fusefrontend/node_xattr_linux.go
+++ b/internal/fusefrontend/node_xattr_linux.go
@@ -9,7 +9,7 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
func filterXattrSetFlags(flags int) int {
diff --git a/internal/fusefrontend/prepare_syscall_test.go b/internal/fusefrontend/prepare_syscall_test.go
index 693f62a..acddaf3 100644
--- a/internal/fusefrontend/prepare_syscall_test.go
+++ b/internal/fusefrontend/prepare_syscall_test.go
@@ -9,8 +9,8 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func TestPrepareAtSyscall(t *testing.T) {
diff --git a/internal/fusefrontend/root_node.go b/internal/fusefrontend/root_node.go
index a2de953..34b084b 100644
--- a/internal/fusefrontend/root_node.go
+++ b/internal/fusefrontend/root_node.go
@@ -7,13 +7,13 @@ import (
"syscall"
"time"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/inomap"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/serialize_reads"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/inomap"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/serialize_reads"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// RootNode is the root of the filesystem tree of Nodes.
diff --git a/internal/fusefrontend/xattr_unit_test.go b/internal/fusefrontend/xattr_unit_test.go
index 397e3ef..7449d24 100644
--- a/internal/fusefrontend/xattr_unit_test.go
+++ b/internal/fusefrontend/xattr_unit_test.go
@@ -9,9 +9,9 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
)
func newTestFS(args Args) *RootNode {
diff --git a/internal/fusefrontend_reverse/ctlsock_interface.go b/internal/fusefrontend_reverse/ctlsock_interface.go
index 1cfdf3e..9266cbf 100644
--- a/internal/fusefrontend_reverse/ctlsock_interface.go
+++ b/internal/fusefrontend_reverse/ctlsock_interface.go
@@ -6,7 +6,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/rfjakob/gocryptfs/internal/ctlsocksrv"
+ "github.com/rfjakob/gocryptfs/v2/internal/ctlsocksrv"
)
// Verify that the interface is implemented.
diff --git a/internal/fusefrontend_reverse/excluder.go b/internal/fusefrontend_reverse/excluder.go
index d5b3319..0faadfa 100644
--- a/internal/fusefrontend_reverse/excluder.go
+++ b/internal/fusefrontend_reverse/excluder.go
@@ -6,9 +6,9 @@ import (
"os"
"strings"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/fusefrontend"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/fusefrontend"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
"github.com/sabhiram/go-gitignore"
)
diff --git a/internal/fusefrontend_reverse/excluder_test.go b/internal/fusefrontend_reverse/excluder_test.go
index e44c0e0..bb041ce 100644
--- a/internal/fusefrontend_reverse/excluder_test.go
+++ b/internal/fusefrontend_reverse/excluder_test.go
@@ -6,7 +6,7 @@ import (
"reflect"
"testing"
- "github.com/rfjakob/gocryptfs/internal/fusefrontend"
+ "github.com/rfjakob/gocryptfs/v2/internal/fusefrontend"
)
func TestShouldPrefixExcludeValuesWithSlash(t *testing.T) {
diff --git a/internal/fusefrontend_reverse/file.go b/internal/fusefrontend_reverse/file.go
index 294872f..bc917ac 100644
--- a/internal/fusefrontend_reverse/file.go
+++ b/internal/fusefrontend_reverse/file.go
@@ -9,7 +9,7 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
)
type File struct {
diff --git a/internal/fusefrontend_reverse/file_helpers.go b/internal/fusefrontend_reverse/file_helpers.go
index f024e69..4ded5d6 100644
--- a/internal/fusefrontend_reverse/file_helpers.go
+++ b/internal/fusefrontend_reverse/file_helpers.go
@@ -5,9 +5,9 @@ import (
"io"
"sync"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/pathiv"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/pathiv"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
var inodeTable sync.Map
diff --git a/internal/fusefrontend_reverse/node.go b/internal/fusefrontend_reverse/node.go
index 1b2fd67..170410f 100644
--- a/internal/fusefrontend_reverse/node.go
+++ b/internal/fusefrontend_reverse/node.go
@@ -12,10 +12,10 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/pathiv"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/pathiv"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// Node is a file or directory in the filesystem tree
diff --git a/internal/fusefrontend_reverse/node_dir_ops.go b/internal/fusefrontend_reverse/node_dir_ops.go
index 2592ebc..05e2f49 100644
--- a/internal/fusefrontend_reverse/node_dir_ops.go
+++ b/internal/fusefrontend_reverse/node_dir_ops.go
@@ -10,11 +10,11 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// Readdir - FUSE call.
diff --git a/internal/fusefrontend_reverse/node_helpers.go b/internal/fusefrontend_reverse/node_helpers.go
index b7dc086..96c3c2d 100644
--- a/internal/fusefrontend_reverse/node_helpers.go
+++ b/internal/fusefrontend_reverse/node_helpers.go
@@ -11,9 +11,9 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/pathiv"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/pathiv"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
const (
diff --git a/internal/fusefrontend_reverse/root_node.go b/internal/fusefrontend_reverse/root_node.go
index 5ce7f81..d4c1e37 100644
--- a/internal/fusefrontend_reverse/root_node.go
+++ b/internal/fusefrontend_reverse/root_node.go
@@ -6,18 +6,18 @@ import (
"strings"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
"golang.org/x/sys/unix"
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/fusefrontend"
- "github.com/rfjakob/gocryptfs/internal/inomap"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/fusefrontend"
+ "github.com/rfjakob/gocryptfs/v2/internal/inomap"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
"github.com/sabhiram/go-gitignore"
)
diff --git a/internal/fusefrontend_reverse/rpath.go b/internal/fusefrontend_reverse/rpath.go
index 7ebedd7..9625dc2 100644
--- a/internal/fusefrontend_reverse/rpath.go
+++ b/internal/fusefrontend_reverse/rpath.go
@@ -7,10 +7,10 @@ import (
"strings"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/pathiv"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/pathiv"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// rDecryptName decrypts the ciphertext name "cName", given the dirIV of the
diff --git a/internal/fusefrontend_reverse/virtualnode.go b/internal/fusefrontend_reverse/virtualnode.go
index 328f021..688f536 100644
--- a/internal/fusefrontend_reverse/virtualnode.go
+++ b/internal/fusefrontend_reverse/virtualnode.go
@@ -8,9 +8,9 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/inomap"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/inomap"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
)
const (
diff --git a/internal/inomap/inomap.go b/internal/inomap/inomap.go
index 630ba18..97f9b61 100644
--- a/internal/inomap/inomap.go
+++ b/internal/inomap/inomap.go
@@ -19,7 +19,7 @@ import (
"sync"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
diff --git a/internal/nametransform/badname.go b/internal/nametransform/badname.go
index 44b7d36..eed0061 100644
--- a/internal/nametransform/badname.go
+++ b/internal/nametransform/badname.go
@@ -8,7 +8,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
const (
diff --git a/internal/nametransform/diriv.go b/internal/nametransform/diriv.go
index 3a80baa..dc6b21d 100644
--- a/internal/nametransform/diriv.go
+++ b/internal/nametransform/diriv.go
@@ -7,9 +7,9 @@ import (
"os"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
@@ -68,7 +68,7 @@ func WriteDirIVAt(dirfd int) error {
iv := cryptocore.RandBytes(DirIVLen)
// 0400 permissions: gocryptfs.diriv should never be modified after creation.
// Don't use "ioutil.WriteFile", it causes trouble on NFS:
- // https://github.com/rfjakob/gocryptfs/commit/7d38f80a78644c8ec4900cc990bfb894387112ed
+ // https://github.com/rfjakob/gocryptfs/v2/commit/7d38f80a78644c8ec4900cc990bfb894387112ed
fd, err := syscallcompat.Openat(dirfd, DirIVFilename, os.O_WRONLY|os.O_CREATE|os.O_EXCL, dirivPerms)
if err != nil {
tlog.Warn.Printf("WriteDirIV: Openat: %v", err)
diff --git a/internal/nametransform/longnames.go b/internal/nametransform/longnames.go
index bf8060b..1c2857a 100644
--- a/internal/nametransform/longnames.go
+++ b/internal/nametransform/longnames.go
@@ -9,8 +9,8 @@ import (
"strings"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
diff --git a/internal/nametransform/names.go b/internal/nametransform/names.go
index 412ccc0..d766d2f 100644
--- a/internal/nametransform/names.go
+++ b/internal/nametransform/names.go
@@ -9,7 +9,7 @@ import (
"github.com/rfjakob/eme"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
diff --git a/internal/nametransform/perms.go b/internal/nametransform/perms.go
index cfcd062..6b88afd 100644
--- a/internal/nametransform/perms.go
+++ b/internal/nametransform/perms.go
@@ -6,14 +6,14 @@ const (
// never chmod'ed or chown'ed.
//
// Group-readable so the FS can be mounted by several users in the same group
- // (see https://github.com/rfjakob/gocryptfs/issues/387 ).
+ // (see https://github.com/rfjakob/gocryptfs/v2/issues/387 ).
//
// Note that gocryptfs.conf is still created with 0400 permissions so the
// owner must explicitly chmod it to permit access.
//
// World-readable so an encrypted directory can be copied by the non-root
// owner when gocryptfs is running as root
- // ( https://github.com/rfjakob/gocryptfs/issues/539 ).
+ // ( https://github.com/rfjakob/gocryptfs/v2/issues/539 ).
dirivPerms = 0444
// Permissions for gocryptfs.longname.[sha256].name files.
diff --git a/internal/openfiletable/open_file_table.go b/internal/openfiletable/open_file_table.go
index dfd9637..ce8df76 100644
--- a/internal/openfiletable/open_file_table.go
+++ b/internal/openfiletable/open_file_table.go
@@ -8,7 +8,7 @@ import (
"sync"
"sync/atomic"
- "github.com/rfjakob/gocryptfs/internal/inomap"
+ "github.com/rfjakob/gocryptfs/v2/internal/inomap"
)
// wlock - serializes write accesses to each file (identified by inode number)
diff --git a/internal/pathiv/pathiv.go b/internal/pathiv/pathiv.go
index 08042e9..48f8426 100644
--- a/internal/pathiv/pathiv.go
+++ b/internal/pathiv/pathiv.go
@@ -4,7 +4,7 @@ import (
"crypto/sha256"
"encoding/binary"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
)
// Purpose identifies for which purpose the IV will be used. This is mixed into the
diff --git a/internal/readpassword/extpass_test.go b/internal/readpassword/extpass_test.go
index ea05893..5c23ab3 100644
--- a/internal/readpassword/extpass_test.go
+++ b/internal/readpassword/extpass_test.go
@@ -5,7 +5,7 @@ import (
"os/exec"
"testing"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
func TestMain(m *testing.M) {
diff --git a/internal/readpassword/passfile.go b/internal/readpassword/passfile.go
index df6cd4d..29fde6c 100644
--- a/internal/readpassword/passfile.go
+++ b/internal/readpassword/passfile.go
@@ -4,8 +4,8 @@ import (
"bytes"
"os"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// readPassFileConcatenate reads the first line from each file name and
diff --git a/internal/readpassword/read.go b/internal/readpassword/read.go
index e116f0b..c0dce43 100644
--- a/internal/readpassword/read.go
+++ b/internal/readpassword/read.go
@@ -11,8 +11,8 @@ import (
"golang.org/x/crypto/ssh/terminal"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
diff --git a/internal/serialize_reads/sr.go b/internal/serialize_reads/sr.go
index 96cec4f..88115f9 100644
--- a/internal/serialize_reads/sr.go
+++ b/internal/serialize_reads/sr.go
@@ -5,7 +5,7 @@ import (
"sync"
"time"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// serializerState is used by the Wait and Done functions
diff --git a/internal/speed/speed.go b/internal/speed/speed.go
index e097c55..4844845 100644
--- a/internal/speed/speed.go
+++ b/internal/speed/speed.go
@@ -14,8 +14,8 @@ import (
"golang.org/x/crypto/chacha20poly1305"
- "github.com/rfjakob/gocryptfs/internal/siv_aead"
- "github.com/rfjakob/gocryptfs/internal/stupidgcm"
+ "github.com/rfjakob/gocryptfs/v2/internal/siv_aead"
+ "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm"
)
// 128-bit file ID + 64 bit block number = 192 bits = 24 bytes
diff --git a/internal/speed/speed_test.go b/internal/speed/speed_test.go
index 1e9d859..f3ec66c 100644
--- a/internal/speed/speed_test.go
+++ b/internal/speed/speed_test.go
@@ -9,7 +9,7 @@ BenchmarkStupidGCM-2 100000 22552 ns/op 181.62 MB/s
BenchmarkGoGCM-2 20000 81871 ns/op 50.03 MB/s
BenchmarkAESSIV-2 10000 104623 ns/op 39.15 MB/s
PASS
-ok github.com/rfjakob/gocryptfs/internal/speed 6.022s
+ok github.com/rfjakob/gocryptfs/v2/internal/speed 6.022s
*/
import (
diff --git a/internal/stupidgcm/prefer.go b/internal/stupidgcm/prefer.go
index bacd56a..94c1b6c 100644
--- a/internal/stupidgcm/prefer.go
+++ b/internal/stupidgcm/prefer.go
@@ -14,7 +14,7 @@ import (
// 2) Is ARM64 && has AES instructions && Go is v1.11 or higher
// (commit https://github.com/golang/go/commit/4f1f503373cda7160392be94e3849b0c9b9ebbda)
//
-// See https://github.com/rfjakob/gocryptfs/wiki/CPU-Benchmarks
+// See https://github.com/rfjakob/gocryptfs/v2/wiki/CPU-Benchmarks
// for benchmarks.
func PreferOpenSSL() bool {
if BuiltWithoutOpenssl {
@@ -26,7 +26,7 @@ func PreferOpenSSL() bool {
return false
}
// On the Apple M1, Go stdlib is faster than OpenSSL, despite cpu.ARM64.HasAES
- // reading false: https://github.com/rfjakob/gocryptfs/issues/556#issuecomment-848079309
+ // reading false: https://github.com/rfjakob/gocryptfs/v2/issues/556#issuecomment-848079309
if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
return false
}
diff --git a/internal/stupidgcm/without_openssl.go b/internal/stupidgcm/without_openssl.go
index deac342..4a14e73 100644
--- a/internal/stupidgcm/without_openssl.go
+++ b/internal/stupidgcm/without_openssl.go
@@ -6,7 +6,7 @@ import (
"fmt"
"os"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
)
type StupidGCM struct{}
diff --git a/internal/syscallcompat/eintr.go b/internal/syscallcompat/eintr.go
index cdde806..2e2bb18 100644
--- a/internal/syscallcompat/eintr.go
+++ b/internal/syscallcompat/eintr.go
@@ -12,7 +12,7 @@ import (
// https://github.com/golang/go/blob/d2a80f3fb5b44450e0b304ac5a718f99c053d82a/src/os/file_posix.go#L243
//
// This is needed because CIFS throws lots of EINTR errors:
-// https://github.com/rfjakob/gocryptfs/issues/483
+// https://github.com/rfjakob/gocryptfs/v2/issues/483
//
// Don't use retryEINTR() with syscall.Close()!
// See https://code.google.com/p/chromium/issues/detail?id=269623 .
diff --git a/internal/syscallcompat/getdents_linux.go b/internal/syscallcompat/getdents_linux.go
index 852b3cd..2ad7cde 100644
--- a/internal/syscallcompat/getdents_linux.go
+++ b/internal/syscallcompat/getdents_linux.go
@@ -16,14 +16,14 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const sizeofDirent = int(unsafe.Sizeof(unix.Dirent{}))
// maxReclen sanity check: Reclen should never be larger than this.
// Due to padding between entries, it is 280 even on 32-bit architectures.
-// See https://github.com/rfjakob/gocryptfs/issues/197 for details.
+// See https://github.com/rfjakob/gocryptfs/v2/issues/197 for details.
const maxReclen = 280
// getdents wraps unix.Getdents and converts the result to []fuse.DirEntry.
@@ -43,7 +43,7 @@ func getdents(fd int) (entries []fuse.DirEntry, entriesSpecial []fuse.DirEntry,
continue
} else if err != nil {
if smartBuf.Len() > 0 {
- tlog.Warn.Printf("warning: unix.Getdents returned errno %d in the middle of data ( https://github.com/rfjakob/gocryptfs/issues/483 )", err.(syscall.Errno))
+ tlog.Warn.Printf("warning: unix.Getdents returned errno %d in the middle of data ( https://github.com/rfjakob/gocryptfs/v2/issues/483 )", err.(syscall.Errno))
return nil, nil, syscall.EIO
}
return nil, nil, err
@@ -145,7 +145,7 @@ func dtUnknownWarn(dirfd int) {
if err == nil && buf.Type == XFS_SUPER_MAGIC {
// Old XFS filesystems always return DT_UNKNOWN. Downgrade the message
// to "info" level if we are on XFS.
- // https://github.com/rfjakob/gocryptfs/issues/267
+ // https://github.com/rfjakob/gocryptfs/v2/issues/267
tlog.Info.Printf("Getdents: convertDType: received DT_UNKNOWN, fstype=xfs, falling back to stat")
} else {
tlog.Warn.Printf("Getdents: convertDType: received DT_UNKNOWN, fstype=%#x, falling back to stat",
diff --git a/internal/syscallcompat/getdents_test.go b/internal/syscallcompat/getdents_test.go
index a6f41ca..6c746bc 100644
--- a/internal/syscallcompat/getdents_test.go
+++ b/internal/syscallcompat/getdents_test.go
@@ -27,7 +27,7 @@ func TestGetdents(t *testing.T) {
// skipOnGccGo skips the emulateGetdents test when we are
// running linux and were compiled with gccgo. The test is known to fail
-// (https://github.com/rfjakob/gocryptfs/issues/201), but getdents emulation
+// (https://github.com/rfjakob/gocryptfs/v2/issues/201), but getdents emulation
// is not used on linux, so let's skip the test and ignore the failure.
func skipOnGccGo(t *testing.T) {
if !emulate || runtime.GOOS != "linux" {
diff --git a/internal/syscallcompat/open_nofollow.go b/internal/syscallcompat/open_nofollow.go
index f8e50e3..da28938 100644
--- a/internal/syscallcompat/open_nofollow.go
+++ b/internal/syscallcompat/open_nofollow.go
@@ -5,7 +5,7 @@ import (
"strings"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// OpenDirNofollow opens the dir at "relPath" in a way that is secure against
diff --git a/internal/syscallcompat/quirks.go b/internal/syscallcompat/quirks.go
index 60d584d..cfcf3ff 100644
--- a/internal/syscallcompat/quirks.go
+++ b/internal/syscallcompat/quirks.go
@@ -1,17 +1,17 @@
package syscallcompat
import (
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
// QuirkBrokenFalloc means the falloc is broken.
- // Preallocation on Btrfs is broken ( https://github.com/rfjakob/gocryptfs/issues/395 )
- // and slow ( https://github.com/rfjakob/gocryptfs/issues/63 ).
+ // Preallocation on Btrfs is broken ( https://github.com/rfjakob/gocryptfs/v2/issues/395 )
+ // and slow ( https://github.com/rfjakob/gocryptfs/v2/issues/63 ).
QuirkBrokenFalloc = uint64(1 << iota)
// QuirkDuplicateIno1 means that we have duplicate inode numbers.
// On MacOS ExFAT, all empty files share inode number 1:
- // https://github.com/rfjakob/gocryptfs/issues/585
+ // https://github.com/rfjakob/gocryptfs/v2/issues/585
QuirkDuplicateIno1
)
diff --git a/internal/syscallcompat/quirks_darwin.go b/internal/syscallcompat/quirks_darwin.go
index f4e7e71..aca3d99 100644
--- a/internal/syscallcompat/quirks_darwin.go
+++ b/internal/syscallcompat/quirks_darwin.go
@@ -3,12 +3,12 @@ package syscallcompat
import (
"golang.org/x/sys/unix"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
func DetectQuirks(cipherdir string) (q uint64) {
const (
- // From https://github.com/rfjakob/gocryptfs/issues/585#issuecomment-887370065
+ // From https://github.com/rfjakob/gocryptfs/v2/issues/585#issuecomment-887370065
FstypenameExfat = "exfat"
)
@@ -31,9 +31,9 @@ func DetectQuirks(cipherdir string) (q uint64) {
tlog.Debug.Printf("DetectQuirks: Fstypename=%q\n", fstypename)
// On MacOS ExFAT, all empty files share inode number 1:
- // https://github.com/rfjakob/gocryptfs/issues/585
+ // https://github.com/rfjakob/gocryptfs/v2/issues/585
if fstypename == FstypenameExfat {
- logQuirk("ExFAT detected, disabling hard links. See https://github.com/rfjakob/gocryptfs/issues/585 for why.")
+ logQuirk("ExFAT detected, disabling hard links. See https://github.com/rfjakob/gocryptfs/v2/issues/585 for why.")
q |= QuirkDuplicateIno1
}
diff --git a/internal/syscallcompat/quirks_linux.go b/internal/syscallcompat/quirks_linux.go
index 262e48f..418f010 100644
--- a/internal/syscallcompat/quirks_linux.go
+++ b/internal/syscallcompat/quirks_linux.go
@@ -3,7 +3,7 @@ package syscallcompat
import (
"golang.org/x/sys/unix"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// DetectQuirks decides if there are known quirks on the backing filesystem
@@ -18,12 +18,12 @@ func DetectQuirks(cipherdir string) (q uint64) {
return 0
}
- // Preallocation on Btrfs is broken ( https://github.com/rfjakob/gocryptfs/issues/395 )
- // and slow ( https://github.com/rfjakob/gocryptfs/issues/63 ).
+ // Preallocation on Btrfs is broken ( https://github.com/rfjakob/gocryptfs/v2/issues/395 )
+ // and slow ( https://github.com/rfjakob/gocryptfs/v2/issues/63 ).
//
// Cast to uint32 avoids compile error on arm: "constant 2435016766 overflows int32"
if uint32(st.Type) == unix.BTRFS_SUPER_MAGIC {
- logQuirk("Btrfs detected, forcing -noprealloc. See https://github.com/rfjakob/gocryptfs/issues/395 for why.")
+ logQuirk("Btrfs detected, forcing -noprealloc. See https://github.com/rfjakob/gocryptfs/v2/issues/395 for why.")
q |= QuirkBrokenFalloc
}
diff --git a/internal/syscallcompat/sys_common.go b/internal/syscallcompat/sys_common.go
index fc020bd..50b8180 100644
--- a/internal/syscallcompat/sys_common.go
+++ b/internal/syscallcompat/sys_common.go
@@ -6,7 +6,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// PATH_MAX is the maximum allowed path length on Linux.
diff --git a/internal/syscallcompat/sys_darwin.go b/internal/syscallcompat/sys_darwin.go
index 075563f..e35f213 100644
--- a/internal/syscallcompat/sys_darwin.go
+++ b/internal/syscallcompat/sys_darwin.go
@@ -59,7 +59,7 @@ func setattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintp
// Sorry, fallocate is not available on OSX at all and
// fcntl F_PREALLOCATE is not accessible from Go.
-// See https://github.com/rfjakob/gocryptfs/issues/18 if you want to help.
+// See https://github.com/rfjakob/gocryptfs/v2/issues/18 if you want to help.
func EnospcPrealloc(fd int, off int64, len int64) error {
return nil
}
diff --git a/internal/syscallcompat/sys_linux.go b/internal/syscallcompat/sys_linux.go
index a1d7d40..b7f1dad 100644
--- a/internal/syscallcompat/sys_linux.go
+++ b/internal/syscallcompat/sys_linux.go
@@ -15,7 +15,7 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
@@ -48,7 +48,7 @@ func EnospcPrealloc(fd int, off int64, len int64) (err error) {
}
if err == syscall.EOPNOTSUPP {
// ZFS and ext3 do not support fallocate. Warn but continue anyway.
- // https://github.com/rfjakob/gocryptfs/issues/22
+ // https://github.com/rfjakob/gocryptfs/v2/issues/22
preallocWarn.Do(func() {
tlog.Warn.Printf("Warning: The underlying filesystem " +
"does not support fallocate(2). gocryptfs will continue working " +
diff --git a/main.go b/main.go
index 370feac..169bdeb 100644
--- a/main.go
+++ b/main.go
@@ -1,5 +1,5 @@
// gocryptfs is an encrypted overlay filesystem written in Go.
-// See README.md ( https://github.com/rfjakob/gocryptfs/blob/master/README.md )
+// See README.md ( https://github.com/rfjakob/gocryptfs/v2/blob/master/README.md )
// and the official website ( https://nuetzlich.net/gocryptfs/ ) for details.
package main
@@ -14,14 +14,14 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/fido2"
- "github.com/rfjakob/gocryptfs/internal/readpassword"
- "github.com/rfjakob/gocryptfs/internal/speed"
- "github.com/rfjakob/gocryptfs/internal/stupidgcm"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/fido2"
+ "github.com/rfjakob/gocryptfs/v2/internal/readpassword"
+ "github.com/rfjakob/gocryptfs/v2/internal/speed"
+ "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// GitVersion is the gocryptfs version according to git, set by build.bash
diff --git a/masterkey.go b/masterkey.go
index 8d75c75..10009cb 100644
--- a/masterkey.go
+++ b/masterkey.go
@@ -5,10 +5,10 @@ import (
"os"
"strings"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/readpassword"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/readpassword"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// unhexMasterKey - Convert a hex-encoded master key to binary.
diff --git a/mount.go b/mount.go
index 4e693f1..810f008 100644
--- a/mount.go
+++ b/mount.go
@@ -22,16 +22,16 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/ctlsocksrv"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/fusefrontend"
- "github.com/rfjakob/gocryptfs/internal/fusefrontend_reverse"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/openfiletable"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/ctlsocksrv"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/fusefrontend"
+ "github.com/rfjakob/gocryptfs/v2/internal/fusefrontend_reverse"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/openfiletable"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// AfterUnmount is called after the filesystem has been unmounted.
@@ -73,7 +73,7 @@ func doMount(args *argContainer) {
// and `drop_privileges` in `man mount.fuse3` for background.
} else {
err = isEmptyDir(args.mountpoint)
- // OSXFuse will create the mountpoint for us ( https://github.com/rfjakob/gocryptfs/issues/194 )
+ // OSXFuse will create the mountpoint for us ( https://github.com/rfjakob/gocryptfs/v2/issues/194 )
if runtime.GOOS == "darwin" && os.IsNotExist(err) {
tlog.Info.Printf("Mountpoint %q does not exist, but should be created by OSXFuse",
args.mountpoint)
diff --git a/profiling.go b/profiling.go
index 11d6326..92de599 100644
--- a/profiling.go
+++ b/profiling.go
@@ -6,8 +6,8 @@ import (
"runtime/trace"
"time"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// setupCpuprofile is called to handle a non-empty "-cpuprofile" cli argument
diff --git a/sendusr1.go b/sendusr1.go
index 0fdcd0e..7e65441 100644
--- a/sendusr1.go
+++ b/sendusr1.go
@@ -4,7 +4,7 @@ import (
"os"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// Send signal USR1 to "pid" (usually our parent process). This notifies it
diff --git a/tests/cli/cli_test.go b/tests/cli/cli_test.go
index 85a8006..4055c97 100644
--- a/tests/cli/cli_test.go
+++ b/tests/cli/cli_test.go
@@ -14,11 +14,11 @@ import (
"testing"
"time"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
var testPw = []byte("test")
@@ -61,9 +61,9 @@ func TestInitFilePerms(t *testing.T) {
syscall.Stat(dir+"/gocryptfs.diriv", &st)
perms = st.Mode & 0777
// From v1.7.1, these are created with 0440 permissions, see
- // https://github.com/rfjakob/gocryptfs/issues/387 .
+ // https://github.com/rfjakob/gocryptfs/v2/issues/387 .
// From v2.0, created with 0444 perms, see
- // https://github.com/rfjakob/gocryptfs/issues/539 .
+ // https://github.com/rfjakob/gocryptfs/v2/issues/539 .
if perms != 0444 {
t.Errorf("Wrong permissions for gocryptfs.diriv: %#o", perms)
}
@@ -442,7 +442,7 @@ func TestPasswdPasswordIncorrect(t *testing.T) {
// Check that we correctly background on mount and close stderr and stdout.
// Something like
// gocryptfs a b | cat
-// must not hang ( https://github.com/rfjakob/gocryptfs/issues/130 ).
+// must not hang ( https://github.com/rfjakob/gocryptfs/v2/issues/130 ).
func TestMountBackground(t *testing.T) {
dir := test_helpers.InitFS(t)
mnt := dir + ".mnt"
@@ -558,7 +558,7 @@ func TestExcludeForward(t *testing.T) {
}
// Check that the config file can be read from a named pipe.
-// Make sure bug https://github.com/rfjakob/gocryptfs/issues/258 does not come
+// Make sure bug https://github.com/rfjakob/gocryptfs/v2/issues/258 does not come
// back.
func TestConfigPipe(t *testing.T) {
dir := test_helpers.InitFS(t)
@@ -581,7 +581,7 @@ func TestConfigPipe(t *testing.T) {
}
// Ciphertext dir and mountpoint contains a comma
-// https://github.com/rfjakob/gocryptfs/issues/262
+// https://github.com/rfjakob/gocryptfs/v2/issues/262
func TestComma(t *testing.T) {
dir0 := test_helpers.InitFS(t)
dir := dir0 + ",foo,bar"
@@ -626,7 +626,7 @@ func TestIdle(t *testing.T) {
}
// Mount with idle timeout of 100ms read something every 10ms. The fs should
-// NOT get unmounted. Regression test for https://github.com/rfjakob/gocryptfs/issues/421
+// NOT get unmounted. Regression test for https://github.com/rfjakob/gocryptfs/v2/issues/421
func TestNotIdle(t *testing.T) {
dir := test_helpers.InitFS(t)
mnt := dir + ".mnt"
@@ -664,7 +664,7 @@ func TestNotIdle(t *testing.T) {
// TestSymlinkedCipherdir checks that if CIPHERDIR itself is a symlink, it is
// followed.
-// https://github.com/rfjakob/gocryptfs/issues/450
+// https://github.com/rfjakob/gocryptfs/v2/issues/450
func TestSymlinkedCipherdir(t *testing.T) {
dir := test_helpers.InitFS(t)
dirSymlink := dir + ".symlink"
@@ -910,7 +910,7 @@ func TestPassfileX2(t *testing.T) {
}
// TestInitNotEmpty checks that `gocryptfs -init` returns the right error code
-// if CIPHERDIR is not empty. See https://github.com/rfjakob/gocryptfs/pull/503
+// if CIPHERDIR is not empty. See https://github.com/rfjakob/gocryptfs/v2/pull/503
func TestInitNotEmpty(t *testing.T) {
dir := test_helpers.TmpDir + "/" + t.Name()
if err := os.Mkdir(dir, 0700); err != nil {
diff --git a/tests/cli/zerokey.go b/tests/cli/zerokey.go
index b809d1f..e9b9c50 100644
--- a/tests/cli/zerokey.go
+++ b/tests/cli/zerokey.go
@@ -6,7 +6,7 @@ import (
"os/exec"
"testing"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
// TestZerokey verifies that `gocryptfs -zerokey` uses the same options as
diff --git a/tests/defaults/acl_test.go b/tests/defaults/acl_test.go
index f3c707e..94d3c38 100644
--- a/tests/defaults/acl_test.go
+++ b/tests/defaults/acl_test.go
@@ -14,10 +14,10 @@ import (
"github.com/pkg/xattr"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
-// https://github.com/rfjakob/gocryptfs/issues/543
+// https://github.com/rfjakob/gocryptfs/v2/issues/543
func TestCpA(t *testing.T) {
fn1 := filepath.Join(test_helpers.TmpDir, t.Name())
fn2 := filepath.Join(test_helpers.DefaultPlainDir, t.Name())
@@ -77,7 +77,7 @@ func getfacl(fn string) (string, error) {
return string(out), err
}
-// https://github.com/rfjakob/gocryptfs/issues/543
+// https://github.com/rfjakob/gocryptfs/v2/issues/543
func TestAcl543(t *testing.T) {
fn1 := test_helpers.TmpDir + "/TestAcl543"
fn2 := test_helpers.DefaultPlainDir + "/TestAcl543"
diff --git a/tests/defaults/ctlsock_test.go b/tests/defaults/ctlsock_test.go
index ac64f42..78841b9 100644
--- a/tests/defaults/ctlsock_test.go
+++ b/tests/defaults/ctlsock_test.go
@@ -5,8 +5,8 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/ctlsock"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/ctlsock"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func TestCtlSock(t *testing.T) {
diff --git a/tests/defaults/diriv_test.go b/tests/defaults/diriv_test.go
index bf8f233..639b33d 100644
--- a/tests/defaults/diriv_test.go
+++ b/tests/defaults/diriv_test.go
@@ -9,7 +9,7 @@ import (
"testing"
"time"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func TestDirIVRace(t *testing.T) {
diff --git a/tests/defaults/main_test.go b/tests/defaults/main_test.go
index ddaca68..0acab2d 100644
--- a/tests/defaults/main_test.go
+++ b/tests/defaults/main_test.go
@@ -14,7 +14,7 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func TestMain(m *testing.M) {
@@ -239,7 +239,7 @@ func TestMvWarningSymlink(t *testing.T) {
if err != nil {
t.Log(string(out))
if runtime.GOOS == "darwin" {
- t.Skip("mv on darwin chokes on broken symlinks, see https://github.com/rfjakob/gocryptfs/issues/349")
+ t.Skip("mv on darwin chokes on broken symlinks, see https://github.com/rfjakob/gocryptfs/v2/issues/349")
}
t.Fatal(err)
}
diff --git a/tests/defaults/performance_test.go b/tests/defaults/performance_test.go
index a2ecf8c..11d827f 100644
--- a/tests/defaults/performance_test.go
+++ b/tests/defaults/performance_test.go
@@ -8,7 +8,7 @@ import (
"os"
"testing"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
// Benchmarks
diff --git a/tests/deterministic_names/deterministic_names_test.go b/tests/deterministic_names/deterministic_names_test.go
index e94b0b6..00d80fc 100644
--- a/tests/deterministic_names/deterministic_names_test.go
+++ b/tests/deterministic_names/deterministic_names_test.go
@@ -9,8 +9,8 @@ import (
"path/filepath"
"testing"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
var cDir string
diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go
index 36fb554..b07b5f3 100644
--- a/tests/example_filesystems/example_filesystems_test.go
+++ b/tests/example_filesystems/example_filesystems_test.go
@@ -14,8 +14,8 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/internal/stupidgcm"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
var opensslOpt string
diff --git a/tests/example_filesystems/example_test_helpers.go b/tests/example_filesystems/example_test_helpers.go
index e39f8d6..c56d75a 100644
--- a/tests/example_filesystems/example_test_helpers.go
+++ b/tests/example_filesystems/example_test_helpers.go
@@ -6,7 +6,7 @@ import (
"path/filepath"
"testing"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
const statusTxtContent = "It works!\n"
diff --git a/tests/fsck/fsck_test.go b/tests/fsck/fsck_test.go
index 3aaba9e..cebc86b 100644
--- a/tests/fsck/fsck_test.go
+++ b/tests/fsck/fsck_test.go
@@ -12,8 +12,8 @@ import (
"github.com/pkg/xattr"
- "github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func dec64(in string) (out []byte) {
diff --git a/tests/hkdf_sanity/sanity_test.go b/tests/hkdf_sanity/sanity_test.go
index b382861..f221439 100644
--- a/tests/hkdf_sanity/sanity_test.go
+++ b/tests/hkdf_sanity/sanity_test.go
@@ -8,7 +8,7 @@ import (
"os"
"testing"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func TestBrokenContent(t *testing.T) {
diff --git a/tests/matrix/concurrency_test.go b/tests/matrix/concurrency_test.go
index 1afd33d..fa713df 100644
--- a/tests/matrix/concurrency_test.go
+++ b/tests/matrix/concurrency_test.go
@@ -9,10 +9,10 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
-// https://github.com/rfjakob/gocryptfs/issues/363
+// https://github.com/rfjakob/gocryptfs/v2/issues/363
//
// Note: this test calls log.Fatal() instead of t.Fatal() because apparently,
// calling t.Fatal() from a goroutine hangs the test.
@@ -73,7 +73,7 @@ func TestConcurrentReadWrite(t *testing.T) {
wg.Wait()
}
-// https://github.com/rfjakob/gocryptfs/issues/363
+// https://github.com/rfjakob/gocryptfs/v2/issues/363
//
// Note: this test calls log.Fatal() instead of t.Fatal() because apparently,
// calling t.Fatal() from a goroutine hangs the test.
diff --git a/tests/matrix/dir_test.go b/tests/matrix/dir_test.go
index 2f7a034..52c97a7 100644
--- a/tests/matrix/dir_test.go
+++ b/tests/matrix/dir_test.go
@@ -7,7 +7,7 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
// Test Mkdir and Rmdir
@@ -34,7 +34,7 @@ func TestDirOverwrite(t *testing.T) {
}
// Test that we can create and remove a directory regardless of the permission it has
-// https://github.com/rfjakob/gocryptfs/issues/354
+// https://github.com/rfjakob/gocryptfs/v2/issues/354
func TestRmdirPerms(t *testing.T) {
for _, perm := range []uint32{0000, 0100, 0200, 0300, 0400, 0500, 0600, 0700} {
dir := fmt.Sprintf("TestRmdir%#o", perm)
diff --git a/tests/matrix/fallocate_test.go b/tests/matrix/fallocate_test.go
index dde0685..c94c070 100644
--- a/tests/matrix/fallocate_test.go
+++ b/tests/matrix/fallocate_test.go
@@ -6,8 +6,8 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
const (
@@ -149,7 +149,7 @@ func TestFallocate(t *testing.T) {
}
}
// We used to allocate 18 bytes too much:
- // https://github.com/rfjakob/gocryptfs/issues/311
+ // https://github.com/rfjakob/gocryptfs/v2/issues/311
//
// 8110 bytes of plaintext should get us exactly 8192 bytes of ciphertext.
err = file.Truncate(0)
diff --git a/tests/matrix/matrix_test.go b/tests/matrix/matrix_test.go
index c51b391..0ee5688 100644
--- a/tests/matrix/matrix_test.go
+++ b/tests/matrix/matrix_test.go
@@ -23,8 +23,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/rfjakob/gocryptfs/internal/stupidgcm"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
// Several tests need to be aware if plaintextnames is active or not, so make this
@@ -763,7 +763,7 @@ func TestMkfifo(t *testing.T) {
}
// TestMagicNames verifies that "magic" names are handled correctly
-// https://github.com/rfjakob/gocryptfs/issues/174
+// https://github.com/rfjakob/gocryptfs/v2/issues/174
func TestMagicNames(t *testing.T) {
names := []string{"warmup1", "warmup2", "gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs", "gocryptfs.diriv"}
for _, n := range names {
@@ -880,7 +880,7 @@ func TestStatfs(t *testing.T) {
}
// gocryptfs 2.0 reported the ciphertext size on symlink creation, causing
-// confusion: https://github.com/rfjakob/gocryptfs/issues/574
+// confusion: https://github.com/rfjakob/gocryptfs/v2/issues/574
func TestSymlinkSize(t *testing.T) {
p := filepath.Join(test_helpers.DefaultPlainDir, t.Name())
// SYMLINK reports the size to the kernel
@@ -900,7 +900,7 @@ func TestSymlinkSize(t *testing.T) {
// TestPwd check that /usr/bin/pwd works inside gocryptfs.
//
// This was broken in gocryptfs v2.0 with -sharedstorage:
-// https://github.com/rfjakob/gocryptfs/issues/584
+// https://github.com/rfjakob/gocryptfs/v2/issues/584
func TestPwd(t *testing.T) {
dir := test_helpers.DefaultPlainDir
for i := 0; i < 3; i++ {
diff --git a/tests/plaintextnames/file_holes_test.go b/tests/plaintextnames/file_holes_test.go
index 5de0152..a17597a 100644
--- a/tests/plaintextnames/file_holes_test.go
+++ b/tests/plaintextnames/file_holes_test.go
@@ -9,9 +9,9 @@ import (
"testing"
"time"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
- "github.com/rfjakob/gocryptfs/contrib/findholes/holes"
+ "github.com/rfjakob/gocryptfs/v2/contrib/findholes/holes"
)
func findHolesPretty(t *testing.T, path string) string {
diff --git a/tests/plaintextnames/plaintextnames_test.go b/tests/plaintextnames/plaintextnames_test.go
index e3cf953..c6d6145 100644
--- a/tests/plaintextnames/plaintextnames_test.go
+++ b/tests/plaintextnames/plaintextnames_test.go
@@ -9,9 +9,9 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
var cDir string
diff --git a/tests/reverse/correctness_test.go b/tests/reverse/correctness_test.go
index 87d2f12..3b25112 100644
--- a/tests/reverse/correctness_test.go
+++ b/tests/reverse/correctness_test.go
@@ -11,9 +11,9 @@ import (
"golang.org/x/sys/unix"
- "github.com/rfjakob/gocryptfs/ctlsock"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/ctlsock"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
// TestLongnameStat checks that file names of all sizes (1 to 255) show up in
@@ -185,7 +185,7 @@ func TestEnoent(t *testing.T) {
// If the symlink target gets too long due to base64 encoding, we should
// return ENAMETOOLONG instead of having the kernel reject the data and
// returning an I/O error to the user.
-// https://github.com/rfjakob/gocryptfs/issues/167
+// https://github.com/rfjakob/gocryptfs/v2/issues/167
func TestTooLongSymlink(t *testing.T) {
var err error
var l int
diff --git a/tests/reverse/ctlsock_test.go b/tests/reverse/ctlsock_test.go
index ecb0b96..f59fa45 100644
--- a/tests/reverse/ctlsock_test.go
+++ b/tests/reverse/ctlsock_test.go
@@ -5,8 +5,8 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/ctlsock"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/ctlsock"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
var ctlSockTestCases = [][]string{
diff --git a/tests/reverse/exclude_test.go b/tests/reverse/exclude_test.go
index b0e7135..e37050c 100644
--- a/tests/reverse/exclude_test.go
+++ b/tests/reverse/exclude_test.go
@@ -5,9 +5,9 @@ import (
"path/filepath"
"testing"
- "github.com/rfjakob/gocryptfs/ctlsock"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/ctlsock"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func ctlsockEncryptPath(t *testing.T, sock string, path string) string {
@@ -128,7 +128,7 @@ func TestExcludeTestFs(t *testing.T) {
}
// Exclude everything using "/*", then selectively include only dir1 using "!/dir1"
-// https://github.com/rfjakob/gocryptfs/issues/588
+// https://github.com/rfjakob/gocryptfs/v2/issues/588
func TestExcludeAllOnlyDir1(t *testing.T) {
// --exclude-wildcard patterns, gitignore syntax
patterns := []string{
diff --git a/tests/reverse/main_test.go b/tests/reverse/main_test.go
index 3b9e7d0..2fc9e5e 100644
--- a/tests/reverse/main_test.go
+++ b/tests/reverse/main_test.go
@@ -6,7 +6,7 @@ import (
"os"
"testing"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
var x240 = string(bytes.Repeat([]byte("x"), 240))
diff --git a/tests/reverse/one_file_system_test.go b/tests/reverse/one_file_system_test.go
index a3e441f..61190ea 100644
--- a/tests/reverse/one_file_system_test.go
+++ b/tests/reverse/one_file_system_test.go
@@ -8,7 +8,7 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func TestOneFileSystem(t *testing.T) {
diff --git a/tests/root_test/root_test.go b/tests/root_test/root_test.go
index d9d5dfc..3794e69 100644
--- a/tests/root_test/root_test.go
+++ b/tests/root_test/root_test.go
@@ -12,11 +12,11 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
"golang.org/x/sys/unix"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func asUser(uid int, gid int, supplementaryGroups []int, f func() error) error {
diff --git a/tests/sharedstorage/sharedstorage_test.go b/tests/sharedstorage/sharedstorage_test.go
index 8f46c0d..a08deed 100644
--- a/tests/sharedstorage/sharedstorage_test.go
+++ b/tests/sharedstorage/sharedstorage_test.go
@@ -9,7 +9,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
var flagSharestorage bool
diff --git a/tests/test_helpers/helpers.go b/tests/test_helpers/helpers.go
index 87dba0a..daa37d7 100644
--- a/tests/test_helpers/helpers.go
+++ b/tests/test_helpers/helpers.go
@@ -13,9 +13,9 @@ import (
"syscall"
"testing"
- "github.com/rfjakob/gocryptfs/ctlsock"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/ctlsock"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
// TmpDir will be created inside this directory, set in init() to
diff --git a/tests/xattr/xattr_fd_test.go b/tests/xattr/xattr_fd_test.go
index 7415e54..76fc3ab 100644
--- a/tests/xattr/xattr_fd_test.go
+++ b/tests/xattr/xattr_fd_test.go
@@ -11,7 +11,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func TestFdXattr(t *testing.T) {
diff --git a/tests/xattr/xattr_integration_test.go b/tests/xattr/xattr_integration_test.go
index be48fc0..efe903b 100644
--- a/tests/xattr/xattr_integration_test.go
+++ b/tests/xattr/xattr_integration_test.go
@@ -18,8 +18,8 @@ import (
"github.com/pkg/xattr"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func TestMain(m *testing.M) {