diff options
| author | Jakob Unterwurzacher | 2016-09-25 18:04:44 +0200 | 
|---|---|---|
| committer | Jakob Unterwurzacher | 2016-09-25 18:40:29 +0200 | 
| commit | abd61d968d80a54b366bf65b9dc1fcf2c5bfa1e1 (patch) | |
| tree | 80349d34e49c17051e41f7ab3585777ab0b625fa /internal/contentenc | |
| parent | b883dd10a62eb8d7ddf589e2878d8e0f65a90e83 (diff) | |
contentenc: rename constant "IVBitLen" to "DefaultIVBits" and clarify comment
128-bit IVs are NOT used everywhere.
Diffstat (limited to 'internal/contentenc')
| -rw-r--r-- | internal/contentenc/content.go | 5 | ||||
| -rw-r--r-- | internal/contentenc/content_test.go | 6 | 
2 files changed, 6 insertions, 5 deletions
| diff --git a/internal/contentenc/content.go b/internal/contentenc/content.go index 5a628c8..7561859 100644 --- a/internal/contentenc/content.go +++ b/internal/contentenc/content.go @@ -16,8 +16,9 @@ type NonceMode int  const (  	// Default plaintext block size  	DefaultBS = 4096 -	// We always use 128-bit IVs for file content encryption -	IVBitLen = 128 +	// We always use 128-bit IVs for file content, but the +	// key in the config file is encrypted with a 96-bit IV. +	DefaultIVBits = 128  	_                                   = iota // skip zero  	RandomNonce               NonceMode = iota diff --git a/internal/contentenc/content_test.go b/internal/contentenc/content_test.go index faa2780..70b71fe 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, cryptocore.BackendOpenSSL, IVBitLen) +	cc := cryptocore.New(key, cryptocore.BackendOpenSSL, DefaultIVBits)  	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, cryptocore.BackendOpenSSL, IVBitLen) +	cc := cryptocore.New(key, cryptocore.BackendOpenSSL, DefaultIVBits)  	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, cryptocore.BackendOpenSSL, IVBitLen) +	cc := cryptocore.New(key, cryptocore.BackendOpenSSL, DefaultIVBits)  	f := New(cc, DefaultBS)  	b := f.CipherOffToBlockNo(788) | 
