From 19731536027d0b64c19742846bf8dda6920110ba Mon Sep 17 00:00:00 2001 From: Hardcore Sushi Date: Sun, 24 Oct 2021 10:48:44 +0200 Subject: [PATCH] Switch to v2 module --- common_ops.go | 4 ++-- directory.go | 10 +++++----- file.go | 6 +++--- go.mod | 10 ++++++++++ go.sum | 14 ++++++++++++++ helpers.go | 6 +++--- internal/configfile/config_file.go | 6 +++--- internal/configfile/scrypt.go | 4 ++-- internal/configfile/validate.go | 2 +- internal/contentenc/content.go | 2 +- internal/contentenc/file_header.go | 2 +- internal/cryptocore/cryptocore.go | 4 ++-- internal/nametransform/badname.go | 2 +- internal/nametransform/diriv.go | 4 ++-- internal/nametransform/longnames.go | 2 +- volume.go | 12 ++++++------ 16 files changed, 57 insertions(+), 33 deletions(-) create mode 100644 go.mod create mode 100644 go.sum diff --git a/common_ops.go b/common_ops.go index cb61e86..9fd1eb4 100644 --- a/common_ops.go +++ b/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 diff --git a/directory.go b/directory.go index 83fb477..269abe3 100644 --- a/directory.go +++ b/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 { diff --git a/file.go b/file.go index 0e4a56b..2298b3e 100644 --- a/file.go +++ b/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 diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..de62322 --- /dev/null +++ b/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 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..e2d12c8 --- /dev/null +++ b/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= diff --git a/helpers.go b/helpers.go index bf60ec7..72d9968 100644 --- a/helpers.go +++ b/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 diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go index e919f8b..898ae28 100644 --- a/internal/configfile/config_file.go +++ b/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 ( diff --git a/internal/configfile/scrypt.go b/internal/configfile/scrypt.go index 8178a92..fba60bd 100644 --- a/internal/configfile/scrypt.go +++ b/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 ( diff --git a/internal/configfile/validate.go b/internal/configfile/validate.go index 6bd4f3b..351b779 100644 --- a/internal/configfile/validate.go +++ b/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 diff --git a/internal/contentenc/content.go b/internal/contentenc/content.go index 7046c39..9d2a6d0 100644 --- a/internal/contentenc/content.go +++ b/internal/contentenc/content.go @@ -9,7 +9,7 @@ import ( "runtime" "sync" - "../cryptocore" + "libgocryptfs/v2/internal/cryptocore" ) const ( diff --git a/internal/contentenc/file_header.go b/internal/contentenc/file_header.go index 921e835..aed8690 100644 --- a/internal/contentenc/file_header.go +++ b/internal/contentenc/file_header.go @@ -11,7 +11,7 @@ import ( "fmt" "log" - "../cryptocore" + "libgocryptfs/v2/internal/cryptocore" ) const ( diff --git a/internal/cryptocore/cryptocore.go b/internal/cryptocore/cryptocore.go index 6a6a659..838ef01 100644 --- a/internal/cryptocore/cryptocore.go +++ b/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 ( diff --git a/internal/nametransform/badname.go b/internal/nametransform/badname.go index 53fd0c4..86a91db 100644 --- a/internal/nametransform/badname.go +++ b/internal/nametransform/badname.go @@ -8,7 +8,7 @@ import ( "golang.org/x/sys/unix" - "../syscallcompat" + "libgocryptfs/v2/internal/syscallcompat" ) const ( diff --git a/internal/nametransform/diriv.go b/internal/nametransform/diriv.go index 81da739..256b9d5 100644 --- a/internal/nametransform/diriv.go +++ b/internal/nametransform/diriv.go @@ -7,8 +7,8 @@ import ( "os" "syscall" - "../cryptocore" - "../syscallcompat" + "libgocryptfs/v2/internal/cryptocore" + "libgocryptfs/v2/internal/syscallcompat" ) const ( diff --git a/internal/nametransform/longnames.go b/internal/nametransform/longnames.go index 4fc378e..79520c0 100644 --- a/internal/nametransform/longnames.go +++ b/internal/nametransform/longnames.go @@ -9,7 +9,7 @@ import ( "strings" "syscall" - "../syscallcompat" + "libgocryptfs/v2/internal/syscallcompat" ) const ( diff --git a/volume.go b/volume.go index 15d0a82..20ff624 100644 --- a/volume.go +++ b/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 {