prefer_openssl: default to Go GCM on OSX

This commit is contained in:
Jakob Unterwurzacher 2016-12-10 21:04:17 +01:00
parent 12374be9c5
commit 8be54bf3f8
2 changed files with 8 additions and 5 deletions

View File

@ -5,7 +5,6 @@ package prefer_openssl
import (
"io/ioutil"
"regexp"
"runtime"
"github.com/rfjakob/gocryptfs/internal/tlog"
)
@ -19,10 +18,6 @@ import (
// filePreferOpenSSL takes an explicit filename so it can be tested with saved
// cpuinfo files instead of /proc/cpuinfo.
func filePreferOpenSSL(file string) bool {
if runtime.GOOS == "darwin" && file == "/proc/cpuinfo" {
// OSX does not have /proc, let's not warn about it.
return true
}
ci, err := ioutil.ReadFile(file)
if err != nil {
return true

View File

@ -4,6 +4,8 @@
package prefer_openssl
import (
"runtime"
"github.com/rfjakob/gocryptfs/internal/stupidgcm"
)
@ -17,5 +19,11 @@ func PreferOpenSSL() bool {
if stupidgcm.BuiltWithoutOpenssl {
return false
}
if runtime.GOOS == "darwin" {
// OSX does not have /proc/cpuinfo, let's just assume the CPU has AES
// acceleration. Virtually all Macs that are running today have it I
// guess?
return false
}
return filePreferOpenSSL("/proc/cpuinfo")
}