Merge branch 'develop' into beta

justcoding121 · justcoding121 · commit 553c89ba0ff8 · 2018-03-12T11:31:25.000-04:00
diff --git a/Titanium.Web.Proxy/Network/CertificateManager.cs b/Titanium.Web.Proxy/Network/CertificateManager.cs
@@ -205,10 +205,12 @@ internal CertificateManager(string rootCertificateName, string rootCertificateIs
             UserTrustRoot = userTrustRootCertificate;
             if (machineTrustRootCertificate)
             {
-                MachineTrustRoot = machineTrustRootCertificate;
+                userTrustRootCertificate = true;
             }
 
+            MachineTrustRoot = machineTrustRootCertificate;
             TrustRootAsAdministrator = trustRootCertificateAsAdmin;
+
             if (rootCertificateName != null)
             {
                 RootCertificateName = rootCertificateName;
@@ -754,12 +756,12 @@ public void EnsureRootCertificate()
         /// </summary>
         public void EnsureRootCertificate(bool userTrustRootCertificate = true, bool machineTrustRootCertificate = false, bool trustRootCertificateAsAdmin = false)
         {
-            if(machineTrustRootCertificate)
+            UserTrustRoot = userTrustRootCertificate;
+            if (machineTrustRootCertificate)
             {
                 userTrustRootCertificate = true;
             }
 
-            UserTrustRoot = userTrustRootCertificate;
             MachineTrustRoot = machineTrustRootCertificate;
             TrustRootAsAdministrator = trustRootCertificateAsAdmin;
 

Original file line number	Diff line number	Diff line change
`@@ -205,10 +205,12 @@ internal CertificateManager(string rootCertificateName, string rootCertificateIs`
`205`	`205`	`UserTrustRoot = userTrustRootCertificate;`
`206`	`206`	`if (machineTrustRootCertificate)`
`207`	`207`	`{`
`208`		`- MachineTrustRoot = machineTrustRootCertificate;`
	`208`	`+ userTrustRootCertificate = true;`
`209`	`209`	`}`
`210`	`210`
	`211`	`+ MachineTrustRoot = machineTrustRootCertificate;`
`211`	`212`	`TrustRootAsAdministrator = trustRootCertificateAsAdmin;`
	`213`	`+`
`212`	`214`	`if (rootCertificateName != null)`
`213`	`215`	`{`
`214`	`216`	`RootCertificateName = rootCertificateName;`
`@@ -754,12 +756,12 @@ public void EnsureRootCertificate()`
`754`	`756`	`/// </summary>`
`755`	`757`	`public void EnsureRootCertificate(bool userTrustRootCertificate = true, bool machineTrustRootCertificate = false, bool trustRootCertificateAsAdmin = false)`
`756`	`758`	`{`
`757`		`- if(machineTrustRootCertificate)`
	`759`	`+ UserTrustRoot = userTrustRootCertificate;`
	`760`	`+ if (machineTrustRootCertificate)`
`758`	`761`	`{`
`759`	`762`	`userTrustRootCertificate = true;`
`760`	`763`	`}`
`761`	`764`
`762`		`- UserTrustRoot = userTrustRootCertificate;`
`763`	`765`	`MachineTrustRoot = machineTrustRootCertificate;`
`764`	`766`	`TrustRootAsAdministrator = trustRootCertificateAsAdmin;`
`765`	`767`