Editor's drafts for caw/fix-kdf branch of chris-wood/draft-pqpake