crypto: fix CipherFinal return value check
crypto: allow setting add'l authenticated data
Merge remote-tracking branch 'upstream/master'