fix error handling

GrigoryPervakov · Mar 25, 2024 · a2ad832 · a2ad832
1 parent 570dc32
commit a2ad832
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Server/CertificateReloader.cpp b/src/Server/CertificateReloader.cpp
@@ -32,30 +32,30 @@ int CertificateReloader::setCertificate(SSL * ssl)
     if (current->certs_chain.empty())
         return -1;
 
-    if (auto err = SSL_clear_chain_certs(ssl))
+    if (auto err = SSL_clear_chain_certs(ssl); err != 1)
     {
         LOG_ERROR(log, "Clear certificates {}", Poco::Net::Utility::getLastError());
         return -1;
     }
-    if (auto err = SSL_use_certificate(ssl, const_cast<X509 *>(current->certs_chain[0].certificate())))
+    if (auto err = SSL_use_certificate(ssl, const_cast<X509 *>(current->certs_chain[0].certificate())); err != 1)
     {
         LOG_ERROR(log, "Use certificate {}", Poco::Net::Utility::getLastError());
         return -1;
     }
     for (auto cert = current->certs_chain.begin() + 1; cert != current->certs_chain.end(); cert++)
     {
-        if (auto err = SSL_add1_chain_cert(ssl, const_cast<X509 *>(cert->certificate())))
+        if (auto err = SSL_add1_chain_cert(ssl, const_cast<X509 *>(cert->certificate())); err != 1)
         {
             LOG_ERROR(log, "Add certificate to chain {}", Poco::Net::Utility::getLastError());
             return -1;
         }
     }
-    if (auto err = SSL_use_PrivateKey(ssl, const_cast<EVP_PKEY *>(static_cast<const EVP_PKEY *>(current->key))))
+    if (auto err = SSL_use_PrivateKey(ssl, const_cast<EVP_PKEY *>(static_cast<const EVP_PKEY *>(current->key))); err != 1)
     {
         LOG_ERROR(log, "Use private key {}", Poco::Net::Utility::getLastError());
         return -1;
     }
-    if (auto err = SSL_check_private_key(ssl))
+    if (auto err = SSL_check_private_key(ssl); err != 1)
     {
         LOG_ERROR(log, "Unusable key-pair {}", Poco::Net::Utility::getLastError());
         return -1;