Merge pull request #96 from levno-710/master

Sync Develop

Author: levno-710

src/cli.lua

@@ -1,6 +1,6 @@
 -- This Script is Part of the Prometheus Obfuscator by Levno_710
 --
--- test.lua
+-- cli.lua
 -- This script contains the Code for the Prometheus CLI
 
 -- Configure package.path for requiring Prometheus
@@ -13,25 +13,25 @@ package.path = script_path() .. "?.lua;" .. package.path;
 local Prometheus = require("prometheus");
 Prometheus.Logger.logLevel = Prometheus.Logger.LogLevel.Info;
 
--- Override Error callback
+-- Override error callback
 --[[Prometheus.Logger.errorCallback = function(...)
     print(Prometheus.colors(Prometheus.Config.NameUpper .. ": " .. ..., "red"))
 	os.exit(1);
 end]]
 
--- see if the file exists
+-- Check if the file exists
 local function file_exists(file)
     local f = io.open(file, "rb")
     if f then f:close() end
     return f ~= nil
 end
-  
--- get all lines from a file, returns an empty 
+
+-- get all lines from a file, returns an empty
 -- list/table if the file does not exist
 local function lines_from(file)
     if not file_exists(file) then return {} end
     local lines = {}
-    for line in io.lines(file) do 
+    for line in io.lines(file) do
       lines[#lines + 1] = line
     end
     return lines
@@ -135,4 +135,4 @@ Prometheus.Logger:info(string.format("Writing output to \"%s\"", outFile));
 -- Write Output
 local handle = io.open(outFile, "w");
 handle:write(out);
-handle:close();
+handle:close();

src/prometheus/namegenerators/Il.lua

@@ -1,6 +1,6 @@
 -- This Script is Part of the Prometheus Obfuscator by Levno_710
 --
--- namegenerators/mangled.lua
+-- namegenerators/il.lua
 --
 -- This Script provides a function for generation of weird names consisting of I, l and 1
 
@@ -38,4 +38,4 @@ end
 return {
 	generateName = generateName, 
 	prepare = prepare
-};
+};

src/prometheus/namegenerators/confuse.lua

@@ -1,6 +1,6 @@
 -- This Script is Part of the Prometheus Obfuscator by Levno_710
 --
--- namegenerators/mangled.lua
+-- namegenerators/confuse.lua
 --
 -- This Script provides a function for generation of confusing variable names
 
@@ -166,4 +166,4 @@ end
 return {
 	generateName = generateName, 
 	prepare = prepare
-};
+};

src/prometheus/namegenerators/number.lua

@@ -1,11 +1,11 @@
 -- This Script is Part of the Prometheus Obfuscator by Levno_710
 --
--- namegenerators/mangled.lua
+-- namegenerators/number.lua
 --
 -- This Script provides a function for generation of simple up counting names but with hex numbers
 
 local PREFIX = "_";
 
 return function(id, scope)
 	return PREFIX .. tostring(id);
-end
+end

src/prometheus/randomStrings.lua

@@ -1,11 +1,5 @@
-local Ast = require("prometheus.ast");
-
-local charset = {}
-
--- qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM1234567890
-for i = 48,  57 do table.insert(charset, string.char(i)) end
-for i = 65,  90 do table.insert(charset, string.char(i)) end
-for i = 97, 122 do table.insert(charset, string.char(i)) end
+local Ast, utils = require("prometheus.ast"), require("prometheus.util");
+local charset = utils.chararray("qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM1234567890")
 
 local function randomString(wordsOrLen)
 	if type(wordsOrLen) == "table" then
@@ -27,4 +21,4 @@ end
 return {
 	randomString = randomString,
 	randomStringNode = randomStringNode,
-}
+}

src/prometheus/step.lua

@@ -1,6 +1,6 @@
 -- This Script is Part of the Prometheus Obfuscator by Levno_710
 --
--- util.lua
+-- step.lua
 --
 -- This file Provides the base class for Obfuscation Steps
 
@@ -76,4 +76,4 @@ end
 Step.Name = "Abstract Step";
 Step.Description = "Abstract Step";
 
-return Step;
+return Step;

src/prometheus/util.lua

@@ -24,7 +24,7 @@ end
 
 local function escape(str)
 	return str:gsub(".", function(char)
-		if char:match('[^ -~\n\t\a\b\v\r\"\']') then -- Check if non Printable Ascii Character
+		if char:match('[^ -~\n\t\a\b\v\r\"\']') then -- Check if non Printable ASCII Character
 			return string.format("\\%03d", string.byte(char))
 		end
 		if(char == "\\") then
@@ -108,6 +108,18 @@ local function shuffle(tb)
 	end
 	return tb
 end
+local function shuffle_string(str)
+    local len = #str
+    local t = {}
+    for i = 1, len do
+        t[i] = string.sub(str, i, i)
+    end
+    for i = 1, len do
+        local j = math.random(i, len)
+        t[i], t[j] = t[j], t[i]
+    end
+    return table.concat(t)
+end
 
 local function readDouble(bytes) 
 	local sign = 1
@@ -255,6 +267,7 @@ return {
 	chararray = chararray,
 	keys = keys,
 	shuffle = shuffle,
+	shuffle_string = shuffle_string,
 	readDouble = readDouble,
 	writeDouble = writeDouble,
 	readU16 = readU16,
@@ -270,4 +283,4 @@ return {
 	toBits = toBits,
 	bytesToString = bytesToString,
 	readonly = readonly,
-}
+}