Add handshake challenge validation