summaryrefslogtreecommitdiff
path: root/cli_args.go
diff options
context:
space:
mode:
authorJakob Unterwurzacher2020-02-15 17:21:30 +0100
committerJakob Unterwurzacher2020-02-15 17:21:30 +0100
commitd5ce340c02601992cc9dab1bd7d3c2d95d81155e (patch)
treee709cea1677b2d9dff80ce83d5086aaaebf03c49 /cli_args.go
parent9aeb2a3df68539ad3a44283b9b94e1b28f011941 (diff)
merge prefer_openssl package into stupidgcm
Now that I have discovered golang.org/x/sys/cpu and that Go versions below 1.6 are uncommon, there was not much useful code left in prefer_openssl. Merge the remains into stupidgcm.
Diffstat (limited to 'cli_args.go')
-rw-r--r--cli_args.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/cli_args.go b/cli_args.go
index 8d0b7b5..0462fb4 100644
--- a/cli_args.go
+++ b/cli_args.go
@@ -17,7 +17,6 @@ import (
"github.com/hanwen/go-fuse/fuse"
"github.com/rfjakob/gocryptfs/internal/configfile"
"github.com/rfjakob/gocryptfs/internal/exitcodes"
- "github.com/rfjakob/gocryptfs/internal/prefer_openssl"
"github.com/rfjakob/gocryptfs/internal/stupidgcm"
"github.com/rfjakob/gocryptfs/internal/tlog"
)
@@ -232,7 +231,7 @@ func parseCliOpts() (args argContainer) {
}
// "-openssl" needs some post-processing
if opensslAuto == "auto" {
- args.openssl = prefer_openssl.PreferOpenSSL()
+ args.openssl = stupidgcm.PreferOpenSSL()
} else {
args.openssl, err = strconv.ParseBool(opensslAuto)
if err != nil {