ab#59979

Keyfactor · Jul 3, 2024 · 06f9cd6 · 06f9cd6
1 parent f4a56dd
commit 06f9cd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/RemoteFile/ReenrollmentBase.cs b/RemoteFile/ReenrollmentBase.cs
@@ -51,7 +51,7 @@ public JobResult ProcessJob(ReenrollmentJobConfiguration config, SubmitReenrollm
             {
                 logger.LogDebug($"    {keyValue.Key}: {keyValue.Value}");
             }
-            
+
             ICertificateStoreSerializer certificateStoreSerializer = GetCertificateStoreSerializer(config.CertificateStoreDetails.Properties);
 
             try
@@ -139,3 +139,4 @@ public JobResult ProcessJob(ReenrollmentJobConfiguration config, SubmitReenrollm
             return new JobResult() { Result = OrchestratorJobStatusJobResult.Success, JobHistoryId = config.JobHistoryId };
         }
     }
+}
diff --git a/RemoteFile/RemoteCertificateStore.cs b/RemoteFile/RemoteCertificateStore.cs
@@ -397,7 +397,7 @@ internal string GenerateCSROnDevice(string subjectText, SupportedKeyTypeEnum key
             switch (keyType)
             {
                 case SupportedKeyTypeEnum.RSA:
-                    cmd.Replace("REPLACE", $"rsa:{keySize.ToString()})";
+                    cmd.Replace("REPLACE", $"rsa:{keySize.ToString()}");
                     break;
                 case SupportedKeyTypeEnum.ECC:
                     string algName = "prime256v1";
@@ -414,6 +414,9 @@ internal string GenerateCSROnDevice(string subjectText, SupportedKeyTypeEnum key
                     break;
             }
 
+            RemoteHandler.RunCommand(cmd, null, ApplicationSettings.UseSudo, null);
+            privateKey = Encoding.UTF8.GetString(RemoteHandler.DownloadCertificateFile(path + fileName + "key"));
+            return Encoding.UTF8.GetString(RemoteHandler.DownloadCertificateFile(path + fileName + "csr"));
         }
 
         internal void Initialize(string sudoImpersonatedUser)
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     logger.LogDebug($"    {keyValue.Key}: {keyValue.Value}");
                 }
                 ICertificateStoreSerializer certificateStoreSerializer = GetCertificateStoreSerializer(config.CertificateStoreDetails.Properties);
                 try
@@ Expand Down Expand Up @@
                 return new JobResult() { Result = OrchestratorJobStatusJobResult.Success, JobHistoryId = config.JobHistoryId };
             }
         }
+    }