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. --- internal/prefer_openssl/prefer.go | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 internal/prefer_openssl/prefer.go (limited to 'internal/prefer_openssl/prefer.go') diff --git a/internal/prefer_openssl/prefer.go b/internal/prefer_openssl/prefer.go deleted file mode 100644 index 74c26b7..0000000 --- a/internal/prefer_openssl/prefer.go +++ /dev/null @@ -1,31 +0,0 @@ -// Package prefer_openssl tries to determine if we should prefer openssl -// on the platform we are running on. -package prefer_openssl - -import ( - "io/ioutil" - "regexp" - - "github.com/rfjakob/gocryptfs/internal/tlog" -) - -// filePreferOpenSSL 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. -// -// See https://github.com/rfjakob/gocryptfs/issues/23#issuecomment-218286502 -// for benchmarks. -// -// filePreferOpenSSL takes an explicit filename so it can be tested with saved -// cpuinfo files instead of /proc/cpuinfo. -func filePreferOpenSSL(file string) bool { - ci, err := ioutil.ReadFile(file) - if err != nil { - return true - } - haveAes, err := regexp.Match(`(?m)^flags.*\baes\b`, ci) - if err != nil { - tlog.Warn.Println(err) - return true - } - return !haveAes -} -- cgit v1.2.3