From 37a9b4c3ee9d5dd332ae2f4b25942c6fef254d72 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Thu, 3 Mar 2016 00:58:12 +0100 Subject: [PATCH] Enable openssl in tests to support old Go versions Go 1.4 and older do not support 128-bit IVs which caused the tests to panic. --- internal/configfile/config_file.go | 4 ++-- internal/contentenc/content_test.go | 6 +++--- internal/nametransform/names_test.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go index 0b910c0..e54e84e 100644 --- a/internal/configfile/config_file.go +++ b/internal/configfile/config_file.go @@ -98,8 +98,8 @@ func LoadConfFile(filename string, password string) ([]byte, *ConfFile, error) { scryptHash := cf.ScryptObject.DeriveKey(password) // Unlock master key using password-based key - // We use stock go GCM instead of OpenSSL here as speed is not important - // and we get better error messages + // We use stock go GCM instead of OpenSSL here as we only use 96-bit IVs, + // speed is not important and we get better error messages cc := cryptocore.New(scryptHash, false, false) ce := contentenc.New(cc, 4096) diff --git a/internal/contentenc/content_test.go b/internal/contentenc/content_test.go index 2272aa3..299c8c8 100644 --- a/internal/contentenc/content_test.go +++ b/internal/contentenc/content_test.go @@ -23,7 +23,7 @@ func TestSplitRange(t *testing.T) { testRange{6654, 8945}) key := make([]byte, cryptocore.KeyLen) - cc := cryptocore.New(key, false, true) + cc := cryptocore.New(key, true, true) f := New(cc, DefaultBS) for _, r := range ranges { @@ -51,7 +51,7 @@ func TestCiphertextRange(t *testing.T) { testRange{6654, 8945}) key := make([]byte, cryptocore.KeyLen) - cc := cryptocore.New(key, false, true) + cc := cryptocore.New(key, true, true) f := New(cc, DefaultBS) for _, r := range ranges { @@ -74,7 +74,7 @@ func TestCiphertextRange(t *testing.T) { func TestBlockNo(t *testing.T) { key := make([]byte, cryptocore.KeyLen) - cc := cryptocore.New(key, false, true) + cc := cryptocore.New(key, true, true) f := New(cc, DefaultBS) b := f.CipherOffToBlockNo(788) diff --git a/internal/nametransform/names_test.go b/internal/nametransform/names_test.go index 4a0043b..f996860 100644 --- a/internal/nametransform/names_test.go +++ b/internal/nametransform/names_test.go @@ -14,7 +14,7 @@ func TestEncryptPathNoIV(t *testing.T) { s = append(s, "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890") key := make([]byte, cryptocore.KeyLen) - cc := cryptocore.New(key, false, true) + cc := cryptocore.New(key, true, true) fs := New(cc, true, false) for _, n := range s {