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

Delete spaces and new lines(entr)

parent a1ab56e7
using System; using System;
using System.Collections;
using System.IO; using System.IO;
using System.Reflection;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using System.Threading; using System.Threading;
using Org.BouncyCastle.Asn1; using Org.BouncyCastle.Asn1;
...@@ -70,7 +68,7 @@ namespace Titanium.Web.Proxy.Network.Certificate ...@@ -70,7 +68,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)
{ {
// Generating Random Numbers // Generating Random Numbers
var randomGenerator = new CryptoApiRandomGenerator(); var randomGenerator = new CryptoApiRandomGenerator();
...@@ -105,8 +103,7 @@ namespace Titanium.Web.Proxy.Network.Certificate ...@@ -105,8 +103,7 @@ namespace Titanium.Web.Proxy.Network.Certificate
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);
...@@ -137,7 +134,7 @@ namespace Titanium.Web.Proxy.Network.Certificate ...@@ -137,7 +134,7 @@ namespace Titanium.Web.Proxy.Network.Certificate
rsa.Exponent2, rsa.Coefficient); rsa.Exponent2, rsa.Coefficient);
#if NET45 #if NET45
// Set private key onto certificate instance X509Certificate2 // Set private key onto certificate instance
var x509Certificate = new X509Certificate2(certificate.GetEncoded()); var x509Certificate = new X509Certificate2(certificate.GetEncoded());
x509Certificate.PrivateKey = DotNetUtilities.ToRSA(rsaparams); x509Certificate.PrivateKey = DotNetUtilities.ToRSA(rsaparams);
#else #else
...@@ -202,11 +199,8 @@ namespace Titanium.Web.Proxy.Network.Certificate ...@@ -202,11 +199,8 @@ 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);
} }
} }
......
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