merging

conix-security · Feb 3, 2014 · 1f3b856 · 1f3b856
1 parent dacd3be
commit 1f3b856
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 154 deletions.
diff --git a/bin/cuckoo.patch b/bin/cuckoo.patch
@@ -1,10 +1,6 @@
 diff -rupN original/analyzer/windows/analyzer.py new/analyzer/windows/analyzer.py
 --- original/analyzer/windows/analyzer.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/analyzer.py	2014-01-24 15:21:57.873889147 +0100
-=======
 +++ new/analyzer/windows/analyzer.py	2014-01-31 21:43:44.775508446 +0100
->>>>>>> development
 @@ -221,6 +221,26 @@ class PipeHandler(Thread):
                  else:
                      response = hookdll_encode(url_dlls)
@@ -34,11 +30,7 @@ diff -rupN original/analyzer/windows/analyzer.py new/analyzer/windows/analyzer.p
              elif command.startswith("PROCESS:"):
 diff -rupN original/analyzer/windows/lib/api/process.py new/analyzer/windows/lib/api/process.py
 --- original/analyzer/windows/lib/api/process.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/lib/api/process.py	2014-01-24 15:21:57.997222486 +0100
-=======
 +++ new/analyzer/windows/lib/api/process.py	2014-01-31 21:43:44.878841780 +0100
->>>>>>> development
 @@ -5,6 +5,8 @@
  import os
  import logging
@@ -173,11 +165,7 @@ diff -rupN original/analyzer/windows/lib/api/process.py new/analyzer/windows/lib
      def wait(self):
 diff -rupN original/analyzer/windows/modules/packages/applet.py new/analyzer/windows/modules/packages/applet.py
 --- original/analyzer/windows/modules/packages/applet.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/applet.py	2014-01-24 15:21:57.947222483 +0100
-=======
 +++ new/analyzer/windows/modules/packages/applet.py	2014-01-31 21:43:44.852175113 +0100
->>>>>>> development
 @@ -50,6 +50,9 @@ class Applet(Package):
          dll = self.options.get("dll", None)
          free = self.options.get("free", False)
@@ -205,11 +193,7 @@ diff -rupN original/analyzer/windows/modules/packages/applet.py new/analyzer/win
              return p.pid
 diff -rupN original/analyzer/windows/modules/packages/bin.py new/analyzer/windows/modules/packages/bin.py
 --- original/analyzer/windows/modules/packages/bin.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/bin.py	2014-01-24 15:21:57.947222483 +0100
-=======
 +++ new/analyzer/windows/modules/packages/bin.py	2014-01-31 21:43:44.852175113 +0100
->>>>>>> development
 @@ -11,8 +11,12 @@ class Shellcode(Package):
      def start(self, path):
          p = Process()
@@ -227,11 +211,7 @@ diff -rupN original/analyzer/windows/modules/packages/bin.py new/analyzer/window
          return p.pid
 diff -rupN original/analyzer/windows/modules/packages/cpl.py new/analyzer/windows/modules/packages/cpl.py
 --- original/analyzer/windows/modules/packages/cpl.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/cpl.py	2014-01-24 15:21:57.947222483 +0100
-=======
 +++ new/analyzer/windows/modules/packages/cpl.py	2014-01-31 21:43:44.852175113 +0100
->>>>>>> development
 @@ -26,18 +26,22 @@ class CPL(Package):
 
          dll = self.options.get("dll", None)
@@ -259,11 +239,7 @@ diff -rupN original/analyzer/windows/modules/packages/cpl.py new/analyzer/window
          else:
 diff -rupN original/analyzer/windows/modules/packages/dll.py new/analyzer/windows/modules/packages/dll.py
 --- original/analyzer/windows/modules/packages/dll.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/dll.py	2014-01-24 15:21:57.947222483 +0100
-=======
 +++ new/analyzer/windows/modules/packages/dll.py	2014-01-31 21:43:44.852175113 +0100
->>>>>>> development
 @@ -14,6 +14,9 @@ class Dll(Package):
          function = self.options.get("function", "DllMain")
          arguments = self.options.get("arguments", None)
@@ -292,11 +268,7 @@ diff -rupN original/analyzer/windows/modules/packages/dll.py new/analyzer/window
          else:
 diff -rupN original/analyzer/windows/modules/packages/doc.py new/analyzer/windows/modules/packages/doc.py
 --- original/analyzer/windows/modules/packages/doc.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/doc.py	2014-01-24 15:21:57.947222483 +0100
-=======
 +++ new/analyzer/windows/modules/packages/doc.py	2014-01-31 21:43:44.852175113 +0100
->>>>>>> development
 @@ -37,17 +37,22 @@ class DOC(Package):
 
          dll = self.options.get("dll", None)
@@ -324,11 +296,7 @@ diff -rupN original/analyzer/windows/modules/packages/doc.py new/analyzer/window
          else:
 diff -rupN original/analyzer/windows/modules/packages/exe.py new/analyzer/windows/modules/packages/exe.py
 --- original/analyzer/windows/modules/packages/exe.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/exe.py	2014-01-24 15:21:57.947222483 +0100
-=======
 +++ new/analyzer/windows/modules/packages/exe.py	2014-01-31 21:43:44.852175113 +0100
->>>>>>> development
 @@ -13,17 +13,21 @@ class Exe(Package):
          free = self.options.get("free", False)
          args = self.options.get("arguments", None)
@@ -355,11 +323,7 @@ diff -rupN original/analyzer/windows/modules/packages/exe.py new/analyzer/window
              return p.pid
 diff -rupN original/analyzer/windows/modules/packages/generic.py new/analyzer/windows/modules/packages/generic.py
 --- original/analyzer/windows/modules/packages/generic.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/generic.py	2014-01-24 15:21:57.947222483 +0100
-=======
 +++ new/analyzer/windows/modules/packages/generic.py	2014-01-31 21:43:44.852175113 +0100
->>>>>>> development
 @@ -14,6 +14,9 @@ class Genric(Package):
      def start(self, path):
          free = self.options.get("free", False)
@@ -388,11 +352,7 @@ diff -rupN original/analyzer/windows/modules/packages/generic.py new/analyzer/wi
              return p.pid
 diff -rupN original/analyzer/windows/modules/packages/html.py new/analyzer/windows/modules/packages/html.py
 --- original/analyzer/windows/modules/packages/html.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/html.py	2014-01-24 15:21:57.947222483 +0100
-=======
 +++ new/analyzer/windows/modules/packages/html.py	2014-01-31 21:43:44.852175113 +0100
->>>>>>> development
 @@ -14,6 +14,9 @@ class HTML(Package):
      def start(self, path):
          free = self.options.get("free", False)
@@ -421,11 +381,7 @@ diff -rupN original/analyzer/windows/modules/packages/html.py new/analyzer/windo
          else:
 diff -rupN original/analyzer/windows/modules/packages/ie.py new/analyzer/windows/modules/packages/ie.py
 --- original/analyzer/windows/modules/packages/ie.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/ie.py	2014-01-24 15:21:57.950555817 +0100
-=======
 +++ new/analyzer/windows/modules/packages/ie.py	2014-01-31 21:43:44.855508445 +0100
->>>>>>> development
 @@ -15,6 +15,9 @@ class IE(Package):
      def start(self, url):
          free = self.options.get("free", False)
@@ -454,11 +410,7 @@ diff -rupN original/analyzer/windows/modules/packages/ie.py new/analyzer/windows
          else:
 diff -rupN original/analyzer/windows/modules/packages/jar.py new/analyzer/windows/modules/packages/jar.py
 --- original/analyzer/windows/modules/packages/jar.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/jar.py	2014-01-24 15:21:57.947222483 +0100
-=======
 +++ new/analyzer/windows/modules/packages/jar.py	2014-01-31 21:43:44.852175113 +0100
->>>>>>> development
 @@ -33,6 +33,9 @@ class Jar(Package):
          dll = self.options.get("dll", None)
          free = self.options.get("free", False)
@@ -487,11 +439,7 @@ diff -rupN original/analyzer/windows/modules/packages/jar.py new/analyzer/window
          else:
 diff -rupN original/analyzer/windows/modules/packages/pdf.py new/analyzer/windows/modules/packages/pdf.py
 --- original/analyzer/windows/modules/packages/pdf.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/pdf.py	2014-01-24 15:21:57.950555817 +0100
-=======
 +++ new/analyzer/windows/modules/packages/pdf.py	2014-01-31 21:43:44.855508445 +0100
->>>>>>> development
 @@ -34,17 +34,21 @@ class PDF(Package):
 
          dll = self.options.get("dll", None)
@@ -518,11 +466,7 @@ diff -rupN original/analyzer/windows/modules/packages/pdf.py new/analyzer/window
          else:
 diff -rupN original/analyzer/windows/modules/packages/vbs.py new/analyzer/windows/modules/packages/vbs.py
 --- original/analyzer/windows/modules/packages/vbs.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/vbs.py	2014-01-24 15:21:57.950555817 +0100
-=======
 +++ new/analyzer/windows/modules/packages/vbs.py	2014-01-31 21:43:44.855508445 +0100
->>>>>>> development
 @@ -33,17 +33,21 @@ class VBS(Package):
 
          dll = self.options.get("dll", None)
@@ -549,11 +493,7 @@ diff -rupN original/analyzer/windows/modules/packages/vbs.py new/analyzer/window
          else:
 diff -rupN original/analyzer/windows/modules/packages/xls.py new/analyzer/windows/modules/packages/xls.py
 --- original/analyzer/windows/modules/packages/xls.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/xls.py	2014-01-24 15:21:57.950555817 +0100
-=======
 +++ new/analyzer/windows/modules/packages/xls.py	2014-01-31 21:43:44.855508445 +0100
->>>>>>> development
 @@ -36,17 +36,21 @@ class XLS(Package):
 
          dll = self.options.get("dll", None)
@@ -580,11 +520,7 @@ diff -rupN original/analyzer/windows/modules/packages/xls.py new/analyzer/window
          else:
 diff -rupN original/analyzer/windows/modules/packages/zip.py new/analyzer/windows/modules/packages/zip.py
 --- original/analyzer/windows/modules/packages/zip.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/analyzer/windows/modules/packages/zip.py	2014-01-24 15:21:57.947222483 +0100
-=======
 +++ new/analyzer/windows/modules/packages/zip.py	2014-01-31 21:43:44.852175113 +0100
->>>>>>> development
 @@ -43,17 +43,21 @@ class Zip(Package):
          dll = self.options.get("dll", None)
          free = self.options.get("free", False)
@@ -611,22 +547,14 @@ diff -rupN original/analyzer/windows/modules/packages/zip.py new/analyzer/window
          else:
 diff -rupN original/lib/cuckoo/common/logtbl.py new/lib/cuckoo/common/logtbl.py
 --- original/lib/cuckoo/common/logtbl.py	2014-01-09 15:47:54.000000000 +0100
-<<<<<<< HEAD
-+++ new/lib/cuckoo/common/logtbl.py	2014-01-24 15:21:58.483889171 +0100
-=======
 +++ new/lib/cuckoo/common/logtbl.py	2014-01-31 21:43:45.212175113 +0100
->>>>>>> development
 @@ -1,4 +1,4 @@
 -# Copyright (C) 2010-2014 Cuckoo Sandbox Developers.
 +	# Copyright (C) 2010-2013 Cuckoo Sandbox Developers.
  # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org
  # See the file 'docs/LICENSE' for copying permission.
 
-<<<<<<< HEAD
-@@ -193,4 +193,35 @@ table = [
-=======
 @@ -193,4 +193,38 @@ table = [
->>>>>>> development
      ("ZwMapViewOfSection", "process", ("ppPp", "SectionHandle", "ProcessHandle", "BaseAddress", "SectionOffset")),
      ("GetSystemMetrics", "misc", ("l", "SystemMetricIndex")),
      ("GetCursorPos", "misc", ("ll", "x", "y")),
@@ -660,13 +588,6 @@ diff -rupN original/lib/cuckoo/common/logtbl.py new/lib/cuckoo/common/logtbl.py
 +	("ZwSetInformationFile (Delete)", "filesystem", ("sss", "FileHandle", "FileName", "FileInformationClass")),
 +	("ZwSetInformationFile (Rename)", "filesystem", ("ssss", "FileHandle", "OriginalName", "Renamed", "FileInformationClass")),
 +	("ZwQueryInformationFile", "filesystem", ("ss", "FileHandle", "FileInformationClass")),
-<<<<<<< HEAD
-+	("ZwCreateMutant", "synchronization", ("ssss", "MutantHandle", "DesiredAccess", "ObjectAttributes", "InitialOwner")),
- ]
-diff -rupN original/lib/cuckoo/core/database.py new/lib/cuckoo/core/database.py
---- original/lib/cuckoo/core/database.py	2014-01-09 15:47:54.000000000 +0100
-+++ new/lib/cuckoo/core/database.py	2014-01-24 15:21:58.463889170 +0100
-=======
 +	("ZwCreateMutant", "synchronization", ("ssss", "MutantHandle", "DesiredAccess", "MutexName", "InitialOwner")),
 +	("ZwDeviceIoControlFile", "system", ("ss", "FileHandle", "IoControlColde")),
 +	("ZwTerminateProcess", "process", ("sss", "ProcessHandle", "PID", "ExitStatus")),
@@ -675,7 +596,6 @@ diff -rupN original/lib/cuckoo/core/database.py new/lib/cuckoo/core/database.py
 diff -rupN original/lib/cuckoo/core/database.py new/lib/cuckoo/core/database.py
 --- original/lib/cuckoo/core/database.py	2014-01-09 15:47:54.000000000 +0100
 +++ new/lib/cuckoo/core/database.py	2014-01-31 21:43:45.192175112 +0100
->>>>>>> development
 @@ -271,6 +271,7 @@ class Task(Base):
      target = Column(Text(), nullable=False)
      category = Column(String(255), nullable=False)
@@ -769,11 +689,7 @@ diff -rupN original/lib/cuckoo/core/database.py new/lib/cuckoo/core/database.py
                     task.machine,
 diff -rupN original/modules/processing/behavior.py new/modules/processing/behavior.py
 --- original/modules/processing/behavior.py	2014-01-09 15:47:55.000000000 +0100
-<<<<<<< HEAD
-+++ new/modules/processing/behavior.py	2014-01-24 15:21:58.337222498 +0100
-=======
 +++ new/modules/processing/behavior.py	2014-01-31 21:43:45.092175113 +0100
->>>>>>> development
 @@ -329,6 +329,20 @@ class Summary:
              name = self._check_registry(registry, subkey, handle)
              if name and name not in self.keys:
@@ -797,11 +713,7 @@ diff -rupN original/modules/processing/behavior.py new/modules/processing/behavi
              subkey = ""
 diff -rupN original/web/submission/views.py new/web/submission/views.py
 --- original/web/submission/views.py	2014-01-09 15:47:49.000000000 +0100
-<<<<<<< HEAD
-+++ new/web/submission/views.py	2014-01-24 15:22:00.053889231 +0100
-=======
 +++ new/web/submission/views.py	2014-01-31 21:43:49.655508451 +0100
->>>>>>> development
 @@ -26,6 +26,7 @@ def index(request):
          package = request.POST.get("package", "")
          timeout = force_int(request.POST.get("timeout"))
@@ -840,11 +752,7 @@ diff -rupN original/web/submission/views.py new/web/submission/views.py
                                   custom=custom,
 diff -rupN original/web/templates/submission/index.html new/web/templates/submission/index.html
 --- original/web/templates/submission/index.html	2014-01-09 15:47:49.000000000 +0100
-<<<<<<< HEAD
-+++ new/web/templates/submission/index.html	2014-01-24 15:24:20.983894598 +0100
-=======
 +++ new/web/templates/submission/index.html	2014-01-31 21:43:48.692175118 +0100
->>>>>>> development
 @@ -101,6 +101,15 @@ $(document).ready( function() {
                                  <label for="form_options">Options</label>
                                  <input type="text" class="form-control" id="form_options" name="options" />

diff --git a/bin/cuckoo_files.zip b/bin/cuckoo_files.zip
diff --git a/bin/logs_dispatcher.exe b/bin/logs_dispatcher.exe
diff --git a/bin/zer0m0n.sys b/bin/zer0m0n.sys
diff --git a/src/app/logtbl.c b/src/app/logtbl.c
@@ -216,12 +216,9 @@ const char *logtbl[] = {
     "ZwSetInformationFile (Rename)",
     "ZwQueryInformationFile",
     "ZwCreateMutant",
-<<<<<<< HEAD
-=======
     "ZwDeviceIoControlFile",
     "ZwTerminateProcess",
     "ZwDelayExecution",
->>>>>>> development
     NULL
 };
 char logtbl_explained[sizeof(logtbl)/sizeof(char *)] = {0};