removed all references to O2_ImportExport_OunceLabs.dll

o2platform · Nov 9, 2012 · b074304 · b074304
1 parent dc21153
commit b074304
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 36 deletions.
diff --git a/3rdParty/IBM/Analysis_Workflows/Analysis_WorkFlow.cs b/3rdParty/IBM/Analysis_Workflows/Analysis_WorkFlow.cs
@@ -15,7 +15,6 @@
 //O2File:Analysis_WorkFlow_Phase_4.cs
 //O2File:Analysis_WorkFlow_Phase_5.cs
 //O2Ref:O2_Core_FileViewers.dll
-//O2Ref:O2_ImportExport_OunceLabs.dll
 
 namespace O2.XRules.Database._Rules.IBM.Analysis_Workflows
 {

diff --git a/3rdParty/IBM/AppScan Source 7.0/Tool - Findings Viewer - IBM AppScan Source 7.0.h2 b/3rdParty/IBM/AppScan Source 7.0/Tool - Findings Viewer - IBM AppScan Source 7.0.h2
@@ -14,8 +14,8 @@ findingsViewer._SimpleViewMode = true;
 //using O2.XRules.Database.Findings
 //using O2.XRules.ThirdPary.IBM  
 //O2File:Findings_ExtensionMethods.cs
-//O2File:O2AssessmentLoad_OunceV7_0.cs
-//O2Ref:O2_ImportExport_OunceLabs.dll
+//O2File:O2AssessmentLoad_OunceV7_0.cs
+//O2File:OunceAvailableEngines.cs
 //O2Tag_DontAddExtraO2Files
 </SourceCode>
   <ReferencedAssemblies />

diff --git a/3rdParty/OWASP/WebScarab/Tool - Convert Conversations into O2Findings.h2 b/3rdParty/OWASP/WebScarab/Tool - Convert Conversations into O2Findings.h2
@@ -15,12 +15,12 @@ OunceAvailableEngines.addAvailableEnginesToControl(typeof(ascx_FindingsViewer));
 //using O2.XRules.Database.Findings
 //using O2.ImportExport.Misc.WebScarab
 //O2File:Findings_ExtensionMethods.cs
-//O2File:O2AssesmentLoad_WebScarab.cs
-//O2Ref:O2_ImportExport_OunceLabs.dll
-
-//O2Ref:PresentationCore.dll
-//O2Ref:PresentationFramework.dll
-//O2Ref:WindowsBase.dll
+//O2File:O2AssesmentLoad_WebScarab.cs
+//O2File:OunceAvailableEngines.cs
+
+//O2Ref:PresentationCore.dll
+//O2Ref:PresentationFramework.dll
+//O2Ref:WindowsBase.dll
 //O2Ref:System.Xaml.dll</SourceCode>
   <ReferencedAssemblies />
 </H2>
diff --git a/APIs/Cir Tools/Util - Cir Viewer (with C# DLL converter).h2 b/APIs/Cir Tools/Util - Cir Viewer (with C# DLL converter).h2
@@ -13,7 +13,6 @@
 
 //using O2.Core.CIR.Ascx
 //O2Ref:O2_Core_CIR.dll
-//O2Ref:O2_ImportExport_OunceLabs.dll
 //O2Ref:O2_External_O2Mono.dll
 //O2Ref:Mono.Cecil.Pdb.dll</SourceCode>
   <ReferencedAssemblies />

diff --git a/APIs/Findings_Filtering/Findings_DemoData.cs b/APIs/Findings_Filtering/Findings_DemoData.cs
@@ -20,7 +20,6 @@
 
 //O2File:Findings_ExtensionMethods.cs
 
-//O2Ref:O2_ImportExport_OunceLabs.dll
 
 namespace O2.XRules.Database.Findings
 {

diff --git a/APIs/Findings_Filtering/Findings_ExtensionMethods.cs b/APIs/Findings_Filtering/Findings_ExtensionMethods.cs
@@ -14,13 +14,13 @@
 using O2.Interfaces.O2Findings;
 using O2.Kernel;
 using O2.Kernel.ExtensionMethods;
+using O2.ImportExport.OunceLabs;
 using O2.External.SharpDevelop.ExtensionMethods;
 using O2.External.SharpDevelop.Ascx;
 using O2.Views.ASCX.O2Findings;
 
 //O2File:Findings_ExtensionMethods_Gui_Viewers.cs
-//O2File:O2AssessmentLoad_OunceV6.cs
-//O2File:O2AssessmentSave_OunceV6.cs
+//O2File:OunceAvailableEngines.cs
 
 namespace O2.XRules.Database.Findings
 {
@@ -159,9 +159,8 @@ public static ascx_FindingsViewer add_FindingsViewer(this Control control)
 
 		public static ascx_FindingsViewer add_FindingsViewer(this Control control, bool includeSourceCodeViewer)
         {
-            "O2_ImportExport_OunceLabs.dll".assembly()
-                                           .type("OunceAvailableEngines")
-                                           .invokeStatic("addAvailableEnginesToControl", new object[] {typeof(ascx_FindingsViewer)});
+        	OunceAvailableEngines.addAvailableEnginesToControl(typeof(ascx_FindingsViewer));
+
             var findingsViewer = control.add_Control<ascx_FindingsViewer>();
             if (includeSourceCodeViewer)
 			{

diff --git a/.../Findings_Filtering/Join Traces/PoC - Join Traces (on Attributes) - very basic version.h2 b/.../Findings_Filtering/Join Traces/PoC - Join Traces (on Attributes) - very basic version.h2
@@ -36,7 +36,6 @@ topPanel.insert_Above(40)
 //using O2.Core.FileViewers.JoinTraces
 //O2File:Findings_ExtensionMethods.cs
 //O2File:xUtils_Findings_v0_1.cs
-//O2Ref:O2_Core_FileViewers.dll
-//O2Ref:O2_ImportExport_OunceLabs.dll</SourceCode>
+//O2Ref:O2_Core_FileViewers.dll</SourceCode>
   <ReferencedAssemblies />
 </H2>
diff --git a/Languages/DotNet/Ast_Scanner/Util - Debug AST Rules.h2 b/Languages/DotNet/Ast_Scanner/Util - Debug AST Rules.h2
@@ -12,7 +12,7 @@ var scriptEditor = leftPanel[1].add_Script(false);
 
 var sourceCodeViewer = rightPanel[0].add_Control&lt;ascx_SourceCodeViewer&gt;(); 
 var codeStreamTreeView = sourceCodeViewer.insert_Left&lt;TreeView&gt;().showSelection();
-O2.ImportExport.OunceLabs.OunceAvailableEngines.addAvailableEnginesToControl(typeof(ascx_FindingsViewer));
+OunceAvailableEngines.addAvailableEnginesToControl(typeof(ascx_FindingsViewer));
 var findingsViewer = rightPanel[1].add_Control&lt;ascx_FindingsViewer&gt;();  
 
 
@@ -80,11 +80,12 @@ scriptEditor.onCompileExecuteOnce();
 //using O2.External.SharpDevelop.ExtensionMethods;
 //using O2.DotNetWrappers.ExtensionMethods
 //using O2.API.AST.CSharp
-//using O2.XRules.Database.Languages_and_Frameworks.DotNet
+//using O2.XRules.Database.Languages_and_Frameworks.DotNet
+//using O2.ImportExport.OunceLabs
 //using O2.Views.ASCX.O2Findings
 //O2File:ascx_WriteRule.cs
-//O2File:ascx_ManualMethodStreams.cs
-//O2Ref:O2_ImportExport_OunceLabs.dll
+//O2File:ascx_ManualMethodStreams.cs
+//O2File:OunceAvailableEngines.cs
 //O2Ref:O2_Misc_Microsoft_MPL_Libs.dll</SourceCode>
   <ReferencedAssemblies />
 </H2>
diff --git a/Languages/DotNet/Ast_Scanner/Util - MethodStreams Creator.h2 b/Languages/DotNet/Ast_Scanner/Util - MethodStreams Creator.h2
@@ -245,7 +245,7 @@ if (astData_LoadedFiles.isNull())
 }*/
 
 references.insert_Right&lt;Panel&gt;(100).add_PropertyGrid().show(astData_LoadedFiles);
-
+
 /*foreach(var file in testFiles.files("*.cs",true))
 	sourceFiles.add_Node(file.fileName(),file);
 
@@ -256,7 +256,7 @@ references.insert_Right&lt;Panel&gt;(100).add_PropertyGrid().show(astData_Loaded
 //this.sleep(1000);
 sourceFiles.select("UserManagement.asmx.cs");//.select("InstallToos.cs")  ;
 selectedFileContents.editor().caret(49,20).focus();
-*/
+*/
 
 return "ok";
 //using ICSharpCode.SharpDevelop.Dom;
@@ -273,7 +273,6 @@ return "ok";
 //O2File:SharpDevelop_O2MappedAstData_ExtensionMethods.cs
 //O2File:Ast_Engine_ExtensionMethods.cs 
 
-//O2Ref:O2_ImportExport_OunceLabs.dll
 
 //generateDebugSymbols
 

diff --git a/Languages/J2EE/Struts/xUtils_Struts_v0_1.cs b/Languages/J2EE/Struts/xUtils_Struts_v0_1.cs
@@ -14,11 +14,9 @@
 using O2.Core.FileViewers.Ascx;
 using O2.Core.FileViewers.Ascx.O2Rules;
 using O2.Core.FileViewers.Struts_1_5;
-using O2.ImportExport.OunceLabs.Ozasmt_OunceV6;
 using O2.DotNetWrappers.O2Findings;
 using O2.DotNetWrappers.DotNet;
 using O2.External.WinFormsUI.Forms;
-//O2Ref:O2_ImportExport_OunceLabs.dll
 //O2Ref:O2_Core_FileViewers.dll
 
 namespace O2.XRules.Database._Rules

diff --git a/Utils/O2_StandAlone_Modules/SearchEngine/SearchEngineGui.cs b/Utils/O2_StandAlone_Modules/SearchEngine/SearchEngineGui.cs
@@ -21,10 +21,10 @@
 //O2File:ascx_SearchResults.cs
 //O2File:ascx_SearchTargets.cs
 //O2File:ascx_TextSearch.cs
+//O2File:OunceAvailableEngines.cs
 
 //O2Ref:O2_Core_FileViewers.dll
 //O2Ref:O2_Core_CIR.dll
-//O2Ref:O2_ImportExport_OunceLabs.dll
 
 namespace O2.Tool.SearchEngine
 {

diff --git a/_Sample_Vulns/HacmeBank/HacmeBank - Custom O2 AST Security Scanner.h2 b/_Sample_Vulns/HacmeBank/HacmeBank - Custom O2 AST Security Scanner.h2
@@ -11,7 +11,7 @@ var taintRules = new O2CodeStreamTaintRules();
 taintRules.add_TaintPropagator("System.Web.HttpServerUtility.HtmlDecode");  
 var o2Findings = new List&lt;IO2Finding&gt;();
 var cancelScan = false;
-O2.ImportExport.OunceLabs.OunceAvailableEngines.addAvailableEnginesToControl(typeof(ascx_FindingsViewer));
+OunceAvailableEngines.addAvailableEnginesToControl(typeof(ascx_FindingsViewer));
 //Canvas
 var designerCanvas = topPanel.add_DesignerCanvas();   
 
@@ -123,13 +123,15 @@ step4_FindingsCreated.add_ContextMenu()
 //using System.Windows.Markup
 //using O2.XRules.Database.Findings
 //using O2.XRules.Database.HacmeBank
+//using O2.ImportExport.OunceLabs
 
 //O2File:DiagramDesigner_ExtensionMethods.cs
 //O2File:Ast_Engine_ExtensionMethods.cs
 //O2File:Rule_DotNet_FindSources.cs 
-//O2File:Findings_ExtensionMethods.cs  
+//O2File:Findings_ExtensionMethods.cs  
+//O2File:OunceAvailableEngines.cs
 //O2File:API_HacmeBank.cs
-
+
 //O2Ref:O2_FluentSharp_WPF.dll
 //O2Ref:System.Web.dll
 //O2Ref:System.Xml.dll
@@ -142,8 +144,6 @@ step4_FindingsCreated.add_ContextMenu()
 //O2Ref:DiagramDesigner.exe
 //O2Ref:WatiN.Core.1x.dll
 
-//O2Ref:O2_ImportExport_OunceLabs.dll
-
 //O2Ref:PresentationCore.dll
 //O2Ref:PresentationFramework.dll
 //O2Ref:WindowsBase.dll

diff --git a/_Sample_Vulns/HacmeBank/HacmeBank_FullPoc.h2 b/_Sample_Vulns/HacmeBank/HacmeBank_FullPoc.h2
@@ -57,7 +57,7 @@ return null;
 //using O2.Views.ASCX.O2Findings;
 //using O2.XRules.Database.Findings;
 //using O2.DotNetWrappers.O2Findings
-//O2File:Findings_ExtensionMethods.cs
-//O2Ref:O2_ImportExport_OunceLabs.dll</SourceCode>
+//O2File:Findings_ExtensionMethods.cs
+//O2File:OunceAvailableEngines.cs</SourceCode>
   <ReferencedAssemblies />
 </H2>
diff --git a/_Sample_Vulns/HacmeBank/Map HacmeBank Ascx EntryPoints.h2 b/_Sample_Vulns/HacmeBank/Map HacmeBank Ascx EntryPoints.h2
@@ -65,6 +65,6 @@ return null;
 //using O2.DotNetWrappers.O2Findings;
 
 //O2File:Findings_ExtensionMethods.cs
-//O2Ref:O2_ImportExport_OunceLabs.dll</SourceCode>
+//O2File:OunceAvailableEngines.cs</SourceCode>
   <ReferencedAssemblies />
 </H2>