Merge branch 'master' of https://github.com/convertersystems/opc-ua-c…

…lient
convertersystems · Sep 14, 2021 · f850503 · f850503
2 parents 49dba32 + 8d4f8d5
commit f850503
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/UaClient/ServiceModel/Ua/DirectoryStore.cs b/UaClient/ServiceModel/Ua/DirectoryStore.cs
@@ -15,6 +15,7 @@
 using Org.BouncyCastle.OpenSsl;
 using Org.BouncyCastle.Pkix;
 using Org.BouncyCastle.Security;
+using Org.BouncyCastle.Security.Certificates;
 using Org.BouncyCastle.X509;
 using Org.BouncyCastle.X509.Extension;
 using Org.BouncyCastle.X509.Store;
@@ -277,6 +278,13 @@ public Task<bool> ValidateRemoteCertificateAsync(X509Certificate target, ILogger
                 throw new ArgumentNullException(nameof(target));
             }
 
+            if (!target.IsValidNow)
+            {
+                logger?.LogError($"Error validatingRemoteCertificate. Certificate is expired or not yet valid.");
+                StoreInRejectedFolder(target);
+                return Task.FromResult(false);
+            }
+
             var trustedCerts = new Org.BouncyCastle.Utilities.Collections.HashSet();
             var trustedCertsInfo = new DirectoryInfo(Path.Combine(_pkiPath, "trusted"));
             if (!trustedCertsInfo.Exists)
@@ -314,7 +322,7 @@ public Task<bool> ValidateRemoteCertificateAsync(X509Certificate target, ILogger
                     }
                 }
             }
-
+            
             if (IsSelfSigned(target))
             {
                 // Create the selector that specifies the starting certificate