github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

allow nil additional data generator

pull/787/head
Darien Raymond 2017-11-26 16:55:35 +01:00
parent 4b990c49bc
commit 981c43afc2
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/crypto/auth.go
View File

@ -68,7 +68,10 @@ func (v *AEADAuthenticator) Open(dst, cipherText []byte) ([]byte, error) {
return nil, newError("invalid AEAD nonce size: ", len(iv)) 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) 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)) 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 return v.AEAD.Seal(dst, iv, plainText, additionalData), nil
} }