diff options
Diffstat (limited to 'internal/cryptocore')
| -rw-r--r-- | internal/cryptocore/cryptocore.go | 4 | ||||
| -rw-r--r-- | internal/cryptocore/cryptocore_test.go | 8 | 
2 files changed, 6 insertions, 6 deletions
| diff --git a/internal/cryptocore/cryptocore.go b/internal/cryptocore/cryptocore.go index 5244104..2c352c2 100644 --- a/internal/cryptocore/cryptocore.go +++ b/internal/cryptocore/cryptocore.go @@ -51,7 +51,7 @@ type CryptoCore struct {  // Even though the "GCMIV128" feature flag is now mandatory, we must still  // support 96-bit IVs here because they were used for encrypting the master  // key in gocryptfs.conf up to gocryptfs v1.2. v1.3 switched to 128 bits. -func New(key []byte, aeadType AEADTypeEnum, IVBitLen int, useHKDF bool) *CryptoCore { +func New(key []byte, aeadType AEADTypeEnum, IVBitLen int, useHKDF bool, forceDecode bool) *CryptoCore {  	if len(key) != KeyLen {  		log.Panic(fmt.Sprintf("Unsupported key length %d", len(key)))  	} @@ -86,7 +86,7 @@ func New(key []byte, aeadType AEADTypeEnum, IVBitLen int, useHKDF bool) *CryptoC  			if IVLen != 16 {  				log.Panic("stupidgcm only supports 128-bit IVs")  			} -			aeadCipher = stupidgcm.New(gcmKey) +			aeadCipher = stupidgcm.New(gcmKey, forceDecode)  		case BackendGoGCM:  			goGcmBlockCipher, err := aes.NewCipher(gcmKey)  			if err != nil { diff --git a/internal/cryptocore/cryptocore_test.go b/internal/cryptocore/cryptocore_test.go index 25f6572..4c34652 100644 --- a/internal/cryptocore/cryptocore_test.go +++ b/internal/cryptocore/cryptocore_test.go @@ -8,15 +8,15 @@ import (  func TestCryptoCoreNew(t *testing.T) {  	key := make([]byte, 32)  	for _, useHKDF := range []bool{true, false} { -		c := New(key, BackendOpenSSL, 128, useHKDF) +		c := New(key, BackendOpenSSL, 128, useHKDF, false)  		if c.IVLen != 16 {  			t.Fail()  		} -		c = New(key, BackendGoGCM, 96, useHKDF) +		c = New(key, BackendGoGCM, 96, useHKDF, false)  		if c.IVLen != 12 {  			t.Fail()  		} -		c = New(key, BackendGoGCM, 128, useHKDF) +		c = New(key, BackendGoGCM, 128, useHKDF, false)  		if c.IVLen != 16 {  			t.Fail()  		} @@ -32,5 +32,5 @@ func TestNewPanic(t *testing.T) {  	}()  	key := make([]byte, 16) -	New(key, BackendOpenSSL, 128, true) +	New(key, BackendOpenSSL, 128, true, false)  } | 
