Previous VC indentation made me so sick I've indented properly the wh…

…ole project.
0vercl0k · Apr 30, 2013 · f03a8f8 · f03a8f8
1 parent 8bd0b90
commit f03a8f8
Show file tree

Hide file tree

Showing 39 changed files with 138 additions and 138 deletions.
diff --git a/src/bearopgadgetfinder.cpp b/src/bearopgadgetfinder.cpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify
@@ -197,17 +197,17 @@ bool BeaRopGadgetFinder::is_valid_ending_instruction(DISASM* ending_instr_d)
 {
     bool isAllowed = false;
 
-	/*
-		Work Around, BeaEngine in x64 mode disassemble "\xDE\xDB" as an instruction without disassembly
-		Btw, this is not the only case!
-	*/
-	if(ending_instr_d->CompleteInstr[0] != 0)
-	{
-		if(m_opts & NasmSyntax)
-			isAllowed = is_valid_ending_instruction_nasm(ending_instr_d);
-		else
-			isAllowed = is_valid_ending_instruction_att(ending_instr_d);
-	}
+    /*
+        Work Around, BeaEngine in x64 mode disassemble "\xDE\xDB" as an instruction without disassembly
+        Btw, this is not the only case!
+    */
+    if(ending_instr_d->CompleteInstr[0] != 0)
+    {
+        if(m_opts & NasmSyntax)
+            isAllowed = is_valid_ending_instruction_nasm(ending_instr_d);
+        else
+            isAllowed = is_valid_ending_instruction_att(ending_instr_d);
+    }
 
     return isAllowed;
 }
@@ -217,11 +217,11 @@ bool BeaRopGadgetFinder::is_valid_instruction(DISASM *ending_instr_d)
     Int32 branch_type = ending_instr_d->Instruction.BranchType;
 
     return (
-		/*
-			Work Around, BeaEngine in x64 mode disassemble "\xDE\xDB" as an instruction without disassembly
-			Btw, this is not the only case!
-		*/
-		ending_instr_d->CompleteInstr[0] != 0 &&
+        /*
+            Work Around, BeaEngine in x64 mode disassemble "\xDE\xDB" as an instruction without disassembly
+            Btw, this is not the only case!
+        */
+        ending_instr_d->CompleteInstr[0] != 0 &&
         branch_type != RetType && 
         branch_type != JmpType &&
         branch_type != CallType &&

diff --git a/src/cpu.cpp b/src/cpu.cpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/elf.cpp b/src/elf.cpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@ Elf::Elf(void)
 }
 
 Elf::~Elf(void)
-{	
+{   
     if(m_ELFLayout != NULL)
         delete m_ELFLayout;
 }

diff --git a/src/elf_struct.cpp b/src/elf_struct.cpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/executable_format.cpp b/src/executable_format.cpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@ ExecutableFormat::ExecutableFormat(void)
 }
 
 ExecutableFormat::~ExecutableFormat(void)
-{	
+{   
 }
 
 ExecutableFormat* ExecutableFormat::GetExecutableFormat(unsigned int magic_dword)

diff --git a/src/gadget.cpp b/src/gadget.cpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/inc/bearopgadgetfinder.hpp b/src/inc/bearopgadgetfinder.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/inc/coloshell.hpp b/src/inc/coloshell.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify
@@ -340,7 +340,7 @@ static void coloshell(const T t, const Colors colo)
         else                                                                                              \
         {                                                                                                 \
             unsigned int b = hex_val[i];                                                                  \
-            std::cout << "\\x" << std::setw(2) << std::right << std::setfill('0') << std::hex << b;        \
+            std::cout << "\\x" << std::setw(2) << std::right << std::setfill('0') << std::hex << b;       \
         }                                                                                                 \
     }                                                                                                     \
     std::cout << std::endl;                                                                               \

diff --git a/src/inc/cpu.hpp b/src/inc/cpu.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/inc/elf.hpp b/src/inc/elf.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/inc/elf_struct.hpp b/src/inc/elf_struct.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/inc/executable_format.hpp b/src/inc/executable_format.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/inc/gadget.hpp b/src/inc/gadget.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify
@@ -105,17 +105,17 @@ class Gadget
          */
         Instruction* get_ending_instruction(void);
 
-		/*!
-		 * \brief This structure can be used for sorting Gadgets instance
-		 * \return
-		 */
-		struct Sort
-		{
-			bool operator()(const Gadget *g, const Gadget *d) const
-			{
-				return g->get_disassembly() < d->get_disassembly();
-			}
-		};
+        /*!
+         * \brief This structure can be used for sorting Gadgets instance
+         * \return
+         */
+        struct Sort
+        {
+            bool operator()(const Gadget *g, const Gadget *d) const
+            {
+                return g->get_disassembly() < d->get_disassembly();
+            }
+        };
 
     private:
 

diff --git a/src/inc/instruction.hpp b/src/inc/instruction.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/inc/macho.hpp b/src/inc/macho.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/inc/macho_struct.hpp b/src/inc/macho_struct.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/inc/main.hpp b/src/inc/main.hpp
@@ -1,29 +1,29 @@
 /*
-    This file is part of rp++.
+	This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
-    All rights reserved.
+	Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+	All rights reserved.
 
-    rp++ is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+	rp++ is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
 
-    rp++ is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+	rp++ is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with rp++.  If not, see <http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU General Public License
+	along with rp++.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef MAIN_HPP
 #define MAIN_HPP
 
 #include "platform.h"
 
 /*
-    If you don't want any colors if your shell, you can disable it in coloshell.hpp -- just comment the #define
+	If you don't want any colors if your shell, you can disable it in coloshell.hpp -- just comment the #define
 */
 
 #define MAXIMUM_INSTRUCTION_PER_GADGET 20  // it defines the maximum number of instruction per gadget

diff --git a/src/inc/pe.hpp b/src/inc/pe.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify

diff --git a/src/inc/pe_struct.hpp b/src/inc/pe_struct.hpp
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify
@@ -328,19 +328,19 @@ struct RP_IMAGE_SECTION_HEADER {
     unsigned short NumberOfLinenumbers;
     unsigned int   Characteristics;
 
-	std::string get_name(void) const
-	{
-		unsigned char name_null_terminated[RP_IMAGE_SIZEOF_SHORT_NAME + 1] = {0};
-		/* Yeah sometimes you don't have null byte after the name -- I try to be clean */
-		memcpy(name_null_terminated, Name, RP_IMAGE_SIZEOF_SHORT_NAME * sizeof(unsigned char));
+    std::string get_name(void) const
+    {
+        unsigned char name_null_terminated[RP_IMAGE_SIZEOF_SHORT_NAME + 1] = {0};
+        /* Yeah sometimes you don't have null byte after the name -- I try to be clean */
+        memcpy(name_null_terminated, Name, RP_IMAGE_SIZEOF_SHORT_NAME * sizeof(unsigned char));
 
-		return std::string((char*)name_null_terminated);
-	}
+        return std::string((char*)name_null_terminated);
+    }
 
     void display(VerbosityLevel lvl = VERBOSE_LEVEL_1) const
     {
         w_yel_lf("-> IMAGE_SECTION_HEADER");
-		
+        
         std::cout << "    " << get_name() << std::endl;
 
         if(lvl > VERBOSE_LEVEL_1)

diff --git a/src/inc/platform.h b/src/inc/platform.h
@@ -1,7 +1,7 @@
 /*
     This file is part of rp++.
 
-    Copyright (C) 2012, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
+    Copyright (C) 2013, Axel "0vercl0k" Souchet <0vercl0k at tuxfamily.org>
     All rights reserved.
 
     rp++ is free software: you can redistribute it and/or modify
@@ -27,25 +27,25 @@
 */
 
 #if defined (__i386__) || defined (_M_IX86)
-	#define ARCH_X86
+    #define ARCH_X86
 #elif defined(__amd64__) || defined(_M_X64)
-	#define ARCH_X64
+    #define ARCH_X64
 #else
-	#error Platform not supported.
+    #error Platform not supported.
 #endif
 
 #if defined (WIN32) || defined (WIN64) || defined (_WIN32) || defined (_WIN64)
-	#define WINDOWS
+    #define WINDOWS
 
     #define SYSTEM_PLATFORM "Windows"
 
-	#if defined ARCH_X86
-		#define WINDOWS_X86
-	#elif defined ARCH_X64
-		#define WINDOWS_X64
-	#endif
+    #if defined ARCH_X86
+        #define WINDOWS_X86
+    #elif defined ARCH_X64
+        #define WINDOWS_X64
+    #endif
 #elif defined (linux) || defined (__linux) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__MACH__)
-	#define LINUX
+    #define LINUX
 
     #if defined (linux) || defined (__linux)
         #define SYSTEM_PLATFORM "Linux"
@@ -64,11 +64,11 @@
     #endif
 
 #else
-	#error Platform not supported.
+    #error Platform not supported.
 #endif
 
 #ifdef WINDOWS
-	#undef UNICODE
+    #undef UNICODE
 #endif
 
 #ifdef LINUX