Merge pull request #1405 from alex/fix-pkcs12-decrypt-failures

Handle PKCS12 decrypt failures with OpenSSL 1.0.1j