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

fix 2 warnings in CodeAnalysis #3388

Merged
merged 4 commits into from
May 13, 2020
Merged

fix 2 warnings in CodeAnalysis #3388

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46b2bde
fix 2 warnings in CodeAnalysis
heng-liu May 12, 2020
36f5372
fix AddCertificate
heng-liu May 12, 2020
99d99a0
temporarily set TreatWarningsAsErrors to false to pass the build
heng-liu May 12, 2020
f47238b
Revert "temporarily set TreatWarningsAsErrors to false to pass the bu…
heng-liu May 13, 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
5 changes: 4 additions & 1 deletion src/NuGet.Core/NuGet.Packaging/Signing/Cms/ManagedCmsWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ public void AddCertificates(IEnumerable<X509Certificate2> certificates)
{
foreach (var cert in certificates)
{
_signedCms.AddCertificate(new X509Certificate2(cert));
using (var certificate = new X509Certificate2(cert))
{
_signedCms.AddCertificate(certificate);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By putting this is a using block, it means the certificate that was added to _signedCms is now disposed. Are you sure that's ok?

Copy link
Contributor Author

@heng-liu heng-liu May 12, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for reviewing!
Looks like the AddCertificate method will create a copy of the certificate in following code:
https://github.com/dotnet/runtime/blob/master/src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/SignedCms.cs#L639-L671

Copy link
Member

@zivkan zivkan May 12, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider adding a comment saying that AddCertificates copies the cert.

As you pointed out, there's no point making a new cert.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it should be ok not new any certificate, just use the one from parameter.
I'll fix it. Thanks!

}
}

Expand Down
3 changes: 2 additions & 1 deletion src/NuGet.Core/NuGet.Packaging/Signing/Timestamp/Rfc3161TimestampProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ public class Rfc3161TimestampProvider : ITimestampProvider
{
// Url to an RFC 3161 timestamp server
private readonly Uri _timestamperUrl;
#if IS_SIGNING_SUPPORTED
private static readonly TimeSpan RequestTimeout = TimeSpan.FromSeconds(10);

#endif
public Rfc3161TimestampProvider(Uri timeStampServerUrl)
{
#if IS_SIGNING_SUPPORTED
Expand Down