Remove fuzzkit references

.gitignore

@@ -1,13 +1,13 @@
 *.pyc
-fuzzkit/.vs/*
-fuzzkit/x64/*/
-fuzzkit/fuzzkit/x64/*/
-fuzzkit/injectable/x64/*/
-fuzzkit/triage/x64/*/
-fuzzkit/test_application/x64/*/
-fuzzkit/server/x64/*/
-fuzzkit/triage/include/boost/*
-fuzzkit/triage/include/z3/*
+sl2/.vs/*
+sl2/x64/*/
+sl2/sl2/x64/*/
+sl2/injectable/x64/*/
+sl2/triage/x64/*/
+sl2/test_application/x64/*/
+sl2/server/x64/*/
+sl2/triage/include/boost/*
+sl2/triage/include/z3/*
 corpus/win_asm/bak_crashes.asm
 corpus/win_asm/*.exe
 corpus/win_asm/*.lnk

deploy/install.ps1

@@ -70,7 +70,7 @@ $Shortcut.Description = "Sienna Locomotive 2 Graphical Fuzzing Interface"
 
 $Shortcut.Save()
 
-$TargetFile = "`"$env:APPDATA\Trail of Bits\fuzzkit\`""
+$TargetFile = "`"$env:APPDATA\Trail of Bits\sl2\`""
 $ShortcutFile = "$env:USERPROFILE\Desktop\SL2 Working Files.lnk"
 $WScriptShell = New-Object -ComObject WScript.Shell
 $Shortcut = $WScriptShell.CreateShortcut($ShortcutFile)
@@ -87,4 +87,4 @@ $Shortcut.Save()
 "Sienna Locomotive 2 has been succesfully installed. You can now run the GUI via the shortcut on the desktop, or by typing `sl2` into Powershell."
 
 & cmd /c pause
-exit
+exit

make.ps1

@@ -78,13 +78,13 @@ Function SafeDelete {
 Function Reconfig {
     taskkill.exe /IM test_application.exe /F
     taskkill.exe /IM server.exe /F
-    [Microsoft.VisualBasic.FileIO.FileSystem]::Deletedirectory("$env:APPDATA\Trail of Bits\fuzzkit",'OnlyErrorDialogs','SendToRecycleBin')
+    [Microsoft.VisualBasic.FileIO.FileSystem]::Deletedirectory("$env:APPDATA\Trail of Bits\sl2",'OnlyErrorDialogs','SendToRecycleBin')
 }
 
 Function Test {
     python harness.py  -v -r10  -t build\corpus\test_application\Debug\test_application -a 8
     #python harness.py  -v -r10 -e FUZZER -t build\corpus\test_application\Debug\test_application -a 8
-    #dynamorio\bin64\drrun.exe -pidfile pidfile -verbose -persist -c build\tracer\Debug\tracer.dll -t "C:\Users\IEUser\AppData\Roaming\Trail of Bits\fuzzkit\targets\TEST_APPLICATION_acfa4ea300cade2f47bc7f8ab4502453a7fe774b\targets.json" -r d3e03566-8db8-4c94-bb69-353008abae49 -- build\corpus\test_application\Debug\test_application.exe "0 -f"
+    #dynamorio\bin64\drrun.exe -pidfile pidfile -verbose -persist -c build\tracer\Debug\tracer.dll -t "C:\Users\IEUser\AppData\Roaming\Trail of Bits\sl2\targets\TEST_APPLICATION_acfa4ea300cade2f47bc7f8ab4502453a7fe774b\targets.json" -r d3e03566-8db8-4c94-bb69-353008abae49 -- build\corpus\test_application\Debug\test_application.exe "0 -f"
 }
 
 
@@ -183,7 +183,7 @@ dep
     Rebuild dependencies
 
 reconfig
-    Deletes fuzzkit directory with run configuration
+    Deletes sl2 directory with run configuration
 
 help
     This info

server/server.cpp

@@ -302,7 +302,7 @@ static void init_logging_path() {
   SHGetKnownFolderPath(FOLDERID_RoamingAppData, NULL, NULL, &roaming_path);
 
   if (PathCchCombine(FUZZ_LOG, MAX_PATH, roaming_path,
-                     L"Trail of Bits\\fuzzkit\\log\\server.log") != S_OK) {
+                     L"Trail of Bits\\sl2\\log\\server.log") != S_OK) {
     SL2_SERVER_LOG_FATAL("failed to combine logfile path");
   }
 
@@ -317,13 +317,13 @@ static void init_logging_path() {
 static void init_working_paths() {
   wchar_t *roaming_path;
   SHGetKnownFolderPath(FOLDERID_RoamingAppData, NULL, NULL, &roaming_path);
-  wchar_t runs_local_path[MAX_PATH] = L"Trail of Bits\\fuzzkit\\runs";
+  wchar_t runs_local_path[MAX_PATH] = L"Trail of Bits\\sl2\\runs";
 
   if (PathCchCombine(FUZZ_WORKING_PATH, MAX_PATH, roaming_path, runs_local_path) != S_OK) {
     SL2_SERVER_LOG_FATAL("failed to combine working dir path");
   }
 
-  wchar_t arenas_local_path[MAX_PATH] = L"Trail of Bits\\fuzzkit\\arenas";
+  wchar_t arenas_local_path[MAX_PATH] = L"Trail of Bits\\sl2\\arenas";
 
   if (PathCchCombine(FUZZ_ARENAS_PATH, MAX_PATH, roaming_path, arenas_local_path) != S_OK) {
     SL2_SERVER_LOG_FATAL("failed to combine arenas dir path");

sl2/harness/config.py

@@ -55,7 +55,7 @@
 # NOTE(ww): Keep these up-to-data with include/server.hpp!
 sl2_server_pipe_path = "\\\\.\\pipe\\fuzz_server"
 ## Path to SL2 data and configuration
-sl2_dir = os.path.join(os.getenv("APPDATA", default="."), "Trail of Bits", "fuzzkit")
+sl2_dir = os.path.join(os.getenv("APPDATA", default="."), "Trail of Bits", "sl2")
 ## Path to runs directory
 sl2_runs_dir = os.path.join(sl2_dir, "runs")
 sl2_arenas_dir = os.path.join(sl2_dir, "arenas")

sl2/test/__main__.py

@@ -106,7 +106,7 @@ def test_quickCrash(self):
         self.assertTrue(b"Crashash" in out)
         self.assertTrue(b" None/EXCEPTION_BREAKPOINT" in out)
 
-        workingdir = os.path.join(os.environ["APPDATA"], "Trail of Bits", "fuzzkit", "runs")
+        workingdir = os.path.join(os.environ["APPDATA"], "Trail of Bits", "sl2", "runs")
         pattern = "%s/*/*.dmp" % workingdir
         paths = glob.glob(pattern)
         self.assertTrue(len(paths) > 0)
@@ -120,7 +120,7 @@ def test_triage(self):
         cmd = r"sl2-cli -W -fn 0 -c -x -l -v -t " + TEST_APPLICATION + " -a 10 -f"
         out = runAndCaptureOutput(cmd)
 
-        workingdir = os.path.join(os.environ["APPDATA"], "Trail of Bits", "fuzzkit", "runs")
+        workingdir = os.path.join(os.environ["APPDATA"], "Trail of Bits", "sl2", "runs")
         pattern = "%s/*/initial.dmp" % workingdir
         for path in glob.glob(pattern):
             # paths = " ".join(paths)