PublicKeySignature added to more CTR formats.

OpenChargingCloud · May 6, 2024 · e54a4e9 · e54a4e9
1 parent eca6166
commit e54a4e9
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/...mentation/Alfen/ALFEN-Testdatensatz-10_newChargeITContainer_externalCostsAndTariff.chargy b/...mentation/Alfen/ALFEN-Testdatensatz-10_newChargeITContainer_externalCostsAndTariff.chargy
@@ -26,7 +26,41 @@
   "meterInfo": {
     "firmwareVersion": "123",
     "type": "eHZ IW8E EMH",
-    "manufacturer": "EMH"
+    "manufacturer": "EMH",
+    "publicKeySignatures": [
+      {
+        "signer":           "Open Charging Cloud",
+        "publicKey":        "04a8ff0d82107922522e004a167cc658f0eef408c5020f98e7a2615be326e61852666877335f4f8d9a0a756c26f0c9fb3f401431416abb5317cc0f5d714d3026fe",
+        "timestamp":        "2019-06-30T00:00:00Z",
+        "comment":          { "en": "Hello world!" },
+        "notBefore":        "2018-11-04T16:47:01Z",
+        "notAfter":         "2023-03-12T13:54:12Z",
+        "operations": {
+            "signCertificates":  false,
+            "signMeterValues":   true
+        },
+        "revocationURIs":   [],
+        "algorithm":        "secp256k1",
+        "format":           "DER",
+        "value":            "303502181dce9223416d64e5362bc8eb46eddf23adcb74382b602e1f021900eca85b1a48bc1f64d25951e947c7e48fa0b070b82e2cae41"
+      },
+      {
+        "signer":           "chargeIT mobility",
+        "publicKey":        "04a8ff0d82107922522e004a167cc658f0eef408c5020f98e7a2615be326e61852666877335f4f8d9a0a756c26f0c9fb3f401431416abb5317cc0f5d714d3026fe",
+        "timestamp":        "2019-06-30T00:00:00Z",
+        "comment":          { "en": "Hello world!" },
+        "notBefore":        "2018-11-04T16:47:01Z",
+        "notAfter":         "2023-03-12T13:54:12Z",
+        "operations": {
+            "signCertificates":  false,
+            "signMeterValues":   true
+        },
+        "revocationURIs":   [],
+        "algorithm":        "secp256k1",
+        "format":           "DER",
+        "value":            "303502181dce9223416d64e5362bc8eb46eddf23adcb74382b602e1f021900eca85b1a48bc1f64d25951e947c7e48fa0b070b82e2cae41"
+      }
+    ]
   },
   "connectorInfo": {
     "type": "Typ-2 Socket",

diff --git a/src/ts/Alfen.ts b/src/ts/Alfen.ts
@@ -622,14 +622,14 @@ export class AlfenCrypt01 extends ACrypt {
                         try
                         {
 
-                            cryptoResult.publicKey            = meter.publicKeys[0]?.value?.toLowerCase();
+                            cryptoResult.publicKey            = meter.publicKeys[0]?.value;
                             cryptoResult.publicKeyFormat      = meter.publicKeys[0]?.format;
                             cryptoResult.publicKeySignatures  = meter.publicKeys[0]?.signatures;
 
                             try
                             {
 
-                                const publicKey  = chargyLib.buf2hex(this.chargy.base32Decode(cryptoResult.publicKey?.toUpperCase(), 'RFC4648'));
+                                const publicKey  = chargyLib.buf2hex(this.chargy.base32Decode(cryptoResult.publicKey, 'RFC4648'));
                                 let   result     = false;
 
                                 switch (meter?.publicKeys[0]?.algorithm ?? "")