Switch to v2 module

common_ops.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"./internal/nametransform"
-	"./internal/syscallcompat"
+	"libgocryptfs/v2/internal/nametransform"
+	"libgocryptfs/v2/internal/syscallcompat"
 )
 
 //export gcf_get_attrs

directory.go

@@ -10,11 +10,11 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"./allocator"
-	"./internal/configfile"
-	"./internal/cryptocore"
-	"./internal/nametransform"
-	"./internal/syscallcompat"
+	"libgocryptfs/v2/allocator"
+	"libgocryptfs/v2/internal/configfile"
+	"libgocryptfs/v2/internal/cryptocore"
+	"libgocryptfs/v2/internal/nametransform"
+	"libgocryptfs/v2/internal/syscallcompat"
 )
 
 func mkdirWithIv(dirfd int, cName string, mode uint32) error {

file.go

@@ -8,9 +8,9 @@ import (
 	"os"
 	"syscall"
 
-	"./internal/contentenc"
-	"./internal/nametransform"
-	"./internal/syscallcompat"
+	"libgocryptfs/v2/internal/contentenc"
+	"libgocryptfs/v2/internal/nametransform"
+	"libgocryptfs/v2/internal/syscallcompat"
 )
 
 // mangleOpenFlags is used by Create() and Open() to convert the open flags the user

go.mod

@@ -0,0 +1,10 @@
+module libgocryptfs/v2
+
+go 1.16
+
+require (
+	github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 // indirect
+	github.com/rfjakob/eme v1.1.2 // indirect
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70 // indirect
+)

go.sum

@@ -0,0 +1,14 @@
+github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 h1:YuDUUFNM21CAbyPOpOP8BicaTD/0klJEKt5p8yuw+uY=
+github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115/go.mod h1:LadVJg0XuawGk+8L1rYnIED8451UyNxEMdTWCEt5kmU=
+github.com/rfjakob/eme v1.1.2 h1:SxziR8msSOElPayZNFfQw4Tjx/Sbaeeh3eRvrHVMUs4=
+github.com/rfjakob/eme v1.1.2/go.mod h1:cVvpasglm/G3ngEfcfT/Wt0GwhkuO32pf/poW6Nyk1k=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70 h1:SeSEfdIxyvwGJliREIJhRPPXvW6sDlLT+UQ3B0hD0NA=
+golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

helpers.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 	"syscall"
 
-	"./internal/configfile"
-	"./internal/nametransform"
-	"./internal/syscallcompat"
+	"libgocryptfs/v2/internal/configfile"
+	"libgocryptfs/v2/internal/nametransform"
+	"libgocryptfs/v2/internal/syscallcompat"
 )
 
 // isFiltered - check if plaintext "path" should be forbidden

internal/configfile/config_file.go

@@ -10,9 +10,9 @@ import (
 
 	"os"
 
-	"../contentenc"
-	"../cryptocore"
-	"../exitcodes"
+	"libgocryptfs/v2/internal/contentenc"
+	"libgocryptfs/v2/internal/cryptocore"
+	"libgocryptfs/v2/internal/exitcodes"
 )
 
 const (

internal/configfile/scrypt.go

@@ -8,8 +8,8 @@ import (
 
 	"golang.org/x/crypto/scrypt"
 
-	"../cryptocore"
-	"../exitcodes"
+	"libgocryptfs/v2/internal/cryptocore"
+	"libgocryptfs/v2/internal/exitcodes"
 )
 
 const (

internal/configfile/validate.go

@@ -3,7 +3,7 @@ package configfile
 import (
 	"fmt"
 
-	"../contentenc"
+	"libgocryptfs/v2/internal/contentenc"
 )
 
 // Validate that the combination of settings makes sense and is supported

internal/contentenc/content.go

@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"sync"
 
-	"../cryptocore"
+	"libgocryptfs/v2/internal/cryptocore"
 )
 
 const (

internal/contentenc/file_header.go

@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"log"
 
-	"../cryptocore"
+	"libgocryptfs/v2/internal/cryptocore"
 )
 
 const (

internal/cryptocore/cryptocore.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/rfjakob/eme"
 
-	"../siv_aead"
-	"../stupidgcm"
+	"libgocryptfs/v2/internal/siv_aead"
+	"libgocryptfs/v2/internal/stupidgcm"
 )
 
 const (

internal/nametransform/badname.go

@@ -8,7 +8,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"../syscallcompat"
+	"libgocryptfs/v2/internal/syscallcompat"
 )
 
 const (

internal/nametransform/diriv.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"syscall"
 
-	"../cryptocore"
-	"../syscallcompat"
+	"libgocryptfs/v2/internal/cryptocore"
+	"libgocryptfs/v2/internal/syscallcompat"
 )
 
 const (

internal/nametransform/longnames.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"syscall"
 
-	"../syscallcompat"
+	"libgocryptfs/v2/internal/syscallcompat"
 )
 
 const (

volume.go

@@ -10,12 +10,12 @@ import (
 	"strings"
 	"syscall"
 
-	"./internal/configfile"
-	"./internal/contentenc"
-	"./internal/cryptocore"
-	"./internal/nametransform"
-	"./internal/stupidgcm"
-	"./internal/syscallcompat"
+	"libgocryptfs/v2/internal/configfile"
+	"libgocryptfs/v2/internal/contentenc"
+	"libgocryptfs/v2/internal/cryptocore"
+	"libgocryptfs/v2/internal/nametransform"
+	"libgocryptfs/v2/internal/stupidgcm"
+	"libgocryptfs/v2/internal/syscallcompat"
 )
 
 type Directory struct {