Merge pull request #1442 from reaperhulk/x509-interface

X509 interfaces