Represent Octetstring values as HEX rather than Base64

References #14
Lawo · Nov 21, 2015 · 2cd3930 · 2cd3930
1 parent 9c1c292
commit 2cd3930
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/Lawo.EmberPlusSharp/Ember/EmberConverter.cs b/Lawo.EmberPlusSharp/Ember/EmberConverter.cs
@@ -189,7 +189,7 @@ private void ToXmlCore(
                     case BerOctetstring.InnerNumber:
                         var bytes = reader.ReadContentsAsByteArray();
                         WriteValue(
-                            writer, fieldName, BerOctetstring.Name, bytes, (w, o) => w.WriteBase64(o, 0, o.Length));
+                            writer, fieldName, BerOctetstring.Name, bytes, (w, o) => w.WriteBinHex(o, 0, o.Length));
                         break;
                     case BerRelativeObjectIdentifier.InnerNumber:
                         var intOid = reader.ReadContentsAsInt32Array();
@@ -433,12 +433,12 @@ private static void WriteOctetstring(XmlReader reader, EmberWriter writer, Ember
 
             using (var stream = new MemoryStream())
             {
-                var read = ReadValue(reader, r => (int?)r.ReadContentAsBase64(buffer, 0, buffer.Length), 0);
+                var read = ReadValue(reader, r => (int?)r.ReadContentAsBinHex(buffer, 0, buffer.Length), 0);
 
                 while (read > 0)
                 {
                     stream.Write(buffer, 0, read.Value);
-                    read = reader.ReadContentAsBase64(buffer, 0, buffer.Length);
+                    read = reader.ReadContentAsBinHex(buffer, 0, buffer.Length);
                 }
 
                 writer.WriteValue(fieldId, stream.ToArray());

diff --git a/Lawo.EmberPlusSharpTest/Model/ConsumerTest.cs b/Lawo.EmberPlusSharpTest/Model/ConsumerTest.cs
@@ -86,7 +86,7 @@ await SendResponse(
                         formulaInteger,
                         (int)enumeration,
                         (int)enumMap,
-                        Convert.ToBase64String(octetstring),
+                        new SoapHexBinary(octetstring).ToString(),
                         real,
                         stringValue);
                     await requestTask;
@@ -152,7 +152,7 @@ await WaitForRequest(
                                 formulaInteger,
                                 (int)enumeration,
                                 (int)enumMap,
-                                Convert.ToBase64String(octetstring),
+                                new SoapHexBinary(octetstring).ToString(),
                                 real,
                                 stringValue,
                                 children[0].ToString().ToLowerInvariant(),
@@ -196,7 +196,7 @@ await SendResponse(
                         formulaInteger,
                         enumeration,
                         enumMap,
-                        Convert.ToBase64String(octetstring),
+                        new SoapHexBinary(octetstring).ToString(),
                         real,
                         stringValue);
                     await requestTask;
@@ -290,7 +290,7 @@ await WaitForRequest(
                                 formulaInteger,
                                 (int)enumeration,
                                 (int)enumMap,
-                                Convert.ToBase64String(octetstring),
+                                new SoapHexBinary(octetstring).ToString(),
                                 real,
                                 stringValue,
                                 children[0].ToString().ToLowerInvariant(),

diff --git a/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/BigTreeNodeChildrenTemplate.xml b/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/BigTreeNodeChildrenTemplate.xml
@@ -86,9 +86,9 @@
         <contents type="Set">
           <identifier type="UTF8String">OctetstringParameter</identifier>
           <description type="UTF8String">This is the sixth element.</description>
-          <value type="Octetstring">abcd</value>
+          <value type="Octetstring">69B71D</value>
           <access type="Integer">3</access>
-          <default type="Octetstring">+l==</default>
+          <default type="Octetstring">FA</default>
         </contents>
       </Element>
       <Element type="Parameter">

diff --git a/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/FunctionLog.xml b/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/FunctionLog.xml
@@ -372,7 +372,7 @@
                 <invocationId type="Integer">4</invocationId>
                 <arguments type="Sequence">
                   <Value type="Boolean">true</Value>
-                  <Value type="Octetstring">Kio=</Value>
+                  <Value type="Octetstring">2A2A</Value>
                   <Value type="Integer">13</Value>
                 </arguments>
               </invocation>
@@ -391,7 +391,7 @@
         <success type="Boolean">true</success>
         <result type="Sequence">
           <Value type="Boolean">true</Value>
-          <Value type="Octetstring">Kio=</Value>
+          <Value type="Octetstring">2A2A</Value>
           <Value type="Integer">13</Value>
         </result>
       </Root>

diff --git a/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/MainLog.xml b/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/MainLog.xml
@@ -197,10 +197,10 @@ Three</enumeration>
           <contents type="Set">
             <identifier type="UTF8String">OctetstringParameter</identifier>
             <description type="UTF8String">This is the seventh element.</description>
-            <value type="Octetstring">3SX8f1tGPhFUBmoNn00ih9k7wlDGLcrIhOd/pFy2IzuoaUPLVU1NJCUKyDwEb1sMCiIR61JFu7BbM/p0xpm1nuMvZDYJVjKM7Z0qvGWNwxSLc5k5pDjoY62TcCFS2V2LVClZ1QslA7Twhf21Gv9KzW/l6FMAe/mrRgCIdeUQORQ/nmc7NO4JZm/lSR86M0iuSaOxbPEKi9kwro4KnI7O30vpdXyYDpmA3IHkGjLacBO42ixCX8wiNRONC4Zg/8nhFmnTUb7MFjoKMJBvJnCnVT16UsJijIB+xj9oCgMSIN23AgTIBh5V68TxNy48sw+i5rVI5awHf4npVIp+Yws39xCztyNs304eJWb9cFRRQhMwxiNNyjowr4N73rKU1oi4uUAeiPvrNgdmKb9GCg40lxJ2Tp3n6izVgweg8QCcik/eRbcUM7kYRJAc5qF66aV0RkefHYfr0M8TSAXzS0UHyp5waMRXIGRYXg==</value>
+            <value type="Octetstring">DD25FC7F5B463E1154066A0D9F4D2287D93BC250C62DCAC884E77FA45CB6233BA86943CB554D4D24250AC83C046F5B0C0A2211EB5245BBB05B33FA74C699B59EE32F64360956328CED9D2ABC658DC3148B739939A438E863AD93702152D95D8B542959D50B2503B4F085FDB51AFF4ACD6FE5E853007BF9AB46008875E51039143F9E673B34EE09666FE5491F3A3348AE49A3B16CF10A8BD930AE8E0A9C8ECEDF4BE9757C980E9980DC81E41A32DA7013B8DA2C425FCC2235138D0B8660FFC9E11669D351BECC163A0A30906F2670A7553D7A52C2628C807EC63F680A031220DDB70204C8061E55EBC4F1372E3CB30FA2E6B548E5AC077F89E9548A7E630B37F710B3B7236CDF4E1E2566FD705451421330C6234DCA3A30AF837BDEB294D688B8B9401E88FBEB36076629BF460A0E349712764E9DE7EA2CD58307A0F1009C8A4FDE45B71433B91844901CE6A17AE9A57446479F1D87EBD0CF134805F34B4507CA9E7068C4572064585E</value>
             <access type="Integer">3</access>
             <isOnline type="Boolean">true</isOnline>
-            <default type="Octetstring">+g==</default>
+            <default type="Octetstring">FA</default>
             <type type="Integer">7</type>
             <streamIdentifier type="Integer">2</streamIdentifier>
           </contents>
@@ -384,7 +384,7 @@ Three</enumeration>
         </StreamEntry>
         <StreamEntry type="StreamEntry">
           <streamIdentifier type="Integer">2</streamIdentifier>
-          <streamValue type="Octetstring">vNfExDztEw==</streamValue>
+          <streamValue type="Octetstring">BCD7C4C43CED13</streamValue>
         </StreamEntry>
         <StreamEntry type="StreamEntry">
           <streamIdentifier type="Integer">3</streamIdentifier>

diff --git a/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/MainResponse1.xml b/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/MainResponse1.xml
@@ -183,7 +183,7 @@ Three</enumeration>
       <value type="Octetstring">{6}</value>
       <access type="Integer">3</access>
       <isOnline type="Boolean">true</isOnline>
-      <default type="Octetstring">+l==</default>
+      <default type="Octetstring">FA</default>
       <type type="Integer">7</type>
       <streamIdentifier type="Integer">2</streamIdentifier>
     </contents>

diff --git a/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/NullableResponse2.xml b/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/NullableResponse2.xml
@@ -23,7 +23,7 @@
   <RootElement type="Parameter">
     <number type="Integer">4</number>
     <contents type="Set">
-      <value type="Octetstring">abcd</value>
+      <value type="Octetstring">69B71D</value>
     </contents>
   </RootElement>
   <RootElement type="Parameter">

diff --git a/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/StreamEntriesResponse.xml b/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/StreamEntriesResponse.xml
@@ -12,7 +12,7 @@
   </StreamEntry>
   <StreamEntry type="StreamEntry">
     <streamIdentifier type="Integer">2</streamIdentifier>
-    <streamValue type="Octetstring">vNfExDztEw==</streamValue>
+    <streamValue type="Octetstring">BCD7C4C43CED13</streamValue>
   </StreamEntry>
   <StreamEntry type="StreamEntry">
     <streamIdentifier type="Integer">3</streamIdentifier>

diff --git a/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/TriggerLog.xml b/Lawo.EmberPlusSharpTest/Model/Test/EmberDataPayloads/TriggerLog.xml
@@ -41,7 +41,7 @@
           <number type="Integer">3</number>
           <contents type="Set">
             <identifier type="UTF8String">OctetstringTrigger</identifier>
-            <value type="Octetstring">+g==</value>
+            <value type="Octetstring">FA</value>
             <access type="Integer">3</access>
             <type type="Integer">5</type>
           </contents>
@@ -95,7 +95,7 @@
         <RootElement type="QualifiedParameter">
           <path type="RelativeObjectIdentifier">3</path>
           <contents type="Set">
-            <value type="Octetstring">+g==</value>
+            <value type="Octetstring">FA</value>
           </contents>
         </RootElement>
         <RootElement type="QualifiedParameter">