Merge pull request #1941 from reaperhulk/x509-cdp-still-more-vectors

more CDP vectors!