From 6b2d7581241f332174d23e10a75f46069e1ca97e Mon Sep 17 00:00:00 2001
From: Dieter Vandroemme <dieter.vandroemme@gmail.com>
Date: Fri, 15 Jan 2016 12:21:23 +0100
Subject: [PATCH] Locate makecert.exe next to the assembly

It was located from the current directory. This can result in a
FileNotFoundException when an application that uses Titanium-Web-Proxy
is launched from another path, the root certificate is not registered
and capturing is started . E.g.  c:\> test\test.exe
---
 Titanium.Web.Proxy/Helpers/CertificateManager.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Titanium.Web.Proxy/Helpers/CertificateManager.cs b/Titanium.Web.Proxy/Helpers/CertificateManager.cs
index da2afbad8..276b2d452 100644
--- a/Titanium.Web.Proxy/Helpers/CertificateManager.cs
+++ b/Titanium.Web.Proxy/Helpers/CertificateManager.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
+using System.Reflection;
 
 namespace Titanium.Web.Proxy.Helpers
 {
@@ -112,14 +113,16 @@ protected virtual void CreateCertificate(string[] args)
         {
             using (var process = new Process())
             {
-                if (!File.Exists("makecert.exe"))
+                string file = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "makecert.exe");
+
+                if (!File.Exists(file))
                     throw new Exception("Unable to locate 'makecert.exe'.");
 
                 process.StartInfo.Verb = "runas";
                 process.StartInfo.Arguments = args != null ? args[0] : string.Empty;
                 process.StartInfo.CreateNoWindow = true;
                 process.StartInfo.UseShellExecute = false;
-                process.StartInfo.FileName = "makecert.exe";
+                process.StartInfo.FileName = file;
 
                 process.Start();
                 process.WaitForExit();