diff --git a/internal/crypto/buffer.go b/internal/repository/crypto/buffer.go similarity index 100% rename from internal/crypto/buffer.go rename to internal/repository/crypto/buffer.go diff --git a/internal/crypto/crypto.go b/internal/repository/crypto/crypto.go similarity index 100% rename from internal/crypto/crypto.go rename to internal/repository/crypto/crypto.go diff --git a/internal/crypto/crypto_int_test.go b/internal/repository/crypto/crypto_int_test.go similarity index 100% rename from internal/crypto/crypto_int_test.go rename to internal/repository/crypto/crypto_int_test.go diff --git a/internal/crypto/crypto_test.go b/internal/repository/crypto/crypto_test.go similarity index 99% rename from internal/crypto/crypto_test.go rename to internal/repository/crypto/crypto_test.go index 47debe896..2959e49ff 100644 --- a/internal/crypto/crypto_test.go +++ b/internal/repository/crypto/crypto_test.go @@ -6,7 +6,7 @@ import ( "io" "testing" - "github.com/restic/restic/internal/crypto" + "github.com/restic/restic/internal/repository/crypto" rtest "github.com/restic/restic/internal/test" "github.com/restic/chunker" diff --git a/internal/crypto/doc.go b/internal/repository/crypto/doc.go similarity index 100% rename from internal/crypto/doc.go rename to internal/repository/crypto/doc.go diff --git a/internal/crypto/kdf.go b/internal/repository/crypto/kdf.go similarity index 100% rename from internal/crypto/kdf.go rename to internal/repository/crypto/kdf.go diff --git a/internal/crypto/kdf_test.go b/internal/repository/crypto/kdf_test.go similarity index 100% rename from internal/crypto/kdf_test.go rename to internal/repository/crypto/kdf_test.go diff --git a/internal/repository/debug.go b/internal/repository/debug.go index dc0a81ce2..4f422409c 100644 --- a/internal/repository/debug.go +++ b/internal/repository/debug.go @@ -17,7 +17,7 @@ import ( "github.com/klauspost/compress/zstd" "golang.org/x/sync/errgroup" - "github.com/restic/restic/internal/crypto" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/repository/index" "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" diff --git a/internal/repository/index/associated_data_test.go b/internal/repository/index/associated_data_test.go index 413f60990..143d3d20a 100644 --- a/internal/repository/index/associated_data_test.go +++ b/internal/repository/index/associated_data_test.go @@ -5,7 +5,7 @@ import ( "slices" "testing" - "github.com/restic/restic/internal/crypto" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/test" diff --git a/internal/repository/index/index.go b/internal/repository/index/index.go index 961b5aa89..bd4cdf27f 100644 --- a/internal/repository/index/index.go +++ b/internal/repository/index/index.go @@ -13,8 +13,8 @@ import ( "sync" "time" - "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/errors" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" diff --git a/internal/repository/index/master_index_test.go b/internal/repository/index/master_index_test.go index ed320cc3b..e8f04c77a 100644 --- a/internal/repository/index/master_index_test.go +++ b/internal/repository/index/master_index_test.go @@ -10,9 +10,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/restic/restic/internal/checker" - "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/data" "github.com/restic/restic/internal/repository" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/repository/index" "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" diff --git a/internal/repository/key.go b/internal/repository/key.go index 08f997544..3c2d2ff38 100644 --- a/internal/repository/key.go +++ b/internal/repository/key.go @@ -12,8 +12,8 @@ import ( "github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/backend" - "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/debug" + "github.com/restic/restic/internal/repository/crypto" ) var ( diff --git a/internal/repository/pack/blob.go b/internal/repository/pack/blob.go index 5c7e92a62..46b51e9ee 100644 --- a/internal/repository/pack/blob.go +++ b/internal/repository/pack/blob.go @@ -3,7 +3,7 @@ package pack import ( "fmt" - "github.com/restic/restic/internal/crypto" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/restic" ) diff --git a/internal/repository/pack/pack.go b/internal/repository/pack/pack.go index b23043e7f..43254b80b 100644 --- a/internal/repository/pack/pack.go +++ b/internal/repository/pack/pack.go @@ -12,7 +12,7 @@ import ( "github.com/restic/restic/internal/errors" "github.com/restic/restic/internal/restic" - "github.com/restic/restic/internal/crypto" + "github.com/restic/restic/internal/repository/crypto" ) // ErrBroken is returned by Add and Finalize after a write error. The packer diff --git a/internal/repository/pack/pack_internal_test.go b/internal/repository/pack/pack_internal_test.go index d9a15298a..8c4c37b9c 100644 --- a/internal/repository/pack/pack_internal_test.go +++ b/internal/repository/pack/pack_internal_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/restic/restic/internal/crypto" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/restic" rtest "github.com/restic/restic/internal/test" ) diff --git a/internal/repository/pack/pack_test.go b/internal/repository/pack/pack_test.go index 897aeddfe..20b5f154f 100644 --- a/internal/repository/pack/pack_test.go +++ b/internal/repository/pack/pack_test.go @@ -11,8 +11,8 @@ import ( "github.com/restic/restic/internal/backend" "github.com/restic/restic/internal/backend/mem" - "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/errors" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" rtest "github.com/restic/restic/internal/test" diff --git a/internal/repository/packer_manager.go b/internal/repository/packer_manager.go index 730be79b2..ea69b6b65 100644 --- a/internal/repository/packer_manager.go +++ b/internal/repository/packer_manager.go @@ -15,9 +15,9 @@ import ( "github.com/restic/restic/internal/repository/hashing" "github.com/restic/restic/internal/restic" - "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/fs" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/repository/pack" ) diff --git a/internal/repository/packer_manager_test.go b/internal/repository/packer_manager_test.go index 7f3d34f1b..b91d2262f 100644 --- a/internal/repository/packer_manager_test.go +++ b/internal/repository/packer_manager_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/restic/restic/internal/crypto" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/test" ) diff --git a/internal/repository/repository.go b/internal/repository/repository.go index e7d939894..c7d7b656e 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -14,9 +14,9 @@ import ( "github.com/restic/restic/internal/backend" "github.com/restic/restic/internal/backend/cache" "github.com/restic/restic/internal/backend/dryrun" - "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/errors" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/repository/index" "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" diff --git a/internal/repository/repository_internal_test.go b/internal/repository/repository_internal_test.go index 226c3c237..59873bdad 100644 --- a/internal/repository/repository_internal_test.go +++ b/internal/repository/repository_internal_test.go @@ -14,8 +14,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/klauspost/compress/zstd" "github.com/restic/restic/internal/backend" - "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/errors" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/repository/index" "github.com/restic/restic/internal/repository/pack" "github.com/restic/restic/internal/restic" diff --git a/internal/repository/repository_test.go b/internal/repository/repository_test.go index 6e8bbdbf0..de4a149a5 100644 --- a/internal/repository/repository_test.go +++ b/internal/repository/repository_test.go @@ -18,9 +18,9 @@ import ( "github.com/restic/restic/internal/backend/cache" "github.com/restic/restic/internal/backend/local" "github.com/restic/restic/internal/backend/mem" - "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/errors" "github.com/restic/restic/internal/repository" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/repository/index" "github.com/restic/restic/internal/restic" rtest "github.com/restic/restic/internal/test" diff --git a/internal/repository/testing.go b/internal/repository/testing.go index 1cdca4110..2f6dddc78 100644 --- a/internal/repository/testing.go +++ b/internal/repository/testing.go @@ -11,7 +11,7 @@ import ( "github.com/restic/restic/internal/backend/local" "github.com/restic/restic/internal/backend/mem" "github.com/restic/restic/internal/backend/retry" - "github.com/restic/restic/internal/crypto" + "github.com/restic/restic/internal/repository/crypto" "github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/test"