Merge remote-tracking branch 'origin/candidate-9.8.x'

jakesmith · jakesmith · commit e6c9360efaf6 · 2024-08-15T16:40:07.000+01:00
Signed-off-by: Jake Smith &lt;jake.smith@lexisnexisrisk.com&gt;
diff --git a/system/security/securesocket/securesocket.cpp b/system/security/securesocket/securesocket.cpp
@@ -1260,9 +1260,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);
             }

Original file line number	Diff line number	Diff line change
`@@ -1260,9 +1260,6 @@ static bool useCertificateChainPEMBuffer(SSL_CTX ctx, const char certBuf, int`
`1260`	`1260`	`if (!SSL_CTX_use_certificate(ctx, infoVal->x509))`
`1261`	`1261`	`return false;`
`1262`	`1262`
`1263`		`- if (ERR_peek_last_error() != 0)`
`1264`		`- return false;`
`1265`		`-`
`1266`	`1263`	`// Get ready to store intermediate certs, if any.`
`1267`	`1264`	`SSL_CTX_clear_chain_certs(ctx);`
`1268`	`1265`	`}`