x509 changes for 0.9.8e support

#748