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

pkcs7: Fix endless loop when loading PKCS#7 via PEM import

Browse Source
This commit is contained in:
Christian Hohnstaedt 2021-10-30 00:40:06 +02:00 committed by Christian Hohnstädt
parent be1a44d0a8
commit 6efba2bb3e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pki_pkcs7.cpp
View File

@ -156,6 +156,13 @@ void pki_pkcs7::fromPEM_BIO(BIO *bio, const QString &name)
append_certs(myp7, name);
}
void pki_pkcs7::fromPEMbyteArray(const QByteArray &ba, const QString &name)
{
// Skip the pki_multi::fromPEMbyteArray(),
// which would cause an endless loop
pki_base::fromPEMbyteArray(ba, name);
}
void pki_pkcs7::fload(const QString &name)
{
PKCS7 *myp7;

1
lib/pki_pkcs7.h
View File

@ -36,6 +36,7 @@ class pki_pkcs7: public pki_multi
void encryptFile(pki_x509 *crt, const QString &filename);
void writeP7(XFile &file, bool PEM);
void fromPEM_BIO(BIO *bio, const QString &name);
void fromPEMbyteArray(const QByteArray &, const QString &);
void fload(const QString &name);
};
#endif