Various enhancements to PKCS#12 code, new