Skip to content

Commit 5d8210a

Browse files
committed
Merge nested if statements.
1 parent b843dc2 commit 5d8210a

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/MySqlConnector/Core/ServerSession.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,14 +1299,15 @@ bool ValidateRemoteCertificate(object rcbSender, X509Certificate? rcbCertificate
12991299
if (cs.SslMode is MySqlSslMode.Preferred or MySqlSslMode.Required)
13001300
return true;
13011301

1302-
if ((rcbPolicyErrors & SslPolicyErrors.RemoteCertificateChainErrors) != 0 && caCertificateChain is not null && rcbCertificate is not null)
1302+
if ((rcbPolicyErrors & SslPolicyErrors.RemoteCertificateChainErrors) != 0 &&
1303+
rcbCertificate is not null &&
1304+
caCertificateChain is not null &&
1305+
caCertificateChain.Build((X509Certificate2) rcbCertificate) &&
1306+
caCertificateChain.ChainStatus.Length > 0)
13031307
{
1304-
if (caCertificateChain.Build((X509Certificate2) rcbCertificate) && caCertificateChain.ChainStatus.Length > 0)
1305-
{
1306-
var chainStatus = caCertificateChain.ChainStatus[0].Status & ~X509ChainStatusFlags.UntrustedRoot;
1307-
if (chainStatus == X509ChainStatusFlags.NoError)
1308-
rcbPolicyErrors &= ~SslPolicyErrors.RemoteCertificateChainErrors;
1309-
}
1308+
var chainStatus = caCertificateChain.ChainStatus[0].Status & ~X509ChainStatusFlags.UntrustedRoot;
1309+
if (chainStatus == X509ChainStatusFlags.NoError)
1310+
rcbPolicyErrors &= ~SslPolicyErrors.RemoteCertificateChainErrors;
13101311
}
13111312

13121313
if (cs.SslMode == MySqlSslMode.VerifyCA)

0 commit comments

Comments
 (0)