Fix MAC in CryptoUtils (should delegate)