HMACEncryptionUtility changes