Merge pull request #1423 from alex/pr/1396

Add MACContext and switch HMAC and CMAC to use it