Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Linux test failure due to generic exception #3405

Merged
merged 7 commits into from
May 22, 2020
Merged

Linux test failure due to generic exception #3405

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
afcb429
changed err code to a generic openssl reader exception
kartheekp-ms May 20, 2020
ed5e00c
Revert "changed err code to a generic openssl reader exception"
kartheekp-ms May 21, 2020
fe934ab
added asn1 corrupted data error in case statement
kartheekp-ms May 21, 2020
d879cc3
try build after removing asn1 case statement
kartheekp-ms May 21, 2020
eaedc24
Revert "try build after removing asn1 case statement"
kartheekp-ms May 22, 2020
6df827e
added conditional compilation symbol for exceptions raised by crypto …
kartheekp-ms May 22, 2020
1f5a4d9
added conditional compilation
kartheekp-ms May 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,14 @@ internal static class CertificateProvider

private const int MACOS_INVALID_CERT = -25257;


#if IS_SIGNING_SUPPORTED && IS_CORECLR
//Generic exception ASN1 corrupted data
private const int OPENSSL_ASN1_CORRUPTED_DATA_ERROR = unchecked((int)0x80131501);
#else
// OpenSSL: error:0D07803A:asn1 encoding routines:ASN1_ITEM_EX_D2I:nested asn1 error
private const int OPENSSL_ERR_R_NESTED_ASN1_ERROR = 0x0D07803A;
#endif

/// <summary>
/// Looks for X509Certificates using the CertificateSourceOptions.
Expand Down Expand Up @@ -77,7 +83,11 @@ public static async Task<X509Certificate2Collection> GetCertificatesAsync(Certif
options.CertificatePath)));

case CRYPT_E_NO_MATCH_HRESULT:
#if IS_SIGNING_SUPPORTED && IS_CORECLR
case OPENSSL_ASN1_CORRUPTED_DATA_ERROR:
#else
case OPENSSL_ERR_R_NESTED_ASN1_ERROR:
#endif
case MACOS_INVALID_CERT:
throw new SignCommandException(
LogMessage.CreateError(NuGetLogCode.NU3001,
Expand Down