From d5ce340c02601992cc9dab1bd7d3c2d95d81155e Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sat, 15 Feb 2020 17:21:30 +0100
Subject: 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.
---
 cli_args.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'cli_args.go')

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 {
-- 
cgit v1.2.3