Use hmac instead of a second pbkdf