Commit 553c89ba authored by justcoding121's avatar justcoding121

Merge branch 'develop' into beta

parents 1c5da455 80b8cc37
...@@ -205,10 +205,12 @@ namespace Titanium.Web.Proxy.Network ...@@ -205,10 +205,12 @@ namespace Titanium.Web.Proxy.Network
UserTrustRoot = userTrustRootCertificate; UserTrustRoot = userTrustRootCertificate;
if (machineTrustRootCertificate) if (machineTrustRootCertificate)
{ {
MachineTrustRoot = machineTrustRootCertificate; userTrustRootCertificate = true;
} }
MachineTrustRoot = machineTrustRootCertificate;
TrustRootAsAdministrator = trustRootCertificateAsAdmin; TrustRootAsAdministrator = trustRootCertificateAsAdmin;
if (rootCertificateName != null) if (rootCertificateName != null)
{ {
RootCertificateName = rootCertificateName; RootCertificateName = rootCertificateName;
...@@ -754,12 +756,12 @@ namespace Titanium.Web.Proxy.Network ...@@ -754,12 +756,12 @@ namespace Titanium.Web.Proxy.Network
/// </summary> /// </summary>
public void EnsureRootCertificate(bool userTrustRootCertificate = true, bool machineTrustRootCertificate = false, bool trustRootCertificateAsAdmin = false) public void EnsureRootCertificate(bool userTrustRootCertificate = true, bool machineTrustRootCertificate = false, bool trustRootCertificateAsAdmin = false)
{ {
if(machineTrustRootCertificate) UserTrustRoot = userTrustRootCertificate;
if (machineTrustRootCertificate)
{ {
userTrustRootCertificate = true; userTrustRootCertificate = true;
} }
UserTrustRoot = userTrustRootCertificate;
MachineTrustRoot = machineTrustRootCertificate; MachineTrustRoot = machineTrustRootCertificate;
TrustRootAsAdministrator = trustRootCertificateAsAdmin; TrustRootAsAdministrator = trustRootCertificateAsAdmin;
......
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