FIXUP Add undefined contact request status to protocol
FIXUP Improve the HMAC authentication proof slightly

This should be slightly more resistant to manipulation by either peer.