Additions to support hmac authentication