Certificate manager and ref counted certificate type

Applications/ConsoleReferenceClient/ConnectTester.cs

@@ -40,6 +40,7 @@
 using Opc.Ua;
 using Opc.Ua.Client;
 using Opc.Ua.Configuration;
+using Opc.Ua.Security.Certificates;
 
 namespace Quickstarts
 {
@@ -87,13 +88,15 @@ public async Task RunAsync(CancellationToken ct)
                 // Define the UA Client application
                 var passwordProvider = new CertificatePasswordProvider([]);
 
+#pragma warning disable CA2000 // Dispose objects before losing scope
                 var application = new ApplicationInstance(m_telemetry)
                 {
                     ApplicationName = applicationName,
                     ApplicationType = ApplicationType.Client,
                     ConfigSectionName = configSectionName,
                     CertificatePasswordProvider = passwordProvider
                 };
+#pragma warning restore CA2000 // Dispose objects before losing scope
 
                 // load the application configuration.
                 ApplicationConfiguration configuration = m_configuration = await application
@@ -121,7 +124,9 @@ public async Task RunAsync(CancellationToken ct)
 
                 var endpointConfiguration = EndpointConfiguration.Create(m_configuration);
                 var sessionFactory = new DefaultSessionFactory(m_telemetry);
+#pragma warning disable CA2000 // Dispose objects before losing scope
                 var userNameidentity = new UserIdentity(kUserName, new UTF8Encoding(false).GetBytes(kPassword));
+#pragma warning restore CA2000 // Dispose objects before losing scope
 
                 foreach (EndpointDescription ii in endpoints.ToArray())
                 {
@@ -252,6 +257,7 @@ internal async Task<SessionWrapper> RunTestAsync(
                 endpointConfiguration);
 
             // Create the session
+#pragma warning disable CA2000 // Dispose objects before losing scope
             ISession isession = await sessionFactory
                 .CreateAsync(
                     m_configuration,
@@ -266,6 +272,7 @@ internal async Task<SessionWrapper> RunTestAsync(
                     ct
                 )
                 .ConfigureAwait(false);
+#pragma warning restore CA2000 // Dispose objects before losing scope
 
             SessionWrapper wrapper = m_wrapper = new SessionWrapper { Session = isession };
 
@@ -288,17 +295,17 @@ internal async Task<SessionWrapper> RunTestAsync(
             return wrapper;
         }
 
+#if NET8_0_OR_GREATER
         private async Task<UserIdentity> LoadUserCertificateAsync(
             string thumbprint,
             string password,
             CancellationToken ct)
         {
             CertificateTrustList store = m_configuration.SecurityConfiguration.TrustedUserCertificates;
-#if NET8_0_OR_GREATER
             // get user certificate with matching thumbprint
-            X509Certificate2Collection certificates =
+            CertificateCollection certificates =
                 await store.GetCertificatesAsync(m_telemetry, ct).ConfigureAwait(false);
-            X509Certificate2 hit = certificates
+            Certificate hit = certificates
                 .Find(X509FindType.FindByThumbprint, thumbprint, false)
                 .FirstOrDefault();
 
@@ -314,11 +321,18 @@ private async Task<UserIdentity> LoadUserCertificateAsync(
                 new CertificatePasswordProvider(new UTF8Encoding(false).GetBytes(password)),
                 m_telemetry,
                 ct).ConfigureAwait(false);
+        }
 #else
-            await Task.Delay(1, ct).ConfigureAwait(false);
-            throw new NotSupportedException("User certificate identity is only supported on .NET 8 or greater.");
-#endif
+        private Task<UserIdentity> LoadUserCertificateAsync(
+            string thumbprint,
+            string password,
+            CancellationToken ct)
+        {
+            return Task.FromException<UserIdentity>(
+                new NotSupportedException(
+                    "User certificate identity is only supported on .NET 8 or greater."));
         }
+#endif
 
         private static async ValueTask<ArrayOf<EndpointDescription>> GetEndpointsAsync(
             ApplicationConfiguration application,

Applications/ConsoleReferenceClient/Program.cs

@@ -30,7 +30,6 @@
 using System;
 using System.Collections.Generic;
 using System.CommandLine;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -43,6 +42,7 @@
 using Opc.Ua.Client;
 using Opc.Ua.Client.ComplexTypes;
 using Opc.Ua.Configuration;
+using Opc.Ua.Security.Certificates;
 
 namespace Quickstarts.ConsoleReferenceClient
 {
@@ -762,7 +762,7 @@ private static async Task<CertificateIdentifier> FindUserCertificateIdentifierAs
         {
             CertificateIdentifier userCertificateIdentifier = null;
 
-            X509Certificate2Collection userCertificatesWithMatchingThumbprint =
+            CertificateCollection userCertificatesWithMatchingThumbprint =
                 await trustedUserCertificates.GetCertificatesAsync(telemetry, ct).ConfigureAwait(false);
             // get user certificate with matching thumbprint
             userCertificatesWithMatchingThumbprint =