diff options
Diffstat (limited to 'internal/prefer_openssl')
| -rw-r--r-- | internal/prefer_openssl/prefer.go | 2 | ||||
| -rw-r--r-- | internal/prefer_openssl/prefer_go1.5.go | 7 | ||||
| -rw-r--r-- | internal/prefer_openssl/prefer_go1.6.go | 7 | 
3 files changed, 15 insertions, 1 deletions
| diff --git a/internal/prefer_openssl/prefer.go b/internal/prefer_openssl/prefer.go index 0afe7d5..e06f0d5 100644 --- a/internal/prefer_openssl/prefer.go +++ b/internal/prefer_openssl/prefer.go @@ -11,7 +11,7 @@ import (  )  // filePreferOpenSSL tells us if OpenSSL is faster than Go GCM on this machine. -// Go GCM is fastern when the CPU has AES instructions and Go is v1.6 or higher. +// Go GCM is faster when the CPU has AES instructions and Go is v1.6 or higher.  //  // See https://github.com/rfjakob/gocryptfs/issues/23#issuecomment-218286502  // for benchmarks. diff --git a/internal/prefer_openssl/prefer_go1.5.go b/internal/prefer_openssl/prefer_go1.5.go index 51a07ab..7095314 100644 --- a/internal/prefer_openssl/prefer_go1.5.go +++ b/internal/prefer_openssl/prefer_go1.5.go @@ -3,7 +3,14 @@  package prefer_openssl +import ( +	"github.com/rfjakob/gocryptfs/internal/stupidgcm" +) +  func PreferOpenSSL() bool { +	if stupidgcm.BuiltWithoutOpenssl { +		return false +	}  	// OpenSSL is always faster than Go GCM on old Go versions or on anything  	// other than amd64  	return true diff --git a/internal/prefer_openssl/prefer_go1.6.go b/internal/prefer_openssl/prefer_go1.6.go index 898db0c..a5a67fb 100644 --- a/internal/prefer_openssl/prefer_go1.6.go +++ b/internal/prefer_openssl/prefer_go1.6.go @@ -3,6 +3,10 @@  package prefer_openssl +import ( +	"github.com/rfjakob/gocryptfs/internal/stupidgcm" +) +  // PreferOpenSSL tells us if OpenSSL is faster than Go GCM on this machine.  // Go GCM is faster when the CPU has AES instructions and Go is v1.6 or higher  // on amd64. @@ -10,5 +14,8 @@ package prefer_openssl  // See https://github.com/rfjakob/gocryptfs/issues/23#issuecomment-218286502  // for benchmarks.  func PreferOpenSSL() bool { +	if stupidgcm.BuiltWithoutOpenssl { +		return false +	}  	return filePreferOpenSSL("/proc/cpuinfo")  } | 
