rfc4880bis: Apply errata 2242