Include publicInfo in secretInfo and use full domain hash.