From ac9571edd5911e5bd88fa3fa6dfcaa851057356f Mon Sep 17 00:00:00 2001 From: _xeroxz Date: Thu, 24 Jun 2021 00:11:15 -0700 Subject: [PATCH] added gitignore, added some more code to show what im going for... --- .gitignore | 388 ++++++++++++++++++++++++++++++++++++++ include/llodctor_base.cpp | 6 - include/llodctor_base.hpp | 25 ++- include/llodctor_pe.hpp | 4 + include/lloiff.hpp | 9 +- include/lloutils.hpp | 10 +- llo-s1.vcxproj | 1 - llo-s1.vcxproj.filters | 3 - src/main.cpp | 9 +- 9 files changed, 436 insertions(+), 19 deletions(-) create mode 100644 .gitignore delete mode 100644 include/llodctor_base.cpp diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..72de34f --- /dev/null +++ b/.gitignore @@ -0,0 +1,388 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Nuget personal access tokens and Credentials +nuget.config + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +.idea/ +*.sln.iml \ No newline at end of file diff --git a/include/llodctor_base.cpp b/include/llodctor_base.cpp deleted file mode 100644 index 563ca8b..0000000 --- a/include/llodctor_base.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "llodctor_base.hpp" - -std::shared_ptr< llo::s1::dctor_base_t > llo::s1::dctor_base_t::begin( std::vector< std::uint8_t > &image ) -{ - return nullptr; -} \ No newline at end of file diff --git a/include/llodctor_base.hpp b/include/llodctor_base.hpp index d6b7f07..ce130e8 100644 --- a/include/llodctor_base.hpp +++ b/include/llodctor_base.hpp @@ -1,3 +1,4 @@ +#pragma once #include #include @@ -5,11 +6,31 @@ namespace llo::s1 { + /// + /// base clase for all file format deconstructors... + /// class dctor_base_t { + /// + /// vector of bytes containing the raw image to be deconstructed... + /// std::vector< std::uint8_t > raw_img; + public: - static std::shared_ptr begin( std::vector< std::uint8_t > &image ); - virtual bool generate( lloiff_t &iff ); + /// + /// set raw_img to the vector passed by reference... + /// + /// vector of bytes containing the raw image... + dctor_base_t( std::vector< std::uint8_t > &image ) : raw_img{ image } + { + } + + /// + /// purely virtual method which gets overriden by classes that inherit + /// dctor_base_t... fills the lloiff_t object full of data... + /// + /// + /// + virtual bool generate( lloiff_t &iff ) = 0; }; } // namespace llo::s1 \ No newline at end of file diff --git a/include/llodctor_pe.hpp b/include/llodctor_pe.hpp index e357d85..6501d5f 100644 --- a/include/llodctor_pe.hpp +++ b/include/llodctor_pe.hpp @@ -1,3 +1,4 @@ +#pragma once #include "llodctor_base.hpp" namespace llo::s1 @@ -5,6 +6,9 @@ namespace llo::s1 class dctor_pe_t : public dctor_base_t { public: + dctor_pe_t( std::vector< std::uint8_t > &image ) : dctor_base_t( image ) + { + } bool generate( lloiff_t &iff ) override; }; } // namespace llo::s1 \ No newline at end of file diff --git a/include/lloiff.hpp b/include/lloiff.hpp index f3ed851..5d40296 100644 --- a/include/lloiff.hpp +++ b/include/lloiff.hpp @@ -1,3 +1,4 @@ +#pragma once #include #include #include @@ -10,9 +11,8 @@ namespace llo class lloiff_t { public: - explicit lloiff_t( std::string &file_name ) + explicit lloiff_t( std::string &file_name ) : file_name( file_name ) { - this->file_name.make( file_name ); } class section_offset_t @@ -42,6 +42,11 @@ namespace llo return std::make_shared< lloiff_t >( file_name ); } + llo::utils::hash_t< std::string > get_name() const + { + return file_name; + } + private: llo::utils::hash_t< std::string > file_name; std::vector< section_t > sections; diff --git a/include/lloutils.hpp b/include/lloutils.hpp index a762f19..37857f3 100644 --- a/include/lloutils.hpp +++ b/include/lloutils.hpp @@ -1,3 +1,4 @@ +#pragma once #include #include #include @@ -12,7 +13,7 @@ namespace llo::utils std::random_device rd; std::mt19937 mt( rd() ); - std::uniform_real_distribution< double > dist( 1.0, 10.0 ); + std::uniform_real_distribution< double > dist( minimum, maximum ); return dist( mt ); } @@ -39,7 +40,7 @@ namespace llo::utils return std::make_shared< hash_t >( data ); } - T &get_data() const + T get_data() const { return data; } @@ -48,5 +49,10 @@ namespace llo::utils { return hash_result; } + + bool operator==( const hash_t< T > &hash ) + { + return hash.has_result == this->hash_result; + } }; } // namespace llo::utils \ No newline at end of file diff --git a/llo-s1.vcxproj b/llo-s1.vcxproj index 463586c..85ff895 100644 --- a/llo-s1.vcxproj +++ b/llo-s1.vcxproj @@ -20,7 +20,6 @@ - diff --git a/llo-s1.vcxproj.filters b/llo-s1.vcxproj.filters index f6945c3..880198a 100644 --- a/llo-s1.vcxproj.filters +++ b/llo-s1.vcxproj.filters @@ -39,8 +39,5 @@ Source Files - - Source Files - \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 833267b..7fcf1da 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,10 +6,13 @@ int main() std::string file_name = "test.exe"; std::vector< std::uint8_t > image; - llo::lloiff_t iif( file_name ); - auto pe_dctor = llo::s1::dctor_base_t::begin( image ); + llo::lloiff_t iff( file_name ); + llo::s1::dctor_pe_t pe_dctor( image ); - if ( !pe_dctor->generate( iif ) ) + std::printf( "> iff name = %s, hash = 0x%p\n", + iff.get_name().get_data().c_str(), iff.get_name().get_hash() ); + + if ( !pe_dctor.generate( iff ) ) { std::printf( "> failed to generate iff...\n" ); return -1;