Tentative fix for issue Mayyhem#39. Needs additional testing with pro…

…vided creds/certs/PXE before merging
sliverarmory · Nov 10, 2023 · b424f82 · b424f82
1 parent 06ac366
commit b424f82
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/MgmtPointMessaging.cs b/lib/MgmtPointMessaging.cs
@@ -160,11 +160,11 @@ public static void GetSecretsFromPolicies(string managementPoint, string siteCod
 
                 foreach (PolicyAssignment policyAssignment in assignmentReply.ReplyAssignments.PolicyAssignments)
                 {
-                    GetSecretsFromPolicy(policyAssignment, managementPoint, clientId, encryptionCertificate, outputPath);
+                    GetSecretsFromPolicy(policyAssignment, managementPoint, clientId, encryptionCertificate, signingCertificate, outputPath);
                 }
             }
         }
-        public static async void GetSecretsFromPolicy(PolicyAssignment policyAssignment, string managementPoint, SmsClientId clientId, MessageCertificateX509 encryptionCertificate, string outputPath = null)
+        public static async void GetSecretsFromPolicy(PolicyAssignment policyAssignment, string managementPoint, SmsClientId clientId, MessageCertificateX509 encryptionCertificate, MessageCertificateX509 signingCertificate, string outputPath = null)
         {
 
             // Get secret policies
@@ -184,7 +184,7 @@ public static async void GetSecretsFromPolicy(PolicyAssignment policyAssignment,
                 try
                 {
                     string policyURL = policyAssignment.Policy.Location.Value.Replace("<mp>", managementPoint);
-                    policyDownloadResponse = SendPolicyDownloadRequest(policyURL, clientId, encryptionCertificate);
+                    policyDownloadResponse = SendPolicyDownloadRequest(policyURL, clientId, signingCertificate);
                     byte[] policyDownloadResponseBytes = await policyDownloadResponse.Content.ReadAsByteArrayAsync();
                     Console.WriteLine($"[+] Received encoded response from server for policy {policyAssignment.Policy.Id}");
                 }
@@ -760,7 +760,7 @@ public static async void SendPolicyAssignmentRequestWithExplicitData(string mach
                                 policyAssignment.Policy.Location = policyLocation;
                             }
 
-                            GetSecretsFromPolicy(policyAssignment, szMPHostname, new SmsClientId(szMediaGUIDPlain), encryptioncertificate);
+                            GetSecretsFromPolicy(policyAssignment, szMPHostname, new SmsClientId(szMediaGUIDPlain), encryptioncertificate, signingCertificate);
                         }
                     }
                 }