Merge pull request #2236 from reaperhulk/x509-split

start splitting the x509 module