Version 9.0.2303.2301

https://www.gurux.fi/index.php/release/gxdlmsdirector-9023032301
capriusbai · Mar 23, 2023 · 27a3955 · 27a3955
1 parent 072ac9d
commit 27a3955
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/Development/ConformanceTests/GXConformanceTests.cs b/Development/ConformanceTests/GXConformanceTests.cs
@@ -961,7 +961,7 @@ public static void ReadXmlMeter(object data)
                     dev.Comm.LogFile = Path.Combine(test.Results, "Trace.txt");
                     GXDLMSClient cl = dev.Comm.client;
                     converter = new GXDLMSConverter(dev.Standard);
-                    dev.Comm.client = new GXDLMSXmlClient(TranslatorOutputType.SimpleXml, true);
+                    dev.Comm.client = new GXDLMSXmlClient(TranslatorOutputType.SimpleXml, false);
                     dev.Comm.client.Ciphering.TestMode = true;
                     cl.CopyTo(dev.Comm.client);
                     test.Device = dev;
@@ -2349,11 +2349,11 @@ private static void TestAssociationLn(GXConformanceSettings settings, GXDLMSDevi
             }
             if (ln.ClientSAP != dev.ClientAddress)
             {
-                output.Errors.Insert(0, string.Format("Invalid Client SAP. Actual:{0} expected: {1} " + ln.ClientSAP, dev.ClientAddress));
+                output.Errors.Insert(0, string.Format("Invalid Client SAP. Actual:{0} expected: {1} ", ln.ClientSAP, dev.ClientAddress));
             }
             if (ln.ServerSAP != dev.Comm.client.ServerAddress)
             {
-                output.Errors.Insert(0, string.Format("Invalid Server SAP. Actual:{0} expected: {1} " + ln.ServerSAP, dev.Comm.client.ServerAddress));
+                output.Errors.Insert(0, string.Format("Invalid Server SAP. Actual:{0} expected: {1} ", ln.ServerSAP, dev.Comm.client.ServerAddress));
             }
         }
 

diff --git a/Development/GXDLMSCommunicator.cs b/Development/GXDLMSCommunicator.cs
@@ -4,8 +4,8 @@
 //
 //
 //
-// Version:         $Revision: 13578 $,
-//                  $Date: 2023-02-20 14:05:21 +0200 (ma, 20 helmi 2023) $
+// Version:         $Revision: 13638 $,
+//                  $Date: 2023-03-23 11:03:34 +0200 (to, 23 maalis 2023) $
 //                  $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
@@ -51,6 +51,7 @@
 using Gurux.DLMS.Ecdsa;
 using System.IO;
 using Gurux.DLMS.Extension;
+using System.Linq;
 
 namespace GXDLMSDirector
 {
@@ -166,9 +167,18 @@ private void Client_OnKeys(object sender, GXCryptoKeyParameter args)
             {
                 //Find public key.
                 path = GetPath(args.SecuritySuite, args.CertificateType, certificates, null);
-                if (!string.IsNullOrEmpty(path) && File.Exists(path))
+                if (!string.IsNullOrEmpty(path) && Directory.Exists(path))
                 {
-                    args.PublicKey = GXx509Certificate.Search(path, args.SystemTitle).PublicKey;
+                    GXx509Certificate[] certs = GXx509Certificate.Search(path, CertificateType.DigitalSignature, args.SystemTitle);
+                    if (certs.Length == 0)
+                    {
+                        throw new Exception("Failed to find meter certificate.");
+                    }
+                    if (certs.Length != 1)
+                    {
+                        throw new Exception("Meter have multiple certificates.");
+                    }
+                    args.PublicKey = certs[0].PublicKey;
                 }
             }
         }

diff --git a/Development/MainForm.cs b/Development/MainForm.cs
@@ -5,8 +5,8 @@
 //
 //
 //
-// Version:         $Revision: 13519 $,
-//                  $Date: 2023-02-01 13:46:53 +0200 (ke, 01 helmi 2023) $
+// Version:         $Revision: 13628 $,
+//                  $Date: 2023-03-22 13:45:07 +0200 (ke, 22 maalis 2023) $
 //                  $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
@@ -3534,7 +3534,7 @@ void LoadFile(string path)
                 GXDLMSObject it = dev.Objects.FindByLN(ObjectType.AssociationLogicalName, "0.0.40.0.0.255");
                 if (it is GXDLMSAssociationLogicalName)
                 {
-  //MIKKO                  (it as GXDLMSAssociationLogicalName).ObjectList.AddRange(dev.Objects);
+                    (it as GXDLMSAssociationLogicalName).ObjectList.AddRange(dev.Objects);
                 }
             }
             GroupItems(GroupsMnu.Checked, null);