Merge "crypto: Fix HMAC failure"