Merge pull request #389 from openweave/issue/fix-convert-prov-double-encode

Fix for Issue#388 : weave convert-provisioning-data command double encodes output

Author: Jay Logue

src/tools/weave/Cmd_ConvertProvisioningData.cpp

@@ -629,6 +629,13 @@ bool ConvertPrivateKey(const char * inKeyB64, size_t inKeyB64Len, KeyFormat keyF
         ExitNow(res = false);
     }
 
+    // When Weave key format is requested, have EncodePrivateKey() encode to raw bytes, rather
+    // than base64, since base64 encoding is handled below.
+    if (keyFormat == kKeyFormat_Weave_Base64)
+    {
+        keyFormat = kKeyFormat_Weave_Raw;
+    }
+
     if (!EncodePrivateKey(inKeyDecoded, keyFormat, outKey, outKeyLen))
     {
         ExitNow(res = false);