More SSL error queue cleaning #29171
Conversation
|
@dotnet-bot test Outerloop Linux x64 Release Build |
|
1st round of CI passed, starting a second one: @dotnet-bot test Outerloop Linux x64 Release Build |
| return true; | ||
| } | ||
| Exception ignored; | ||
| return TryRead(data, out pkcs12Reader, out ignored, captureException: false); |
There was a problem hiding this comment.
Nit: this can be:
public static bool TryRead(byte[] data, out OpenSslPkcs12Reader pkcs12Reader) =>
TryRead(data, out pkcs12Reader, out _, captureException: false);Same in various places below.
| if (!p12.IsInvalid) | ||
| { | ||
| pkcs12Reader = new OpenSslPkcs12Reader(p12); | ||
| openSslException = null; |
There was a problem hiding this comment.
This setting to null isn't needed, or alternatively moved the earlier setting to null down to the else block below (in which case it'd be good to keep the previous method that follows a similar form in sync with this pattern).
| { | ||
| Interop.Crypto.ErrClearError(); | ||
| } | ||
|
|
||
| return !pkcs7.IsInvalid; |
There was a problem hiding this comment.
Nit: This is inconsistent from other similar cases. To be consistent it would be:
if (pkcs7.IsInvalid)
{
Interop.Crypto.ErrClearError();
return false;
}
return true;
|
@dotnet-bot test Linux x64 Release Build please (segfault in drawing tests in GdipGetPathPoints) |
|
Thanks for the review @stephentoub - the 2nd CI pass had also completed without errors if the 3rd one goes well I'll merge this PR and start the tasks to get it into 2.1 branch. @dotnet-bot test Outerloop Linux x64 Release Build |
* Cleaning up more instances leaving errors on SSL queue * Fixes #25676
* Cleaning up more instances leaving errors on SSL queue * Fixes dotnet/corefx#25676 Commit migrated from dotnet/corefx@c0083e0
Another batch of cleaning SSL error queue. Trying to be minimize the extension of the changes while ensuring the SSL error queue is clean of typical errors without affecting exceptions currently throw by the code. In interest of keeping the perf unchanged calls to cleanup the queue are ideally only added in case of errors and preferably via ERR_clear_error.
The targets addressed on this change were identified via debugger by selecting calls that were putting errors on the SSL queue. The removal of the active issue is at this point still tentative: I can't be sure that it is going to pass reliable on Outerloop and I do not have any more local repros.
Contributes to #25676 (moved to dotnet/runtime#24335).