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

Fix Null pointer exception when importing PKCS#12 with OpenSSL 1.1.0

Browse Source 
Setting the EVP_PKEY type deletes the key with OpenSSL 1.1.0

Reported by Perederyaev Ivan. Thank you.
This commit is contained in:
Christian Hohnstaedt 2018-01-27 08:32:45 +01:00
parent eaabb2a28d
commit 27482fc080
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pki_evp.cpp
View File

@ -31,9 +31,8 @@ QString pki_evp::passHash = QString();
QPixmap *pki_evp::icon[2]= { NULL, NULL };
void pki_evp::init(int type)
void pki_evp::init()
{
EVP_PKEY_set_type(key, type);
class_name = "pki_evp";
ownPass = ptCommon;
dataVersion=2;
@ -150,16 +149,17 @@ void pki_evp::generate(int bits, int type, QProgressBar *progress, int curve_nid
pki_evp::pki_evp(const pki_evp *pk)
:pki_key(pk)
{
init(pk->getKeyType());
init();
pki_openssl_error();
ownPass = pk->ownPass;
encKey = pk->encKey;
}
pki_evp::pki_evp(const QString name, int type )
pki_evp::pki_evp(const QString name, int type)
:pki_key(name)
{
init(type);
init();
EVP_PKEY_set_type(key, type);
pki_openssl_error();
}

2
lib/pki_evp.h
View File

@ -22,7 +22,7 @@ class pki_evp: public pki_key
Q_OBJECT
protected:
QByteArray encKey;
void init(int type = EVP_PKEY_RSA);
void init();
void veryOldFromData(unsigned char *p, int size);
void openssl_pw_error(QString fname);
public: