generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-22 15:07:26 +01:00
Code Issues Projects Releases Wiki Activity

#3525: Bad management of file in case of OpenSSLException in X509Certificate::readPEM and X509Certificate::writePEM

Browse Source
This commit is contained in:
Günter Obiltschnig 2022-04-02 10:21:37 +02:00
parent 9fac40afa5
commit 753757fdf8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Crypto/src/X509Certificate.cpp
View File

@ -416,10 +416,14 @@ X509Certificate::List X509Certificate::readPEM(const std::string& pemFileName)
{
List caCertList;
BIO* pBIO = BIO_new_file(pemFileName.c_str(), "r");
if (pBIO == NULL) throw OpenFileException("X509Certificate::readPEM()");
if (pBIO == NULL) throw OpenFileException(Poco::format("X509Certificate::readPEM()", pemFileName));
X509* x = PEM_read_bio_X509(pBIO, NULL, 0, NULL);
if (!x) throw OpenSSLException(Poco::format("X509Certificate::readPEM(%s)", pemFileName));
while(x)
if (!x)
{
BIO_free(pBIO);
throw OpenSSLException(Poco::format("X509Certificate::readPEM(%s)", pemFileName));
}
while (x)
{
caCertList.push_back(X509Certificate(x));
x = PEM_read_bio_X509(pBIO, NULL, 0, NULL);
@ -432,14 +436,15 @@ X509Certificate::List X509Certificate::readPEM(const std::string& pemFileName)
void X509Certificate::writePEM(const std::string& pemFileName, const List& list)
{
BIO* pBIO = BIO_new_file(pemFileName.c_str(), "a");
if (pBIO == NULL) throw OpenFileException("X509Certificate::writePEM()");
if (pBIO == NULL) throw OpenFileException(Poco::format("X509Certificate::writePEM(%s)", pemFileName));
List::const_iterator it = list.begin();
List::const_iterator end = list.end();
for (; it != end; ++it)
{
if (!PEM_write_bio_X509(pBIO, const_cast<X509*>(it->certificate())))
{
throw OpenSSLException("X509Certificate::writePEM()");
BIO_free(pBIO);
throw OpenSSLException(Poco::format("X509Certificate::writePEM(%s)", pemFileName));
}
}
BIO_free(pBIO);