From 69d88505fd7f4cb0d9e4f1918de296342fe05858 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Mon, 23 Aug 2021 15:05:15 +0200 Subject: 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/% --- internal/contentenc/content.go | 8 ++++---- internal/contentenc/content_test.go | 2 +- internal/contentenc/file_header.go | 2 +- internal/contentenc/offsets.go | 2 +- internal/contentenc/offsets_test.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'internal/contentenc') 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 -- cgit v1.2.3