hardcoresushi
/
libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

cryptocore: rename "gcm" variable to generic "aeadCipher" 

As we now also support AES-SIV the old name is no longer
correct.
This commit is contained in:
Jakob Unterwurzacher 2016-10-04 00:15:27 +02:00
parent bb52937834
commit a00402cc47
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/cryptocore/cryptocore.go
View File

@ -55,21 +55,21 @@ func New(key []byte, backend BackendTypeEnum, IVBitLen int) *CryptoCore {
panic(err) panic(err)
} }
var gcm cipher.AEAD var aeadCipher cipher.AEAD
switch backend { switch backend {
case BackendOpenSSL: case BackendOpenSSL:
if IVLen != 16 { if IVLen != 16 {
panic("stupidgcm only supports 128-bit IVs") panic("stupidgcm only supports 128-bit IVs")
} }
gcm = stupidgcm.New(key) aeadCipher = stupidgcm.New(key)
case BackendGoGCM: case BackendGoGCM:
gcm, err = goGCMWrapper(blockCipher, IVLen) aeadCipher, err = goGCMWrapper(blockCipher, IVLen)
case BackendAESSIV: case BackendAESSIV:
// AES-SIV uses 1/2 of the key for authentication, 1/2 for // AES-SIV uses 1/2 of the key for authentication, 1/2 for
// encryption, so we need a 64-bytes key for AES-256. Derive it from // encryption, so we need a 64-bytes key for AES-256. Derive it from
// the master key by hashing it with SHA-512. // the master key by hashing it with SHA-512.
key64 := sha512.Sum512(key) key64 := sha512.Sum512(key)
gcm = siv_aead.New(key64[:]) aeadCipher = siv_aead.New(key64[:])
default: default:
panic("unknown backend cipher") panic("unknown backend cipher")
} }
@ -79,7 +79,7 @@ func New(key []byte, backend BackendTypeEnum, IVBitLen int) *CryptoCore {
return &CryptoCore{ return &CryptoCore{
BlockCipher: blockCipher, BlockCipher: blockCipher,
AEADCipher: gcm, AEADCipher: aeadCipher,
AEADBackend: backend, AEADBackend: backend,
IVGenerator: &nonceGenerator{nonceLen: IVLen}, IVGenerator: &nonceGenerator{nonceLen: IVLen},
IVLen: IVLen, IVLen: IVLen,