[Package Signing] Update Test.Utility dependency (#345)

Author: loic-sharma

tests/Validation.PackageSigning.Core.Tests/Support/CertificateIntegrationTestFixture.cs

@@ -32,7 +32,7 @@ public class CertificateIntegrationTestFixture : IDisposable
         private readonly Lazy<Task<X509Certificate2>> _signingCertificate;
         private readonly Lazy<Task<string>> _signingCertificateThumbprint;
         private TrustedTestCert<X509Certificate2> _trustedRoot;
-        private readonly DisposableList _responders;
+        private readonly DisposableList<IDisposable> _responders;
 
         public CertificateIntegrationTestFixture()
         {
@@ -47,7 +47,7 @@ public CertificateIntegrationTestFixture()
             _timestampServiceUrl = new Lazy<Task<Uri>>(CreateDefaultTrustedTimestampServiceUrlAsync);
             _signingCertificate = new Lazy<Task<X509Certificate2>>(CreateDefaultTrustedSigningCertificateAsync);
             _signingCertificateThumbprint = new Lazy<Task<string>>(GetDefaultTrustedSigningCertificateThumbprintAsync);
-            _responders = new DisposableList();
+            _responders = new DisposableList<IDisposable>();
         }
 
         public Task<SigningTestServer> GetTestServerAsync() => _testServer.Value;
@@ -62,7 +62,7 @@ public async Task<X509Certificate2> GetSigningCertificateAsync()
 
         protected Task<CertificateAuthority> GetRootCertificateAuthority() => _rootCertificateAuthority.Value;
         protected Task<CertificateAuthority> GetCertificateAuthority() => _certificateAuthority.Value;
-        protected DisposableList GetResponders() => _responders;
+        protected DisposableList<IDisposable> GetResponders() => _responders;
 
         public void Dispose()
         {
@@ -141,11 +141,16 @@ void CustomizeAsSigningCertificate(X509V3CertificateGenerator generator)
             Action<X509V3CertificateGenerator> customizeCertificate)
         {
             var keyPair = SigningTestUtility.GenerateKeyPair(publicKeyLength: 2048);
-            var publicCertificate = ca.IssueCertificate(
-                keyPair.Public,
-                new X509Name($"C=US,ST=WA,L=Redmond,O=NuGet,CN=NuGet Test ${name} Certificate ({Guid.NewGuid()})"),
-                customizeCertificate,
-                notBefore: DateTime.UtcNow.AddSeconds(-10));
+
+            var publicCertificate = ca.IssueCertificate(new IssueCertificateOptions
+            {
+                CustomizeCertificate = customizeCertificate,
+                NotAfter = DateTime.UtcNow.AddMinutes(10),
+                NotBefore = DateTime.UtcNow.AddSeconds(-10),
+                KeyPair = keyPair,
+
+                SubjectName = new X509Name($"C=US,ST=WA,L=Redmond,O=NuGet,CN=NuGet Test ${name} Certificate ({Guid.NewGuid()})")
+            });
 
             var certificate = new X509Certificate2(publicCertificate.GetEncoded());
             certificate.PrivateKey = DotNetUtilities.ToRSA(keyPair.Private as RsaPrivateCrtKeyParameters);

tests/Validation.PackageSigning.Core.Tests/Support/ExtensionMethods.cs

@@ -1,19 +1,27 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+using System.Security.Cryptography.X509Certificates;
 using Test.Utility.Signing;
+using BCCertificate = Org.BouncyCastle.X509.X509Certificate;
 
 namespace Validation.PackageSigning.Core.Tests.Support
 {
     public static class ExtensionMethods
     {
-        public static DisposableList RegisterResponders(
+        public static X509Certificate2 ToX509Certificate2(this BCCertificate certificate)
+        {
+            return new X509Certificate2(certificate.GetEncoded());
+        }
+
+        public static DisposableList<IDisposable> RegisterResponders(
             this ISigningTestServer testServer,
             CertificateAuthority ca,
             bool addCa = true,
             bool addOcsp = true)
         {
-            var responders = new DisposableList();
+            var responders = new DisposableList<IDisposable>();
             var currentCa = ca;
 
             while (currentCa != null)
@@ -34,7 +42,7 @@ public static DisposableList RegisterResponders(
             return responders;
         }
 
-        public static DisposableList RegisterResponders(
+        public static DisposableList<IDisposable> RegisterResponders(
             this ISigningTestServer testServer,
             TimestampService timestampService,
             bool addCa = true,

tests/Validation.PackageSigning.Core.Tests/Validation.PackageSigning.Core.Tests.csproj

@@ -71,7 +71,7 @@
       <Version>4.4.0</Version>
     </PackageReference>
     <PackageReference Include="Test.Utility">
-      <Version>4.7.0-preview1-4886</Version>
+      <Version>4.7.0-preview1.4948+f399fefacef3d4cc769a1580e812e1045d1d3b3e</Version>
     </PackageReference>
     <PackageReference Include="xunit">
       <Version>2.3.1</Version>

tests/Validation.PackageSigning.ExtractAndValidateSignature.Tests/SignatureValidatorIntegrationTests.cs

@@ -22,7 +22,7 @@
 using NuGet.Services.Validation.Issues;
 using NuGetGallery;
 using Test.Utility.Signing;
-using Validation.PackageSigning.ExtractAndValidateSignature.Tests.Support;
+using Validation.PackageSigning.Core.Tests.Support;
 using Xunit;
 using Xunit.Abstractions;
 using NuGetHashAlgorithmName = NuGet.Common.HashAlgorithmName;

tests/Validation.PackageSigning.ExtractAndValidateSignature.Tests/Support/ExtensionMethods.cs

@@ -35,7 +35,6 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Support\ExtensionMethods.cs" />
     <Compile Include="Support\RecordingLogger.cs" />
     <Compile Include="Support\CertificateIntegrationTestCollection.cs" />
     <Compile Include="Support\CertificateIntegrationTestFixture.cs" />
@@ -61,7 +60,7 @@
       <Version>1.8.1.3</Version>
     </PackageReference>
     <PackageReference Include="Test.Utility">
-      <Version>4.7.0-preview1-4886</Version>
+      <Version>4.7.0-preview1.4948+f399fefacef3d4cc769a1580e812e1045d1d3b3e</Version>
     </PackageReference>
     <PackageReference Include="xunit">
       <Version>2.3.1</Version>

tests/Validation.PackageSigning.ExtractAndValidateSignature.Tests/Validation.PackageSigning.ExtractAndValidateSignature.Tests.csproj

@@ -104,18 +104,21 @@ public async Task UnknownCertificate()
         public async Task RevokedEndCertificate()
         {
             // Arrange - create a revocation date with no milliseconds
+            var crlUpdateTime = DateTimeOffset.Parse("10/21/1995 4:05:06 PM");
             var revocationDate = DateTimeOffset.Parse("02/18/1994 1:02:03 PM");
 
-            var certificate = await _fixture.GetRevokedSigningCertificateAsync(revocationDate);
-
-            // Act & assert
-            var result = _target.VerifyCodeSigningCertificate(certificate, new X509Certificate2[0]);
+            using (var revokedChain = await _fixture.GetRevokedSigningCertificateAsync(revocationDate, crlUpdateTime))
+            {
+                // Act & assert
+                var result = _target.VerifyCodeSigningCertificate(revokedChain.EndCertificate, new X509Certificate2[0]);
 
-            Assert.Equal(EndCertificateStatus.Revoked, result.Status);
-            Assert.Equal(X509ChainStatusFlags.Revoked, result.StatusFlags);
-            Assert.NotNull(result.StatusUpdateTime);
-            Assert.NotNull(result.RevocationTime);
-            Assert.Equal(revocationDate, result.RevocationTime.Value);
+                Assert.Equal(EndCertificateStatus.Revoked, result.Status);
+                Assert.Equal(X509ChainStatusFlags.Revoked, result.StatusFlags);
+                Assert.NotNull(result.StatusUpdateTime);
+                Assert.NotNull(result.RevocationTime);
+                Assert.Equal(crlUpdateTime, result.StatusUpdateTime.Value);
+                Assert.Equal(revocationDate, result.RevocationTime.Value);
+            }
         }
 
         [Fact]