From 8fb6fc7b8aac0104e0fc9ef0f4a2dbe0b2dfc60a Mon Sep 17 00:00:00 2001 From: feodor_fitsner Date: Mon, 21 Nov 2011 10:32:47 -0800 Subject: [PATCH] SSL CSR generation fix --- .../SSL/SSLModuleService.cs | 14 +++++++------- WebsitePanel/build-debug.bat | 2 +- WebsitePanel/build-release.bat | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/SSL/SSLModuleService.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/SSL/SSLModuleService.cs index 8764e966..04324c3e 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/SSL/SSLModuleService.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/SSL/SSLModuleService.cs @@ -53,8 +53,7 @@ namespace WebsitePanel.Providers.Web.Iis CX500DistinguishedName dn = new CX500DistinguishedName(); CX509Enrollment enroll = new CX509Enrollment(); CObjectIds objectIds = new CObjectIds(); - CObjectId clientObjectId = new CObjectId(); - CObjectId serverObjectId = new CObjectId(); + CObjectId objectId = new CObjectId(); CX509ExtensionKeyUsage extensionKeyUsage = new CX509ExtensionKeyUsage(); CX509ExtensionEnhancedKeyUsage x509ExtensionEnhancedKeyUsage = new CX509ExtensionEnhancedKeyUsage(); @@ -66,7 +65,6 @@ namespace WebsitePanel.Providers.Web.Iis csPs.Add(csp); // Provide key container name, key length and key spec to the private key object - //objPrivateKey.ContainerName = "AlejaCMa"; privateKey.Length = cert.CSRLength; privateKey.KeySpec = X509KeySpec.XCN_AT_SIGNATURE; privateKey.KeyUsage = X509PrivateKeyUsageFlags.XCN_NCRYPT_ALLOW_ALL_USAGES; @@ -97,10 +95,9 @@ namespace WebsitePanel.Providers.Web.Iis pkcs10.X509Extensions.Add((CX509Extension)extensionKeyUsage); // Enhanced Key Usage Extension - clientObjectId.InitializeFromValue("1.3.6.1.5.5.7.3.2"); - objectIds.Add(clientObjectId); - serverObjectId.InitializeFromValue("1.3.6.1.5.5.7.3.1"); - objectIds.Add(serverObjectId); + + objectId.InitializeFromName(CERTENROLLLib.CERTENROLL_OBJECTID.XCN_OID_PKIX_KP_SERVER_AUTH); + objectIds.Add(objectId); x509ExtensionEnhancedKeyUsage.InitializeEncode(objectIds); pkcs10.X509Extensions.Add((CX509Extension)x509ExtensionEnhancedKeyUsage); @@ -108,6 +105,9 @@ namespace WebsitePanel.Providers.Web.Iis string request = String.Format(@"CN={0}, O={1}, OU={2}, L={3}, S={4}, C={5}", cert.Hostname, cert.Organisation, cert.OrganisationUnit, cert.City, cert.State, cert.Country); dn.Encode(request, X500NameFlags.XCN_CERT_NAME_STR_NONE); + // enable SMIME capabilities + pkcs10.SmimeCapabilities = true; + // Assing the subject name by using the Distinguished Name object initialized above pkcs10.Subject = dn; diff --git a/WebsitePanel/build-debug.bat b/WebsitePanel/build-debug.bat index c2008116..8291a305 100644 --- a/WebsitePanel/build-debug.bat +++ b/WebsitePanel/build-debug.bat @@ -1 +1 @@ -%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Build /property:BuildConfiguration=Debug /v:d /fileLogger \ No newline at end of file +%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Build /property:BuildConfiguration=Debug /v:n /fileLogger \ No newline at end of file diff --git a/WebsitePanel/build-release.bat b/WebsitePanel/build-release.bat index 7e115978..e76ab1fd 100644 --- a/WebsitePanel/build-release.bat +++ b/WebsitePanel/build-release.bat @@ -1 +1 @@ -%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Build /property:BuildConfiguration=Release /v:d /fileLogger \ No newline at end of file +%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Build /property:BuildConfiguration=Release /v:n /fileLogger \ No newline at end of file