Merge remote-tracking branch 'origin/candidate-9.4.x' into candidate-…

…9.6.x Signed-off-by: Jake Smith <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # version.cmake
hpcc-systems · Aug 15, 2024 · de97034 · de97034
2 parents a9e2c68 + a0c72ae
commit de97034
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/system/security/securesocket/securesocket.cpp b/system/security/securesocket/securesocket.cpp
@@ -1243,9 +1243,6 @@ static bool useCertificateChainPEMBuffer(SSL_CTX *ctx, const char *certBuf, int
                 if (!SSL_CTX_use_certificate(ctx, infoVal->x509))
                     return false;
 
-                if (ERR_peek_last_error() != 0)
-                    return false;
-
                 // Get ready to store intermediate certs, if any.
                 SSL_CTX_clear_chain_certs(ctx);
             }