Add a way to load keys from data

Author: raonygamer

LibXboxOne/Keys/DurangoKeys.cs

@@ -205,6 +205,13 @@ public static bool LoadSignKey(string desiredKeyName, byte[] keyData, out bool i
             return true;
         }
 
+        public static bool LoadCikFromBytes(byte[] keyBytes)
+        {
+            var isNewKey = false;
+            var keyCount = LoadCikKeys(keyBytes, out Guid[] loadedCiks);
+            return keyCount > 0;
+        }
+        
         public static bool LoadKey(KeyType keyType, string keyFilePath)
         {
             if (keyFilePath == String.Empty)

XVDTool/Program.cs

@@ -45,6 +45,7 @@ static void Main(string[] args)
             var signKeyFilepath = String.Empty;
             var odkFilepath = String.Empty;
             var cikFilepath = String.Empty;
+            var cikData = String.Empty;
 
             bool listKeys = false;
 
@@ -85,6 +86,7 @@ static void Main(string[] args)
                 { "signfile=", v => signKeyFilepath = v },
                 { "odkfile=", v => odkFilepath = v },
                 { "cikfile=", v => cikFilepath = v },
+                { "cikdata=", v => cikData = v },
 
                 { "sk|signkey=", v => signKeyToUse = v },
                 { "odk|odkid=", v =>
@@ -153,6 +155,7 @@ static void Main(string[] args)
                 Console.WriteLine(fmt + "-signfile <path-to-file> - Path to xvd sign key (RSA)");
                 Console.WriteLine(fmt + "-odkfile <path-to-file> - Path to Offline Distribution key");
                 Console.WriteLine(fmt + "-cikfile <path-to-file> - Path to Content Instance key");
+                Console.WriteLine(fmt + "-cikdata <data> - Byte data of the Content Instance key");
                 Console.WriteLine();
                 Console.WriteLine(fmt + "-sk (-signkey) <key-name> - Name of xvd sign key to use");
                 Console.WriteLine(fmt + "-odk (-odkid) <id> - Id of Offline Distribution key to use (uint)");
@@ -224,7 +227,7 @@ static void Main(string[] args)
                 }
             }
 
-            if (cikFilepath != String.Empty)
+            if (cikFilepath != String.Empty && cikData == String.Empty)
             {
                 if (!DurangoKeys.LoadKey(KeyType.Cik, cikFilepath))
                 {
@@ -233,6 +236,15 @@ static void Main(string[] args)
                 }
             }
 
+            if (cikFilepath == String.Empty && cikData != String.Empty)
+            {
+                if (!DurangoKeys.LoadCikFromBytes(Convert.FromBase64String(cikData)))
+                {
+                    Console.WriteLine($"Failed to load CIK from hex string {cikData}");
+                    return;
+                }
+            }
+
             if(signKeyToUse == String.Empty)
             {
                 Console.WriteLine($"No desired signkey provided, falling back to {fallbackSignKey}");