Unverified Commit eb68d296 authored by mohammadlachgar's avatar mohammadlachgar Committed by GitHub

remove cn from FriendlyName

change
@"^" + "CN".ToLower() + @"\s*=\s*"
to
^CN\s*=\s*
parent cf082423
using System; using System;
using System.Collections; using System.Collections;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
...@@ -48,7 +48,7 @@ namespace Titanium.Web.Proxy.Network.Certificate ...@@ -48,7 +48,7 @@ namespace Titanium.Web.Proxy.Network.Certificate
/// <param name="signingCert">The signing cert.</param> /// <param name="signingCert">The signing cert.</param>
/// <returns>X509Certificate2 instance.</returns> /// <returns>X509Certificate2 instance.</returns>
public X509Certificate2 MakeCertificate(string sSubjectCn, bool isRoot, X509Certificate2 signingCert = null) public X509Certificate2 MakeCertificate(string sSubjectCn, bool isRoot, X509Certificate2 signingCert = null)
{ {
return MakeCertificateInternal(sSubjectCn, isRoot, true, signingCert); return MakeCertificateInternal(sSubjectCn, isRoot, true, signingCert);
} }
...@@ -70,7 +70,7 @@ namespace Titanium.Web.Proxy.Network.Certificate ...@@ -70,7 +70,7 @@ namespace Titanium.Web.Proxy.Network.Certificate
string issuerName, DateTime validFrom, string issuerName, DateTime validFrom,
DateTime validTo, int keyStrength = 2048, DateTime validTo, int keyStrength = 2048,
string signatureAlgorithm = "SHA256WithRSA", string signatureAlgorithm = "SHA256WithRSA",
AsymmetricKeyParameter issuerPrivateKey = null, X509Certificate2 cloneCertificate = null) AsymmetricKeyParameter issuerPrivateKey = null, X509Certificate2 cloneCertificate=null)
{ {
// Generating Random Numbers // Generating Random Numbers
var randomGenerator = new CryptoApiRandomGenerator(); var randomGenerator = new CryptoApiRandomGenerator();
...@@ -100,13 +100,13 @@ namespace Titanium.Web.Proxy.Network.Certificate ...@@ -100,13 +100,13 @@ namespace Titanium.Web.Proxy.Network.Certificate
var subjectAlternativeNamesExtension = new DerSequence(subjectAlternativeNames); var subjectAlternativeNamesExtension = new DerSequence(subjectAlternativeNames);
certificateGenerator.AddExtension(X509Extensions.SubjectAlternativeName.Id, false, subjectAlternativeNamesExtension); certificateGenerator.AddExtension(X509Extensions.SubjectAlternativeName.Id, false, subjectAlternativeNamesExtension);
} }
// Subject Public Key // Subject Public Key
var keyGenerationParameters = new KeyGenerationParameters(secureRandom, keyStrength); var keyGenerationParameters = new KeyGenerationParameters(secureRandom, keyStrength);
var keyPairGenerator = new RsaKeyPairGenerator(); var keyPairGenerator = new RsaKeyPairGenerator();
keyPairGenerator.Init(keyGenerationParameters); keyPairGenerator.Init(keyGenerationParameters);
var subjectKeyPair = keyPairGenerator.GenerateKeyPair(); var subjectKeyPair = keyPairGenerator.GenerateKeyPair();
certificateGenerator.SetPublicKey(subjectKeyPair.Public); certificateGenerator.SetPublicKey(subjectKeyPair.Public);
...@@ -148,8 +148,8 @@ namespace Titanium.Web.Proxy.Network.Certificate ...@@ -148,8 +148,8 @@ namespace Titanium.Web.Proxy.Network.Certificate
if (!doNotSetFriendlyName) if (!doNotSetFriendlyName)
{ {
try try
{ {
x509Certificate.FriendlyName = System.Text.RegularExpressions.Regex.Replace(subjectName.ToLower(), @"^" + "CN".ToLower() + @"\s*=\s*", ""); x509Certificate.FriendlyName = System.Text.RegularExpressions.Regex.Replace(subjectName.ToLower(), @"^CN\s*=\s*", "");
} }
catch (PlatformNotSupportedException) catch (PlatformNotSupportedException)
{ {
...@@ -175,7 +175,7 @@ namespace Titanium.Web.Proxy.Network.Certificate ...@@ -175,7 +175,7 @@ namespace Titanium.Web.Proxy.Network.Certificate
return new X509Certificate2(ms.ToArray(), password, X509KeyStorageFlags.Exportable); return new X509Certificate2(ms.ToArray(), password, X509KeyStorageFlags.Exportable);
} }
} }
/// <summary> /// <summary>
/// Makes the certificate internal. /// Makes the certificate internal.
/// </summary> /// </summary>
...@@ -203,16 +203,16 @@ namespace Titanium.Web.Proxy.Network.Certificate ...@@ -203,16 +203,16 @@ namespace Titanium.Web.Proxy.Network.Certificate
else else
{ {
var kp = DotNetUtilities.GetKeyPair(signingCertificate.PrivateKey); var kp = DotNetUtilities.GetKeyPair(signingCertificate.PrivateKey);
return GenerateCertificate(hostName, subjectName, signingCertificate.Subject, validFrom, validTo, issuerPrivateKey: kp.Private); return GenerateCertificate(hostName, subjectName, signingCertificate.Subject, validFrom, validTo, issuerPrivateKey: kp.Private);
} }
} }
/// <summary> /// <summary>
/// Makes the certificate internal. /// Makes the certificate internal.
/// </summary> /// </summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment