The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-14 11:06:19 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix PKCS#12 import for OpenSSL 1.0.0

Browse Source
This commit is contained in:
Christian Hohnstaedt 2010-08-23 07:16:20 +02:00
parent 36037ac388
commit 9ddb2ffa3b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pki_pkcs12.cpp
View File

@ -56,12 +56,12 @@ pki_pkcs12::pki_pkcs12(const QString fname, pem_password_cb *cb)
}
PKCS12_parse(pkcs12, pass, &mykey, &mycert, &certstack);
int error = ERR_peek_error();
if (error) {
if (ERR_GET_REASON(error) == PKCS12_R_MAC_VERIFY_FAILURE) {
ign_openssl_error();
PKCS12_free(pkcs12);
throw errorEx(getClassName(), tr("The supplied password was wrong (%1)").arg(ERR_reason_error_string(error)));
}
openssl_error();
ign_openssl_error();
if (mycert) {
if (mycert->aux && mycert->aux->alias) {
alias = asn1ToQString(mycert->aux->alias);