diff options
| author | Jakob Unterwurzacher | 2020-02-15 17:21:30 +0100 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2020-02-15 17:21:30 +0100 |
| commit | d5ce340c02601992cc9dab1bd7d3c2d95d81155e (patch) | |
| tree | e709cea1677b2d9dff80ce83d5086aaaebf03c49 /internal/speed/speed.go | |
| parent | 9aeb2a3df68539ad3a44283b9b94e1b28f011941 (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 'internal/speed/speed.go')
| -rw-r--r-- | internal/speed/speed.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/internal/speed/speed.go b/internal/speed/speed.go index f020fca..43fea5d 100644 --- a/internal/speed/speed.go +++ b/internal/speed/speed.go @@ -12,7 +12,6 @@ import ( "log" "testing" - "github.com/rfjakob/gocryptfs/internal/prefer_openssl" "github.com/rfjakob/gocryptfs/internal/siv_aead" "github.com/rfjakob/gocryptfs/internal/stupidgcm" ) @@ -24,8 +23,8 @@ func Run() { f func(*testing.B) preferred bool }{ - {name: "AES-GCM-256-OpenSSL", f: bStupidGCM, preferred: prefer_openssl.PreferOpenSSL()}, - {name: "AES-GCM-256-Go", f: bGoGCM, preferred: !prefer_openssl.PreferOpenSSL()}, + {name: "AES-GCM-256-OpenSSL", f: bStupidGCM, preferred: stupidgcm.PreferOpenSSL()}, + {name: "AES-GCM-256-Go", f: bGoGCM, preferred: !stupidgcm.PreferOpenSSL()}, {name: "AES-SIV-512-Go", f: bAESSIV, preferred: false}, } for _, b := range bTable { |