summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2020-04-13 13:59:30 +0200
committerJakob Unterwurzacher2020-04-13 14:54:04 +0200
commitcad711993d67dd920f9749a09414dbbba6ab8136 (patch)
treecdc825e2538462ccc0c85eff3134aa15027e8d36
parent9a7ceef09ea1fc8cbe17b324a9d1a2e71e50cb0a (diff)
dep: migrate to Go Modules
Following https://blog.golang.org/migrating-to-go-modules
-rw-r--r--Gopkg.lock105
-rw-r--r--Gopkg.toml23
-rw-r--r--go.mod20
-rw-r--r--go.sum42
-rw-r--r--go1.4.go7
5 files changed, 62 insertions, 135 deletions
diff --git a/Gopkg.lock b/Gopkg.lock
deleted file mode 100644
index d33573c..0000000
--- a/Gopkg.lock
+++ /dev/null
@@ -1,105 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
- branch = "master"
- digest = "1:67d3bd9bc4cd62c04043973d4771e792098345501ff1bf872531b26ab22e8936"
- name = "github.com/hanwen/go-fuse"
- packages = [
- "fuse",
- "fuse/nodefs",
- "fuse/pathfs",
- "internal",
- "internal/utimens",
- "splice",
- ]
- pruneopts = ""
- revision = "161a164844568ebf4bfaa68c90ba3a9f2914dda4"
-
-[[projects]]
- branch = "master"
- digest = "1:bf88eeaebb6746203406df8d361ab866bec8604d3663a5e3350ee22f0b5702fb"
- name = "github.com/jacobsa/crypto"
- packages = [
- "cmac",
- "common",
- "siv",
- ]
- pruneopts = ""
- revision = "9f44e2d11115452dad8f404f029574422855f46a"
-
-[[projects]]
- branch = "master"
- digest = "1:6e487a1dc86459293b2b27f414dc08f260530aa88063a84ad2c4e5a8370f2701"
- name = "github.com/pkg/xattr"
- packages = ["."]
- pruneopts = ""
- revision = "7782c2d6871d6e659e1563dc19c86b845264a6fc"
-
-[[projects]]
- branch = "master"
- digest = "1:4f7240806708b689451b6491f574aedd454bf8a25666dc9a65b0903f4e9f53af"
- name = "github.com/rfjakob/eme"
- packages = ["."]
- pruneopts = ""
- revision = "2222dbd4ba467ab3fc7e8af41562fcfe69c0d770"
-
-[[projects]]
- digest = "1:321aeb7694b1803b7c7e27191e464ec2ce541a2730b3a0c5f7451296d9b3a69e"
- name = "github.com/sabhiram/go-gitignore"
- packages = ["."]
- pruneopts = ""
- revision = "d3107576ba9425fc1c85f4b3569c4631b805a02e"
- version = "1.0.2"
-
-[[projects]]
- branch = "master"
- digest = "1:ab3e9a81a5ec54c5d1ed41d0d6898ba88c6799fa401b784b06bdee8e432d872b"
- name = "golang.org/x/crypto"
- packages = [
- "hkdf",
- "pbkdf2",
- "scrypt",
- "ssh/terminal",
- ]
- pruneopts = ""
- revision = "a1f597ede03a7bef967a422b5b3a5bd08805a01e"
-
-[[projects]]
- branch = "master"
- digest = "1:0142c968b74c157abbb0220c05fa2bdde8a3a4509d6134b35ef75d5b58afb721"
- name = "golang.org/x/sync"
- packages = ["syncmap"]
- pruneopts = ""
- revision = "e225da77a7e68af35c70ccbf71af2b83e6acac3c"
-
-[[projects]]
- branch = "master"
- digest = "1:677902b7cbbfa124deba62fc56aaa9ec7ad76ab7c45d42f76c973d3e7a1ef109"
- name = "golang.org/x/sys"
- packages = [
- "unix",
- "windows",
- ]
- pruneopts = ""
- revision = "61b9204099cb1bebc803c9ffb9b2d3acd9d457d9"
-
-[solve-meta]
- analyzer-name = "dep"
- analyzer-version = 1
- input-imports = [
- "github.com/hanwen/go-fuse/fuse",
- "github.com/hanwen/go-fuse/fuse/nodefs",
- "github.com/hanwen/go-fuse/fuse/pathfs",
- "github.com/jacobsa/crypto/siv",
- "github.com/pkg/xattr",
- "github.com/rfjakob/eme",
- "github.com/sabhiram/go-gitignore",
- "golang.org/x/crypto/hkdf",
- "golang.org/x/crypto/scrypt",
- "golang.org/x/crypto/ssh/terminal",
- "golang.org/x/sync/syncmap",
- "golang.org/x/sys/unix",
- ]
- solver-name = "gps-cdcl"
- solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
deleted file mode 100644
index fafb8f3..0000000
--- a/Gopkg.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[[constraint]]
- branch = "master"
- name = "github.com/hanwen/go-fuse"
-
-[[constraint]]
- branch = "master"
- name = "github.com/jacobsa/crypto"
-
-[[constraint]]
- name = "github.com/pkg/xattr"
- branch = "master"
-
-[[constraint]]
- branch = "master"
- name = "github.com/rfjakob/eme"
-
-[[constraint]]
- branch = "master"
- name = "golang.org/x/crypto"
-
-[[constraint]]
- branch = "master"
- name = "golang.org/x/sync"
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..15184d5
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,20 @@
+module github.com/rfjakob/gocryptfs
+
+go 1.13
+
+require (
+ github.com/hanwen/go-fuse v1.0.1-0.20190319092520-161a16484456
+ github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115
+ github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd // indirect
+ github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff // indirect
+ github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 // indirect
+ github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb // indirect
+ github.com/pkg/xattr v0.4.1-0.20181031164004-7782c2d6871d
+ github.com/rfjakob/eme v0.0.0-20171028163933-2222dbd4ba46
+ github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94
+ github.com/stretchr/testify v1.5.1 // indirect
+ golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a
+ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
+ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6
+ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..6f5acf7
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,42 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/hanwen/go-fuse v1.0.1-0.20190319092520-161a16484456 h1:Fqq26zPAvGcgDPCm9Oq3rNc/Ye6P9It+3P+7tiMxcEs=
+github.com/hanwen/go-fuse v1.0.1-0.20190319092520-161a16484456/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok=
+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/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA=
+github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M=
+github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw=
+github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff/go.mod h1:gJWba/XXGl0UoOmBQKRWCJdHrr3nE0T65t6ioaj3mLI=
+github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 h1:BMb8s3ENQLt5ulwVIHVDWFHp8eIXmbfSExkvdn9qMXI=
+github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11/go.mod h1:+DBdDyfoO2McrOyDemRBq0q9CMEByef7sYl7JH5Q3BI=
+github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb h1:uSWBjJdMf47kQlXMwWEfmc864bA1wAC+Kl3ApryuG9Y=
+github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb/go.mod h1:ivcmUvxXWjb27NsPEaiYK7AidlZXS7oQ5PowUS9z3I4=
+github.com/pkg/xattr v0.4.1-0.20181031164004-7782c2d6871d h1:iw58L7De9bjRqV1/O4AihcGGKhg65OUP5gTcpkAVb5w=
+github.com/pkg/xattr v0.4.1-0.20181031164004-7782c2d6871d/go.mod h1:W2cGD0TBEus7MkUgv0tNZ9JutLtVO3cXu+IBRuHqnFs=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rfjakob/eme v0.0.0-20171028163933-2222dbd4ba46 h1:w2CpS5muK+jyydnmlkqpAhzKmHmMBzBkfYUDjQNS1Dk=
+github.com/rfjakob/eme v0.0.0-20171028163933-2222dbd4ba46/go.mod h1:U2bmx0hDj8EyDdcxmD5t3XHDnBFnyNNc22n1R4008eM=
+github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 h1:G04eS0JkAIVZfaJLjla9dNxkJCPiKIGZlw9AfOhzOD0=
+github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94/go.mod h1:b18R55ulyQ/h3RaWyloPyER7fWQVZvimKKhnI5OfrJQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a h1:YX8ljsm6wXlHZO+aRz9Exqr0evNhKRNe5K/gi+zKh4U=
+golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181021155630-eda9bb28ed51/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/go1.4.go b/go1.4.go
deleted file mode 100644
index 3ca5307..0000000
--- a/go1.4.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !go1.5
-
-package main
-
-// Cause an early compile error on Go 1.4 an lower. We need Go 1.5 for a number
-// of reasons, among them NewGCMWithNonceSize, RawURLEncoding, runtime/trace.
-import "You_need_Go_1_5_or_higher_to_compile_gocryptfs"