Merge pull request #1151 from lvh/consolidate-x509-vfy

Consolidate x509_vfy