From 981c43afc2bcfab7fbbf1455fee05b745d0e6262 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Sun, 26 Nov 2017 16:55:35 +0100 Subject: [PATCH] allow nil additional data generator --- common/crypto/auth.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/common/crypto/auth.go b/common/crypto/auth.go index 4e70fadd..192396b7 100644 --- a/common/crypto/auth.go +++ b/common/crypto/auth.go @@ -68,7 +68,10 @@ func (v *AEADAuthenticator) Open(dst, cipherText []byte) ([]byte, error) { return nil, newError("invalid AEAD nonce size: ", len(iv)) } - additionalData := v.AdditionalDataGenerator.Next() + var additionalData []byte + if v.AdditionalDataGenerator != nil { + additionalData = v.AdditionalDataGenerator.Next() + } return v.AEAD.Open(dst, iv, cipherText, additionalData) } @@ -78,7 +81,10 @@ func (v *AEADAuthenticator) Seal(dst, plainText []byte) ([]byte, error) { return nil, newError("invalid AEAD nonce size: ", len(iv)) } - additionalData := v.AdditionalDataGenerator.Next() + var additionalData []byte + if v.AdditionalDataGenerator != nil { + additionalData = v.AdditionalDataGenerator.Next() + } return v.AEAD.Seal(dst, iv, plainText, additionalData), nil }