Merge pull request #170 from Keyfactor/release-2.6

Merge 2.6.4 to main

Author: spbsoluble

CHANGELOG.md

@@ -1,3 +1,10 @@
+
+2.6.4
+* Fixed an issue with SSL Flags greater than 3 were not being applied correctly to newer IIS servers.
+* Fixed an issue when formatting private RSA keys when connecting using the ssh protocol.
+* When using ssh protocol in containers, the SQL ACL on private keys was not being updating correctly.  This has been fixed.
+* Updated documentation to indicate that the username and password fields on the Cert Store are automatically added by Command.
+
 2.6.3
 * Fixed re-enrollment or ODKG job when RDN Components contained escaped commas.
 * Updated renewal job for IIS Certs to delete the old cert if not bound or used by other web sites.

IISU/PSHelper.cs

@@ -635,9 +635,10 @@ private string createPrivateKeyFile()
 
         private static string formatPrivateKey(string privateKey)
         {
-            String keyType = privateKey.Contains("OPENSSH PRIVATE KEY") ? "OPENSSH" : "RSA";
+            string header = privateKey.Substring(0, privateKey.IndexOf("KEY-----") + 8);
+            string footer = privateKey.Substring(privateKey.IndexOf("-----END"));
 
-            return privateKey.Replace($" {keyType} PRIVATE ", "^^^").Replace(" ", System.Environment.NewLine).Replace("^^^", $" {keyType} PRIVATE ") + System.Environment.NewLine;
+            return privateKey.Replace(header, "HEADER").Replace(footer, "FOOTER").Replace(" ", Environment.NewLine).Replace("HEADER", header).Replace("FOOTER", footer) + Environment.NewLine;
         }
     }
 }