nold/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool synced 2024-11-22 21:49:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

change directory structure, and add support for VS compile, and fix aes-xts bug.

Browse source
This commit is contained in:
jakcron 2017-08-05 21:09:50 +08:00
parent e8c39ace04
commit e74f214a3b
143 changed files with 798 additions and 489 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -11,4 +11,8 @@
*.log *.log
/bin/* /bin/*
/*/*/Debug /*/*/Debug
/*/*/x64
/x64
/Debug
/test
/sample /sample

8
NXTools.sln
View file

@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.25420.1 VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfnd", "lib\fnd\fnd.vcxproj", "{4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfnd", "lib\libfnd\fnd.vcxproj", "{4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcrypto", "lib\crypto\crypto.vcxproj", "{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcrypto", "lib\libcrypto\crypto.vcxproj", "{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnx", "lib\nx\nx.vcxproj", "{91BA9E79-8242-4F7D-B997-0DFEC95EA22B}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnx", "lib\libnx\nx.vcxproj", "{91BA9E79-8242-4F7D-B997-0DFEC95EA22B}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ncatool", "programs\ncatool\ncatool.vcxproj", "{7DA88C6F-4470-495D-995A-4F633F3370C1}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ncatool", "programs\ncatool\ncatool.vcxproj", "{7DA88C6F-4470-495D-995A-4F633F3370C1}"
EndProject EndProject
@ -32,7 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pfstool", "programs\pfstool\pfstool.vcxproj", "{BC2F2D07-BAB3-469C-9C25-8CC54F96F7AB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pfstool", "programs\pfstool\pfstool.vcxproj", "{BC2F2D07-BAB3-469C-9C25-8CC54F96F7AB}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libes", "lib\es\es.vcxproj", "{7BE99936-0D40-410D-944B-4513C2EFF8DC}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libes", "lib\libes\es.vcxproj", "{7BE99936-0D40-410D-944B-4513C2EFF8DC}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiktool", "programs\tiktool\tiktool.vcxproj", "{2200B834-F15A-4C6E-9DDB-6012B9A5C246}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiktool", "programs\tiktool\tiktool.vcxproj", "{2200B834-F15A-4C6E-9DDB-6012B9A5C246}"
EndProject EndProject

48
lib/crypto/crypto.vcxproj.filters
View file

@ -1,48 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="aes_ctr_stream.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="aes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="sha.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="rsa.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="aes_ctr_stream.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="aes.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="sha.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="rsa.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="makefile" />
</ItemGroup>
</Project>

75
lib/es/es.vcxproj → lib/libcrypto/crypto.vcxproj
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
@ -19,35 +19,36 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{7BE99936-0D40-410D-944B-4513C2EFF8DC}</ProjectGuid> <VCProjectVersion>15.0</VCProjectVersion>
<RootNamespace>es</RootNamespace> <ProjectGuid>{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1}</ProjectGuid>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> <RootNamespace>crypto</RootNamespace>
<ProjectName>libes</ProjectName> <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<ProjectName>libcrypto</ProjectName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
@ -75,7 +76,8 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -83,7 +85,8 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -93,7 +96,8 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -107,26 +111,43 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="include\crypto\aes.h" />
<ClInclude Include="include\crypto\AesCtrStream.h" />
<ClInclude Include="include\crypto\rsa.h" />
<ClInclude Include="include\crypto\sha.h" />
<ClInclude Include="source\libpolarssl\include\polarssl\aes.h" />
<ClInclude Include="source\libpolarssl\include\polarssl\base64.h" />
<ClInclude Include="source\libpolarssl\include\polarssl\bignum.h" />
<ClInclude Include="source\libpolarssl\include\polarssl\bn_mul.h" />
<ClInclude Include="source\libpolarssl\include\polarssl\config.h" />
<ClInclude Include="source\libpolarssl\include\polarssl\rsa.h" />
<ClInclude Include="source\libpolarssl\include\polarssl\sha1.h" />
<ClInclude Include="source\libpolarssl\include\polarssl\sha2.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="source\aes.cpp" />
<ClCompile Include="source\AesCtrStream.cpp" />
<ClCompile Include="source\libpolarssl\source\polar_aes.c" />
<ClCompile Include="source\libpolarssl\source\polar_base64.c" />
<ClCompile Include="source\libpolarssl\source\polar_bignum.c" />
<ClCompile Include="source\libpolarssl\source\polar_rsa.c" />
<ClCompile Include="source\libpolarssl\source\polar_sha1.c" />
<ClCompile Include="source\libpolarssl\source\polar_sha2.c" />
<ClCompile Include="source\rsa.cpp" />
<ClCompile Include="source\sha.cpp" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="makefile" /> <None Include="makefile" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="ETicketBody_V2.h" />
<ClInclude Include="ETicketContentRecord_V1.h" />
<ClInclude Include="ETicketSectionHeader_V2.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="ETicketBody_V2.cpp" />
<ClCompile Include="ETicketContentRecord_V1.cpp" />
<ClCompile Include="ETicketSectionHeader_V2.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

99
lib/libcrypto/crypto.vcxproj.filters Normal file
View file

@ -0,0 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Header Files\crypto">
<UniqueIdentifier>{c24d0e3f-1a38-486c-9bad-b7db5b39eee2}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\polarssl">
<UniqueIdentifier>{50821199-d06b-4e82-b424-3f17b60f1a9e}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\polarssl">
<UniqueIdentifier>{012a6f22-d10a-4ca3-b7c3-4c31c6ff1cc1}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\crypto\aes.h">
<Filter>Header Files\crypto</Filter>
</ClInclude>
<ClInclude Include="include\crypto\AesCtrStream.h">
<Filter>Header Files\crypto</Filter>
</ClInclude>
<ClInclude Include="include\crypto\rsa.h">
<Filter>Header Files\crypto</Filter>
</ClInclude>
<ClInclude Include="include\crypto\sha.h">
<Filter>Header Files\crypto</Filter>
</ClInclude>
<ClInclude Include="source\libpolarssl\include\polarssl\aes.h">
<Filter>Header Files\polarssl</Filter>
</ClInclude>
<ClInclude Include="source\libpolarssl\include\polarssl\base64.h">
<Filter>Header Files\polarssl</Filter>
</ClInclude>
<ClInclude Include="source\libpolarssl\include\polarssl\bignum.h">
<Filter>Header Files\polarssl</Filter>
</ClInclude>
<ClInclude Include="source\libpolarssl\include\polarssl\bn_mul.h">
<Filter>Header Files\polarssl</Filter>
</ClInclude>
<ClInclude Include="source\libpolarssl\include\polarssl\config.h">
<Filter>Header Files\polarssl</Filter>
</ClInclude>
<ClInclude Include="source\libpolarssl\include\polarssl\rsa.h">
<Filter>Header Files\polarssl</Filter>
</ClInclude>
<ClInclude Include="source\libpolarssl\include\polarssl\sha1.h">
<Filter>Header Files\polarssl</Filter>
</ClInclude>
<ClInclude Include="source\libpolarssl\include\polarssl\sha2.h">
<Filter>Header Files\polarssl</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="source\aes.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="source\AesCtrStream.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="source\rsa.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="source\sha.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="source\libpolarssl\source\polar_aes.c">
<Filter>Source Files\polarssl</Filter>
</ClCompile>
<ClCompile Include="source\libpolarssl\source\polar_base64.c">
<Filter>Source Files\polarssl</Filter>
</ClCompile>
<ClCompile Include="source\libpolarssl\source\polar_bignum.c">
<Filter>Source Files\polarssl</Filter>
</ClCompile>
<ClCompile Include="source\libpolarssl\source\polar_rsa.c">
<Filter>Source Files\polarssl</Filter>
</ClCompile>
<ClCompile Include="source\libpolarssl\source\polar_sha2.c">
<Filter>Source Files\polarssl</Filter>
</ClCompile>
<ClCompile Include="source\libpolarssl\source\polar_sha1.c">
<Filter>Source Files\polarssl</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="makefile" />
</ItemGroup>
</Project>

2
lib/crypto/aes_ctr_stream.h → lib/libcrypto/include/crypto/AesCtrStream.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <vector> #include <vector>
#include <fnd/exception.h> #include <fnd/Exception.h>
#include <crypto/aes.h> #include <crypto/aes.h>
namespace crypto namespace crypto

0
lib/crypto/aes.h → lib/libcrypto/include/crypto/aes.h
View file

0
lib/crypto/rsa.h → lib/libcrypto/include/crypto/rsa.h
View file

0
lib/crypto/sha.h → lib/libcrypto/include/crypto/sha.h
View file

37
lib/libcrypto/makefile Normal file
View file

@ -0,0 +1,37 @@
# Sources
SRC_DIR = source source/libpolarssl/source
OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c)))
# External dependencies
DEPENDS = fnd
LIB_DIR = ..
INCS = -I"include" -I"source/libpolarssl/include" $(foreach dep,$(DEPENDS), -I"$(LIB_DIR)/lib$(dep)/include")
# Compiler Settings
CXXFLAGS = -std=c++11 $(INCS) -D__STDC_FORMAT_MACROS -Wall -Wno-unused-but-set-variable -Wno-unused-value
CFLAGS = -std=c11 $(INCS) -Wall -Wno-unused-but-set-variable -Wno-unused-value
ifeq ($(OS),Windows_NT)
# Windows Only Flags/Libs
CC = x86_64-w64-mingw32-gcc
CXX = x86_64-w64-mingw32-g++
CFLAGS +=
CXXFLAGS +=
else
# *nix Only Flags/Libs
CFLAGS +=
CXXFLAGS +=
endif
# Output
OUTPUT = $(shell basename $(CURDIR)).a
main: build
rebuild: clean build
build: $(OBJS)
ar cr -o $(OUTPUT) $(OBJS)
clean:
rm -rf $(OUTPUT) $(OBJS)

2
lib/crypto/aes_ctr_stream.cpp → lib/libcrypto/source/AesCtrStream.cpp
View file

@ -1,4 +1,4 @@
#include "aes_ctr_stream.h" #include <crypto/AesCtrStream.h>
using namespace crypto::aes; using namespace crypto::aes;

6
lib/crypto/aes.cpp → lib/libcrypto/source/aes.cpp
View file

@ -1,5 +1,5 @@
#include "aes.h" #include <crypto/aes.h>
#include "polarssl/aes.h" #include <polarssl/aes.h>
using namespace crypto::aes; using namespace crypto::aes;
@ -150,7 +150,7 @@ void crypto::aes::GaloisFunc(uint8_t x[kAesBlockSize])
{ {
uint8_t t = x[15]; uint8_t t = x[15];
for (uint8_t i = 16; i > 0; i--) for (uint8_t i = 15; i > 0; i--)
{ {
x[i] = (x[i] << 1) | (x[i - 1] & 0x80 ? 1 : 0); x[i] = (x[i] << 1) | (x[i - 1] & 0x80 ? 1 : 0);
} }

1
lib/crypto/polarssl/aes.h → lib/libcrypto/source/libpolarssl/include/polarssl/aes.h
View file

@ -34,6 +34,7 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <basetsd.h> #include <basetsd.h>
typedef UINT32 uint32_t; typedef UINT32 uint32_t;
typedef UINT64 uint64_t;
#else #else
#include <inttypes.h> #include <inttypes.h>
#endif #endif

0
lib/crypto/polarssl/base64.h → lib/libcrypto/source/libpolarssl/include/polarssl/base64.h
View file

0
lib/crypto/polarssl/bignum.h → lib/libcrypto/source/libpolarssl/include/polarssl/bignum.h
View file

0
lib/crypto/polarssl/bn_mul.h → lib/libcrypto/source/libpolarssl/include/polarssl/bn_mul.h
View file

0
lib/crypto/polarssl/config.h → lib/libcrypto/source/libpolarssl/include/polarssl/config.h
View file

0
lib/crypto/polarssl/rsa.h → lib/libcrypto/source/libpolarssl/include/polarssl/rsa.h
View file

0
lib/crypto/polarssl/sha1.h → lib/libcrypto/source/libpolarssl/include/polarssl/sha1.h
View file

0
lib/crypto/polarssl/sha2.h → lib/libcrypto/source/libpolarssl/include/polarssl/sha2.h
View file

12
lib/crypto/makefile → lib/libcrypto/source/libpolarssl/makefile
View file

@ -1,12 +1,16 @@
# Sources # Sources
SRC_DIR = . polarssl SRC_DIR = source
OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c))) OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c)))
INC_DIR = .. # External dependencies
INCS = $(foreach dir,$(INC_DIR), -I"$(dir)") DEPENDS =
LIB_DIR = ..
INCS = -I"include" $(foreach dep,$(DEPENDS), -I"$(LIB_DIR)/lib$(dep)/include")
# Compiler Settings # Compiler Settings
CXXFLAGS = -std=c++11 $(INCS) -D__STDC_FORMAT_MACROS -Wall -Wno-unused-but-set-variable -Wno-unused-value CXXFLAGS = -std=c++11 $(INCS) -D__STDC_FORMAT_MACROS -Wall -Wno-unused-but-set-variable -Wno-unused-value
CFLAGS = -std=c11 $(INCS) -Wall -Wno-unused-but-set-variable -Wno-unused-value
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
# Windows Only Flags/Libs # Windows Only Flags/Libs
CC = x86_64-w64-mingw32-gcc CC = x86_64-w64-mingw32-gcc
@ -20,7 +24,7 @@ else
endif endif
# Output # Output
OUTPUT = ../lib$(shell basename $(CURDIR)).a OUTPUT = $(shell basename $(CURDIR)).a
main: build main: build

6
lib/crypto/polarssl/aes.c → lib/libcrypto/source/libpolarssl/source/polar_aes.c
View file

@ -29,13 +29,13 @@
* http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf * http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
*/ */
#include "config.h" #include <polarssl/config.h>
#if defined(POLARSSL_AES_C) #if defined(POLARSSL_AES_C)
#include "aes.h" #include <polarssl/aes.h>
#if defined(POLARSSL_PADLOCK_C) #if defined(POLARSSL_PADLOCK_C)
#include "padlock.h" #include <polarssl/padlock.h>
#endif #endif
#if !defined(POLARSSL_AES_ALT) #if !defined(POLARSSL_AES_ALT)

4
lib/crypto/polarssl/base64.c → lib/libcrypto/source/libpolarssl/source/polar_base64.c
View file

@ -23,11 +23,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "config.h" #include <polarssl/config.h>
#if defined(POLARSSL_BASE64_C) #if defined(POLARSSL_BASE64_C)
#include "base64.h" #include <polarssl/base64.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#include <basetsd.h> #include <basetsd.h>

6
lib/crypto/polarssl/bignum.c → lib/libcrypto/source/libpolarssl/source/polar_bignum.c
View file

@ -30,12 +30,12 @@
* http://math.libtomcrypt.com/files/tommath.pdf * http://math.libtomcrypt.com/files/tommath.pdf
*/ */
#include "config.h" #include <polarssl/config.h>
#if defined(POLARSSL_BIGNUM_C) #if defined(POLARSSL_BIGNUM_C)
#include "bignum.h" #include <polarssl/bignum.h>
#include "bn_mul.h" #include <polarssl/bn_mul.h>
#include <stdlib.h> #include <stdlib.h>

6
lib/crypto/polarssl/rsa.c → lib/libcrypto/source/libpolarssl/source/polar_rsa.c
View file

@ -29,14 +29,14 @@
* http://www.cacr.math.uwaterloo.ca/hac/about/chap8.pdf * http://www.cacr.math.uwaterloo.ca/hac/about/chap8.pdf
*/ */
#include "config.h" #include <polarssl/config.h>
#if defined(POLARSSL_RSA_C) #if defined(POLARSSL_RSA_C)
#include "rsa.h" #include <polarssl/rsa.h>
#if defined(POLARSSL_PKCS1_V21) #if defined(POLARSSL_PKCS1_V21)
#include "md.h" #include <polarssl/md.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>

4
lib/crypto/polarssl/sha1.c → lib/libcrypto/source/libpolarssl/source/polar_sha1.c
View file

@ -28,11 +28,11 @@
* http://www.itl.nist.gov/fipspubs/fip180-1.htm * http://www.itl.nist.gov/fipspubs/fip180-1.htm
*/ */
#include "config.h" #include <polarssl/config.h>
#if defined(POLARSSL_SHA1_C) #if defined(POLARSSL_SHA1_C)
#include "sha1.h" #include <polarssl/sha1.h>
#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
#include <stdio.h> #include <stdio.h>

4
lib/crypto/polarssl/sha2.c → lib/libcrypto/source/libpolarssl/source/polar_sha2.c
View file

@ -28,11 +28,11 @@
* http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf * http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
*/ */
#include "config.h" #include <polarssl/config.h>
#if defined(POLARSSL_SHA2_C) #if defined(POLARSSL_SHA2_C)
#include "sha2.h" #include <polarssl/sha2.h>
#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
#include <stdio.h> #include <stdio.h>

4
lib/crypto/rsa.cpp → lib/libcrypto/source/rsa.cpp
View file

@ -1,5 +1,5 @@
#include "rsa.h" #include <crypto/rsa.h>
#include "polarssl/rsa.h" #include <polarssl/rsa.h>
using namespace crypto::rsa; using namespace crypto::rsa;
using namespace crypto::sha; using namespace crypto::sha;

6
lib/crypto/sha.cpp → lib/libcrypto/source/sha.cpp
View file

@ -1,6 +1,6 @@
#include "sha.h" #include <crypto/sha.h>
#include "polarssl/sha1.h" #include <polarssl/sha1.h>
#include "polarssl/sha2.h" #include <polarssl/sha2.h>
using namespace crypto::sha; using namespace crypto::sha;

49
lib/crypto/crypto.vcxproj → lib/libes/es.vcxproj
View file

@ -19,34 +19,33 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion> <ProjectGuid>{7BE99936-0D40-410D-944B-4513C2EFF8DC}</ProjectGuid>
<ProjectGuid>{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1}</ProjectGuid> <RootNamespace>es</RootNamespace>
<RootNamespace>crypto</RootNamespace> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion> <ProjectName>libes</ProjectName>
<ProjectName>libcrypto</ProjectName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
@ -76,7 +75,8 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libes\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -84,7 +84,8 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libes\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -94,6 +95,8 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libes\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -107,27 +110,27 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libes\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="aes.h" />
<ClInclude Include="aes_ctr_stream.h" />
<ClInclude Include="rsa.h" />
<ClInclude Include="sha.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="aes.cpp" />
<ClCompile Include="aes_ctr_stream.cpp" />
<ClCompile Include="rsa.cpp" />
<ClCompile Include="sha.cpp" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="makefile" /> <None Include="makefile" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="include\es\ETicketBody_V2.h" />
<ClInclude Include="include\es\ETicketContentRecord_V1.h" />
<ClInclude Include="include\es\ETicketSectionHeader_V2.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="source\ETicketBody_V2.cpp" />
<ClCompile Include="source\ETicketContentRecord_V1.cpp" />
<ClCompile Include="source\ETicketSectionHeader_V2.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

12
lib/es/es.vcxproj.filters → lib/libes/es.vcxproj.filters
View file

@ -18,24 +18,24 @@
<None Include="makefile" /> <None Include="makefile" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="ETicketBody_V2.h"> <ClInclude Include="include\es\ETicketBody_V2.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="ETicketSectionHeader_V2.h"> <ClInclude Include="include\es\ETicketContentRecord_V1.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="ETicketContentRecord_V1.h"> <ClInclude Include="include\es\ETicketSectionHeader_V2.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="ETicketBody_V2.cpp"> <ClCompile Include="source\ETicketBody_V2.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="ETicketSectionHeader_V2.cpp"> <ClCompile Include="source\ETicketContentRecord_V1.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="ETicketContentRecord_V1.cpp"> <ClCompile Include="source\ETicketSectionHeader_V2.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

7
lib/es/ETicketBody_V2.h → lib/libes/include/es/ETicketBody_V2.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/ISerialiseableBinary.h> #include <fnd/ISerialiseableBinary.h>
#include <crypto/rsa.h> #include <crypto/rsa.h>
@ -60,6 +60,9 @@ namespace es
LicenseType getLicenseType() const; LicenseType getLicenseType() const;
void setLicenseType(LicenseType type); void setLicenseType(LicenseType type);
u8 getCommonKeyId() const;
void setCommonKeyId(u8 id);
bool isPreInstall() const; bool isPreInstall() const;
void setIsPreInstall(bool isPreInstall); void setIsPreInstall(bool isPreInstall);
@ -196,7 +199,7 @@ namespace es
TitleKeyEncType mEncType; // 0 = aes-cbc, 1 = rsa2048 TitleKeyEncType mEncType; // 0 = aes-cbc, 1 = rsa2048
u16 mTicketVersion; u16 mTicketVersion;
LicenseType mLicenseType; LicenseType mLicenseType;
u8 kCommonKeyId; u8 mCommonKeyId;
bool mPreInstall; bool mPreInstall;
bool mSharedTitle; bool mSharedTitle;
bool mAllowAllContent; bool mAllowAllContent;

3
lib/es/ETicketContentRecord_V1.h → lib/libes/include/es/ETicketContentRecord_V1.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/List.h> #include <fnd/List.h>
#include <fnd/ISerialiseableBinary.h> #include <fnd/ISerialiseableBinary.h>
@ -13,6 +13,7 @@ namespace es
ETicketContentRecord_V1(); ETicketContentRecord_V1();
private: private:
const std::string kModuleName = "ETICKET_CONTENT_RECORD_V1";
#pragma pack (push, 1) #pragma pack (push, 1)
struct sContentRecord_v1 struct sContentRecord_v1

2
lib/es/ETicketSectionHeader_V2.h → lib/libes/include/es/ETicketSectionHeader_V2.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/ISerialiseableBinary.h> #include <fnd/ISerialiseableBinary.h>
namespace es namespace es

12
lib/nx/makefile → lib/libes/makefile
View file

@ -1,12 +1,16 @@
# Sources # Sources
SRC_DIR = . SRC_DIR = source
OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c))) OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c)))
INC_DIR = .. # External dependencies
INCS = $(foreach dir,$(INC_DIR), -I"$(dir)/") DEPENDS = fnd crypto
LIB_DIR = ..
INCS = -I"include" $(foreach dep,$(DEPENDS), -I"$(LIB_DIR)/lib$(dep)/include")
# Compiler Settings # Compiler Settings
CXXFLAGS = -std=c++11 $(INCS) -D__STDC_FORMAT_MACROS -Wall -Wno-unused-but-set-variable -Wno-unused-value CXXFLAGS = -std=c++11 $(INCS) -D__STDC_FORMAT_MACROS -Wall -Wno-unused-but-set-variable -Wno-unused-value
CFLAGS = -std=c11 $(INCS) -Wall -Wno-unused-but-set-variable -Wno-unused-value
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
# Windows Only Flags/Libs # Windows Only Flags/Libs
CC = x86_64-w64-mingw32-gcc CC = x86_64-w64-mingw32-gcc
@ -20,7 +24,7 @@ else
endif endif
# Output # Output
OUTPUT = ../lib$(shell basename $(CURDIR)).a OUTPUT = $(shell basename $(CURDIR)).a
main: build main: build

12
lib/es/ETicketBody_V2.cpp → lib/libes/source/ETicketBody_V2.cpp
View file

@ -1,4 +1,4 @@
#include "ETicketBody_V2.h" #include <es/ETicketBody_V2.h>
@ -234,6 +234,16 @@ void es::ETicketBody_V2::setLicenseType(LicenseType type)
mLicenseType = type; mLicenseType = type;
} }
u8 es::ETicketBody_V2::getCommonKeyId() const
{
return mCommonKeyId;
}
void es::ETicketBody_V2::setCommonKeyId(u8 id)
{
mCommonKeyId = id;
}
bool es::ETicketBody_V2::isPreInstall() const bool es::ETicketBody_V2::isPreInstall() const
{ {
return mPreInstall; return mPreInstall;

2
lib/es/ETicketContentRecord_V1.cpp → lib/libes/source/ETicketContentRecord_V1.cpp
View file

@ -1,4 +1,4 @@
#include "ETicketContentRecord_V1.h" #include <es/ETicketContentRecord_V1.h>

2
lib/es/ETicketSectionHeader_V2.cpp → lib/libes/source/ETicketSectionHeader_V2.cpp
View file

@ -1,4 +1,4 @@
#include "ETicketSectionHeader_V2.h" #include <es/ETicketSectionHeader_V2.h>

43
lib/fnd/fnd.vcxproj → lib/libfnd/fnd.vcxproj
View file

@ -27,26 +27,26 @@
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
@ -76,7 +76,8 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -84,7 +85,8 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -94,7 +96,8 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>C:\Users\jkrca\Source\Repos\NXTools\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -108,6 +111,8 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\libfnd\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -115,20 +120,20 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="elf.h" /> <ClInclude Include="include\fnd\elf.h" />
<ClInclude Include="exception.h" /> <ClInclude Include="include\fnd\Exception.h" />
<ClInclude Include="io.h" /> <ClInclude Include="include\fnd\io.h" />
<ClInclude Include="ISerialiseableBinary.h" /> <ClInclude Include="include\fnd\ISerialiseableBinary.h" />
<ClInclude Include="List.h" /> <ClInclude Include="include\fnd\List.h" />
<ClInclude Include="memory_blob.h" /> <ClInclude Include="include\fnd\MemoryBlob.h" />
<ClInclude Include="string_conv.h" /> <ClInclude Include="include\fnd\StringConv.h" />
<ClInclude Include="types.h" /> <ClInclude Include="include\fnd\types.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="exception.cpp" /> <ClCompile Include="source\Exception.cpp" />
<ClCompile Include="io.cpp" /> <ClCompile Include="source\io.cpp" />
<ClCompile Include="memory_blob.cpp" /> <ClCompile Include="source\MemoryBlob.cpp" />
<ClCompile Include="string_conv.cpp" /> <ClCompile Include="source\StringConv.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="makefile" /> <None Include="makefile" />

24
lib/fnd/fnd.vcxproj.filters → lib/libfnd/fnd.vcxproj.filters
View file

@ -15,42 +15,42 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="elf.h"> <ClInclude Include="include\fnd\elf.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="memory_blob.h"> <ClInclude Include="include\fnd\Exception.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="string_conv.h"> <ClInclude Include="include\fnd\io.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="types.h"> <ClInclude Include="include\fnd\ISerialiseableBinary.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="exception.h"> <ClInclude Include="include\fnd\List.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="io.h"> <ClInclude Include="include\fnd\MemoryBlob.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="List.h"> <ClInclude Include="include\fnd\StringConv.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="ISerialiseableBinary.h"> <ClInclude Include="include\fnd\types.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="memory_blob.cpp"> <ClCompile Include="source\Exception.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="string_conv.cpp"> <ClCompile Include="source\io.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="exception.cpp"> <ClCompile Include="source\MemoryBlob.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="io.cpp"> <ClCompile Include="source\StringConv.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

0
lib/fnd/exception.h → lib/libfnd/include/fnd/Exception.h
View file

0
lib/fnd/ISerialiseableBinary.h → lib/libfnd/include/fnd/ISerialiseableBinary.h
View file

0
lib/fnd/List.h → lib/libfnd/include/fnd/List.h
View file

0
lib/fnd/memory_blob.h → lib/libfnd/include/fnd/MemoryBlob.h
View file

0
lib/fnd/string_conv.h → lib/libfnd/include/fnd/StringConv.h
View file

0
lib/fnd/elf.h → lib/libfnd/include/fnd/elf.h
View file

2
lib/fnd/io.h → lib/libfnd/include/fnd/io.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
namespace fnd namespace fnd
{ {

2
lib/fnd/types.h → lib/libfnd/include/fnd/types.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include <fnd/exception.h> #include <fnd/Exception.h>
typedef uint64_t dword_t; typedef uint64_t dword_t;
typedef uint32_t word_t; typedef uint32_t word_t;

12
lib/es/makefile → lib/libfnd/makefile
View file

@ -1,12 +1,16 @@
# Sources # Sources
SRC_DIR = . SRC_DIR = source
OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c))) OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c)))
INC_DIR = .. # External dependencies
INCS = $(foreach dir,$(INC_DIR), -I"$(dir)/") DEPENDS =
LIB_DIR = ..
INCS = -I"include" $(foreach dep,$(DEPENDS), -I"$(LIB_DIR)/lib$(dep)/include")
# Compiler Settings # Compiler Settings
CXXFLAGS = -std=c++11 $(INCS) -D__STDC_FORMAT_MACROS -Wall -Wno-unused-but-set-variable -Wno-unused-value CXXFLAGS = -std=c++11 $(INCS) -D__STDC_FORMAT_MACROS -Wall -Wno-unused-but-set-variable -Wno-unused-value
CFLAGS = -std=c11 $(INCS) -Wall -Wno-unused-but-set-variable -Wno-unused-value
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
# Windows Only Flags/Libs # Windows Only Flags/Libs
CC = x86_64-w64-mingw32-gcc CC = x86_64-w64-mingw32-gcc
@ -20,7 +24,7 @@ else
endif endif
# Output # Output
OUTPUT = ../lib$(shell basename $(CURDIR)).a OUTPUT = $(shell basename $(CURDIR)).a
main: build main: build

2
lib/fnd/exception.cpp → lib/libfnd/source/Exception.cpp
View file

@ -1,4 +1,4 @@
#include "exception.h" #include <fnd/Exception.h>
using namespace fnd; using namespace fnd;

2
lib/fnd/memory_blob.cpp → lib/libfnd/source/MemoryBlob.cpp
View file

@ -1,4 +1,4 @@
#include "memory_blob.h" #include <fnd/MemoryBlob.h>
using namespace fnd; using namespace fnd;

2
lib/fnd/string_conv.cpp → lib/libfnd/source/StringConv.cpp
View file

@ -1,4 +1,4 @@
#include "string_conv.h" #include <fnd/StringConv.h>
#include <vector> #include <vector>
#include <string> #include <string>

2
lib/fnd/io.cpp → lib/libfnd/source/io.cpp
View file

@ -1,4 +1,4 @@
#include "io.h" #include <fnd/io.h>
using namespace fnd; using namespace fnd;

2
lib/nx/AciBinary.h → lib/libnx/include/nx/AciBinary.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/List.h> #include <fnd/List.h>
#include <nx/AciHeader.h> #include <nx/AciHeader.h>
#include <nx/FacBinary.h> #include <nx/FacBinary.h>

2
lib/nx/AciHeader.h → lib/libnx/include/nx/AciHeader.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/types.h> #include <fnd/types.h>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/ISerialiseableBinary.h> #include <fnd/ISerialiseableBinary.h>
namespace nx namespace nx

2
lib/nx/AcidBinary.h → lib/libnx/include/nx/AcidBinary.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <nx/AciBinary.h> #include <nx/AciBinary.h>
#include <crypto/rsa.h> #include <crypto/rsa.h>

2
lib/nx/FacBinary.h → lib/libnx/include/nx/FacBinary.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/List.h> #include <fnd/List.h>
#include <nx/FacHeader.h> #include <nx/FacHeader.h>

2
lib/nx/FacHeader.h → lib/libnx/include/nx/FacHeader.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/List.h> #include <fnd/List.h>
#include <fnd/ISerialiseableBinary.h> #include <fnd/ISerialiseableBinary.h>

0
lib/nx/HandleTableSizeEntry.h → lib/libnx/include/nx/HandleTableSizeEntry.h
View file

0
lib/nx/HandleTableSizeHandler.h → lib/libnx/include/nx/HandleTableSizeHandler.h
View file

0
lib/nx/IKernelCapabilityHandler.h → lib/libnx/include/nx/IKernelCapabilityHandler.h
View file

0
lib/nx/InteruptEntry.h → lib/libnx/include/nx/InteruptEntry.h
View file

0
lib/nx/InteruptHandler.h → lib/libnx/include/nx/InteruptHandler.h
View file

2
lib/nx/KcBinary.h → lib/libnx/include/nx/KcBinary.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <vector> #include <vector>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/List.h> #include <fnd/List.h>
#include <fnd/ISerialiseableBinary.h> #include <fnd/ISerialiseableBinary.h>
#include <nx/ThreadInfoHandler.h> #include <nx/ThreadInfoHandler.h>

0
lib/nx/KernelCapability.h → lib/libnx/include/nx/KernelCapability.h
View file

0
lib/nx/KernelVersionEntry.h → lib/libnx/include/nx/KernelVersionEntry.h
View file

0
lib/nx/KernelVersionHandler.h → lib/libnx/include/nx/KernelVersionHandler.h
View file

0
lib/nx/MemoryMappingHandler.h → lib/libnx/include/nx/MemoryMappingHandler.h
View file

0
lib/nx/MemoryPageEntry.h → lib/libnx/include/nx/MemoryPageEntry.h
View file

0
lib/nx/MiscFlagsEntry.h → lib/libnx/include/nx/MiscFlagsEntry.h
View file

0
lib/nx/MiscFlagsHandler.h → lib/libnx/include/nx/MiscFlagsHandler.h
View file

0
lib/nx/MiscParamsEntry.h → lib/libnx/include/nx/MiscParamsEntry.h
View file

0
lib/nx/MiscParamsHandler.h → lib/libnx/include/nx/MiscParamsHandler.h
View file

2
lib/nx/NXCrypto.h → lib/libnx/include/nx/NXCrypto.h
View file

@ -69,6 +69,8 @@ namespace crypto
// aes128-cbc keys // aes128-cbc keys
u8 xci_header_key[16] = { 0x01, 0xc5, 0x8f, 0xe7, 0x2d, 0x13, 0x5a, 0xb2, 0x9a, 0x3f, 0x69, 0x33, 0x95, 0x74, 0xb1 }; u8 xci_header_key[16] = { 0x01, 0xc5, 0x8f, 0xe7, 0x2d, 0x13, 0x5a, 0xb2, 0x9a, 0x3f, 0x69, 0x33, 0x95, 0x74, 0xb1 };
u8 eticket_common_key[16] = { 0x55, 0xA3, 0xF8, 0x72, 0xBD, 0xC8, 0x0C, 0x55, 0x5A, 0x65, 0x43, 0x81, 0x13, 0x9E, 0x15, 0x3B }; // lol this 3ds dev common key u8 eticket_common_key[16] = { 0x55, 0xA3, 0xF8, 0x72, 0xBD, 0xC8, 0x0C, 0x55, 0x5A, 0x65, 0x43, 0x81, 0x13, 0x9E, 0x15, 0x3B }; // lol this 3ds dev common key
u8 wii_sd_key[16] = { 0xAB, 0x01, 0xB9, 0xD8, 0xE1, 0x62, 0x2B, 0x08, 0xAF, 0xBA, 0xD8, 0x4D, 0xBF, 0xC2, 0xA5, 0x5D };
} }
namespace prod namespace prod

2
lib/nx/NcaHeader.h → lib/libnx/include/nx/NcaHeader.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/types.h> #include <fnd/types.h>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/List.h> #include <fnd/List.h>
#include <crypto/aes.h> #include <crypto/aes.h>
#include <crypto/sha.h> #include <crypto/sha.h>

2
lib/nx/NpdmBinary.h → lib/libnx/include/nx/NpdmBinary.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/List.h> #include <fnd/List.h>
#include <nx/NpdmHeader.h> #include <nx/NpdmHeader.h>
#include <nx/AciBinary.h> #include <nx/AciBinary.h>

0
lib/nx/NpdmFile.h → lib/libnx/include/nx/NpdmFile.h
View file

2
lib/nx/NpdmHeader.h → lib/libnx/include/nx/NpdmHeader.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/types.h> #include <fnd/types.h>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/ISerialiseableBinary.h> #include <fnd/ISerialiseableBinary.h>
namespace nx namespace nx

2
lib/nx/PfsHeader.h → lib/libnx/include/nx/PfsHeader.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/types.h> #include <fnd/types.h>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/List.h> #include <fnd/List.h>
#include <fnd/ISerialiseableBinary.h> #include <fnd/ISerialiseableBinary.h>

2
lib/nx/SacBinary.h → lib/libnx/include/nx/SacBinary.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <vector> #include <vector>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/List.h> #include <fnd/List.h>
#include <fnd/ISerialiseableBinary.h> #include <fnd/ISerialiseableBinary.h>
#include <nx/SacEntry.h> #include <nx/SacEntry.h>

2
lib/nx/SacEntry.h → lib/libnx/include/nx/SacEntry.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/types.h> #include <fnd/types.h>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/ISerialiseableBinary.h> #include <fnd/ISerialiseableBinary.h>
namespace nx namespace nx

0
lib/nx/SystemCallEntry.h → lib/libnx/include/nx/SystemCallEntry.h
View file

0
lib/nx/SystemCallHandler.h → lib/libnx/include/nx/SystemCallHandler.h
View file

0
lib/nx/ThreadInfoEntry.h → lib/libnx/include/nx/ThreadInfoEntry.h
View file

0
lib/nx/ThreadInfoHandler.h → lib/libnx/include/nx/ThreadInfoHandler.h
View file

2
lib/nx/XciHeader.h → lib/libnx/include/nx/XciHeader.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <fnd/types.h> #include <fnd/types.h>
#include <fnd/memory_blob.h> #include <fnd/MemoryBlob.h>
#include <fnd/List.h> #include <fnd/List.h>
#include <fnd/ISerialiseableBinary.h> #include <fnd/ISerialiseableBinary.h>

12
lib/fnd/makefile → lib/libnx/makefile
View file

@ -1,12 +1,16 @@
# Sources # Sources
SRC_DIR = . SRC_DIR = source
OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c))) OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c)))
INC_DIR = .. # External dependencies
INCS = $(foreach dir,$(INC_DIR), -I"$(dir)/") DEPENDS = fnd crypto
LIB_DIR = ..
INCS = -I"include" $(foreach dep,$(DEPENDS), -I"$(LIB_DIR)/lib$(dep)/include")
# Compiler Settings # Compiler Settings
CXXFLAGS = -std=c++11 $(INCS) -D__STDC_FORMAT_MACROS -Wall -Wno-unused-but-set-variable -Wno-unused-value CXXFLAGS = -std=c++11 $(INCS) -D__STDC_FORMAT_MACROS -Wall -Wno-unused-but-set-variable -Wno-unused-value
CFLAGS = -std=c11 $(INCS) -Wall -Wno-unused-but-set-variable -Wno-unused-value
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
# Windows Only Flags/Libs # Windows Only Flags/Libs
CC = x86_64-w64-mingw32-gcc CC = x86_64-w64-mingw32-gcc
@ -20,7 +24,7 @@ else
endif endif
# Output # Output
OUTPUT = ../lib$(shell basename $(CURDIR)).a OUTPUT = $(shell basename $(CURDIR)).a
main: build main: build

146
lib/nx/nx.vcxproj → lib/libnx/nx.vcxproj
View file

@ -19,70 +19,73 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="AciBinary.h" /> <ClInclude Include="include\nx\AciBinary.h" />
<ClInclude Include="AcidBinary.h" /> <ClInclude Include="include\nx\AcidBinary.h" />
<ClInclude Include="AciHeader.h" /> <ClInclude Include="include\nx\AciHeader.h" />
<ClInclude Include="FacBinary.h" /> <ClInclude Include="include\nx\FacBinary.h" />
<ClInclude Include="FacHeader.h" /> <ClInclude Include="include\nx\FacHeader.h" />
<ClInclude Include="HandleTableSizeEntry.h" /> <ClInclude Include="include\nx\HandleTableSizeEntry.h" />
<ClInclude Include="HandleTableSizeHandler.h" /> <ClInclude Include="include\nx\HandleTableSizeHandler.h" />
<ClInclude Include="IKernelCapabilityHandler.h" /> <ClInclude Include="include\nx\IKernelCapabilityHandler.h" />
<ClInclude Include="InteruptEntry.h" /> <ClInclude Include="include\nx\InteruptEntry.h" />
<ClInclude Include="InteruptHandler.h" /> <ClInclude Include="include\nx\InteruptHandler.h" />
<ClInclude Include="KcBinary.h" /> <ClInclude Include="include\nx\KcBinary.h" />
<ClInclude Include="KernelCapability.h" /> <ClInclude Include="include\nx\KernelCapability.h" />
<ClInclude Include="KernelVersionEntry.h" /> <ClInclude Include="include\nx\KernelVersionEntry.h" />
<ClInclude Include="KernelVersionHandler.h" /> <ClInclude Include="include\nx\KernelVersionHandler.h" />
<ClInclude Include="MemoryMappingHandler.h" /> <ClInclude Include="include\nx\MemoryMappingHandler.h" />
<ClInclude Include="MemoryPageEntry.h" /> <ClInclude Include="include\nx\MemoryPageEntry.h" />
<ClInclude Include="MiscFlagsEntry.h" /> <ClInclude Include="include\nx\MiscFlagsEntry.h" />
<ClInclude Include="MiscFlagsHandler.h" /> <ClInclude Include="include\nx\MiscFlagsHandler.h" />
<ClInclude Include="MiscParamsEntry.h" /> <ClInclude Include="include\nx\MiscParamsEntry.h" />
<ClInclude Include="MiscParamsHandler.h" /> <ClInclude Include="include\nx\MiscParamsHandler.h" />
<ClInclude Include="NpdmBinary.h" /> <ClInclude Include="include\nx\NpdmBinary.h" />
<ClInclude Include="NpdmHeader.h" /> <ClInclude Include="include\nx\NpdmHeader.h" />
<ClInclude Include="NcaHeader.h" /> <ClInclude Include="include\nx\NcaHeader.h" />
<ClInclude Include="NXCrypto.h" /> <ClInclude Include="include\nx\NXCrypto.h" />
<ClInclude Include="PfsHeader.h" /> <ClInclude Include="include\nx\PfsHeader.h" />
<ClInclude Include="SacBinary.h" /> <ClInclude Include="include\nx\SacBinary.h" />
<ClInclude Include="SacEntry.h" /> <ClInclude Include="include\nx\SacEntry.h" />
<ClInclude Include="SystemCallEntry.h" /> <ClInclude Include="include\nx\SystemCallEntry.h" />
<ClInclude Include="SystemCallHandler.h" /> <ClInclude Include="include\nx\SystemCallHandler.h" />
<ClInclude Include="ThreadInfoEntry.h" /> <ClInclude Include="include\nx\ThreadInfoEntry.h" />
<ClInclude Include="ThreadInfoHandler.h" /> <ClInclude Include="include\nx\ThreadInfoHandler.h" />
<ClInclude Include="XciHeader.h" /> <ClInclude Include="include\nx\XciHeader.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="AciBinary.cpp" /> <ClCompile Include="source\AciBinary.cpp" />
<ClCompile Include="AcidBinary.cpp" /> <ClCompile Include="source\AcidBinary.cpp" />
<ClCompile Include="AciHeader.cpp" /> <ClCompile Include="source\AciHeader.cpp" />
<ClCompile Include="FacBinary.cpp" /> <ClCompile Include="source\FacBinary.cpp" />
<ClCompile Include="FacHeader.cpp" /> <ClCompile Include="source\FacHeader.cpp" />
<ClCompile Include="HandleTableSizeEntry.cpp" /> <ClCompile Include="source\HandleTableSizeEntry.cpp" />
<ClCompile Include="HandleTableSizeHandler.cpp" /> <ClCompile Include="source\HandleTableSizeHandler.cpp" />
<ClCompile Include="InteruptEntry.cpp" /> <ClCompile Include="source\InteruptEntry.cpp" />
<ClCompile Include="InteruptHandler.cpp" /> <ClCompile Include="source\InteruptHandler.cpp" />
<ClCompile Include="KcBinary.cpp" /> <ClCompile Include="source\KcBinary.cpp" />
<ClCompile Include="KernelCapability.cpp" /> <ClCompile Include="source\KernelCapability.cpp" />
<ClCompile Include="KernelVersionEntry.cpp" /> <ClCompile Include="source\KernelVersionEntry.cpp" />
<ClCompile Include="KernelVersionHandler.cpp" /> <ClCompile Include="source\KernelVersionHandler.cpp" />
<ClCompile Include="MemoryMappingHandler.cpp" /> <ClCompile Include="source\MemoryMappingHandler.cpp" />
<ClCompile Include="MemoryPageEntry.cpp" /> <ClCompile Include="source\MemoryPageEntry.cpp" />
<ClCompile Include="MiscFlagsEntry.cpp" /> <ClCompile Include="source\MiscFlagsEntry.cpp" />
<ClCompile Include="MiscFlagsHandler.cpp" /> <ClCompile Include="source\MiscFlagsHandler.cpp" />
<ClCompile Include="MiscParamsEntry.cpp" /> <ClCompile Include="source\MiscParamsEntry.cpp" />
<ClCompile Include="MiscParamsHandler.cpp" /> <ClCompile Include="source\MiscParamsHandler.cpp" />
<ClCompile Include="NpdmBinary.cpp" /> <ClCompile Include="source\NpdmBinary.cpp" />
<ClCompile Include="NpdmHeader.cpp" /> <ClCompile Include="source\NpdmHeader.cpp" />
<ClCompile Include="NcaHeader.cpp" /> <ClCompile Include="source\NcaHeader.cpp" />
<ClCompile Include="PfsHeader.cpp" /> <ClCompile Include="source\PfsHeader.cpp" />
<ClCompile Include="SacBinary.cpp" /> <ClCompile Include="source\SacBinary.cpp" />
<ClCompile Include="SacEntry.cpp" /> <ClCompile Include="source\SacEntry.cpp" />
<ClCompile Include="SystemCallEntry.cpp" /> <ClCompile Include="source\SystemCallEntry.cpp" />
<ClCompile Include="SystemCallHandler.cpp" /> <ClCompile Include="source\SystemCallHandler.cpp" />
<ClCompile Include="ThreadInfoEntry.cpp" /> <ClCompile Include="source\ThreadInfoEntry.cpp" />
<ClCompile Include="ThreadInfoHandler.cpp" /> <ClCompile Include="source\ThreadInfoHandler.cpp" />
<ClCompile Include="XciHeader.cpp" /> <ClCompile Include="source\XciHeader.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="makefile" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion> <VCProjectVersion>15.0</VCProjectVersion>
@ -93,26 +96,26 @@
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
@ -142,7 +145,8 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -150,7 +154,8 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -160,7 +165,8 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -174,6 +180,8 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>

124
lib/nx/nx.vcxproj.filters → lib/libnx/nx.vcxproj.filters
View file

@ -15,192 +15,192 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="NXCrypto.h"> <ClInclude Include="include\nx\AciBinary.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="NcaHeader.h"> <ClInclude Include="include\nx\AcidBinary.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="AciHeader.h"> <ClInclude Include="include\nx\AciHeader.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="SacEntry.h"> <ClInclude Include="include\nx\FacBinary.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="FacHeader.h"> <ClInclude Include="include\nx\FacHeader.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="SacBinary.h"> <ClInclude Include="include\nx\HandleTableSizeEntry.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="NpdmHeader.h"> <ClInclude Include="include\nx\HandleTableSizeHandler.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="KernelCapability.h"> <ClInclude Include="include\nx\IKernelCapabilityHandler.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="ThreadInfoEntry.h"> <ClInclude Include="include\nx\InteruptEntry.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="MiscParamsEntry.h"> <ClInclude Include="include\nx\InteruptHandler.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="MiscFlagsEntry.h"> <ClInclude Include="include\nx\KcBinary.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="HandleTableSizeEntry.h"> <ClInclude Include="include\nx\KernelCapability.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="IKernelCapabilityHandler.h"> <ClInclude Include="include\nx\KernelVersionEntry.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="KernelVersionEntry.h"> <ClInclude Include="include\nx\KernelVersionHandler.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="MemoryPageEntry.h"> <ClInclude Include="include\nx\MemoryMappingHandler.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="SystemCallEntry.h"> <ClInclude Include="include\nx\MemoryPageEntry.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="InteruptEntry.h"> <ClInclude Include="include\nx\MiscFlagsEntry.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="KernelVersionHandler.h"> <ClInclude Include="include\nx\MiscFlagsHandler.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="HandleTableSizeHandler.h"> <ClInclude Include="include\nx\MiscParamsEntry.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="MiscParamsHandler.h"> <ClInclude Include="include\nx\MiscParamsHandler.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="MiscFlagsHandler.h"> <ClInclude Include="include\nx\NpdmBinary.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="ThreadInfoHandler.h"> <ClInclude Include="include\nx\NpdmHeader.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="InteruptHandler.h"> <ClInclude Include="include\nx\NcaHeader.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="SystemCallHandler.h"> <ClInclude Include="include\nx\NXCrypto.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="MemoryMappingHandler.h"> <ClInclude Include="include\nx\PfsHeader.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="AciBinary.h"> <ClInclude Include="include\nx\SacBinary.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="KcBinary.h"> <ClInclude Include="include\nx\SacEntry.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="AcidBinary.h"> <ClInclude Include="include\nx\SystemCallEntry.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="FacBinary.h"> <ClInclude Include="include\nx\SystemCallHandler.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="NpdmBinary.h"> <ClInclude Include="include\nx\ThreadInfoEntry.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="PfsHeader.h"> <ClInclude Include="include\nx\ThreadInfoHandler.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="XciHeader.h"> <ClInclude Include="include\nx\XciHeader.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="NcaHeader.cpp"> <ClCompile Include="source\AciBinary.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="AciHeader.cpp"> <ClCompile Include="source\AcidBinary.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="SacEntry.cpp"> <ClCompile Include="source\AciHeader.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="FacHeader.cpp"> <ClCompile Include="source\FacBinary.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="SacBinary.cpp"> <ClCompile Include="source\FacHeader.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="NpdmHeader.cpp"> <ClCompile Include="source\HandleTableSizeEntry.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="KernelCapability.cpp"> <ClCompile Include="source\HandleTableSizeHandler.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="ThreadInfoEntry.cpp"> <ClCompile Include="source\InteruptEntry.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="MiscParamsEntry.cpp"> <ClCompile Include="source\InteruptHandler.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="MiscFlagsEntry.cpp"> <ClCompile Include="source\KcBinary.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="HandleTableSizeEntry.cpp"> <ClCompile Include="source\KernelCapability.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="KernelVersionEntry.cpp"> <ClCompile Include="source\KernelVersionEntry.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="MemoryPageEntry.cpp"> <ClCompile Include="source\KernelVersionHandler.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="SystemCallEntry.cpp"> <ClCompile Include="source\MemoryMappingHandler.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="InteruptEntry.cpp"> <ClCompile Include="source\MemoryPageEntry.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="KernelVersionHandler.cpp"> <ClCompile Include="source\MiscFlagsEntry.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="HandleTableSizeHandler.cpp"> <ClCompile Include="source\MiscFlagsHandler.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="MiscParamsHandler.cpp"> <ClCompile Include="source\MiscParamsEntry.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="MiscFlagsHandler.cpp"> <ClCompile Include="source\MiscParamsHandler.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="ThreadInfoHandler.cpp"> <ClCompile Include="source\NpdmBinary.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="InteruptHandler.cpp"> <ClCompile Include="source\NpdmHeader.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="SystemCallHandler.cpp"> <ClCompile Include="source\NcaHeader.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="MemoryMappingHandler.cpp"> <ClCompile Include="source\PfsHeader.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="AciBinary.cpp"> <ClCompile Include="source\SacBinary.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="KcBinary.cpp"> <ClCompile Include="source\SacEntry.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="AcidBinary.cpp"> <ClCompile Include="source\SystemCallEntry.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="FacBinary.cpp"> <ClCompile Include="source\SystemCallHandler.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="NpdmBinary.cpp"> <ClCompile Include="source\ThreadInfoEntry.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="PfsHeader.cpp"> <ClCompile Include="source\ThreadInfoHandler.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="XciHeader.cpp"> <ClCompile Include="source\XciHeader.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

2
lib/nx/AciBinary.cpp → lib/libnx/source/AciBinary.cpp
View file

@ -1,4 +1,4 @@
#include "AciBinary.h" #include <nx/AciBinary.h>

2
lib/nx/AciHeader.cpp → lib/libnx/source/AciHeader.cpp
View file

@ -1,4 +1,4 @@
#include "AciHeader.h" #include <nx/AciHeader.h>
using namespace nx; using namespace nx;

2
lib/nx/AcidBinary.cpp → lib/libnx/source/AcidBinary.cpp
View file

@ -1,4 +1,4 @@
#include "AcidBinary.h" #include <nx/AcidBinary.h>

2
lib/nx/FacBinary.cpp → lib/libnx/source/FacBinary.cpp
View file

@ -1,4 +1,4 @@
#include "FacBinary.h" #include <nx/FacBinary.h>

2
lib/nx/FacHeader.cpp → lib/libnx/source/FacHeader.cpp
View file

@ -1,4 +1,4 @@
#include "FacHeader.h" #include <nx/FacHeader.h>

2
lib/nx/HandleTableSizeEntry.cpp → lib/libnx/source/HandleTableSizeEntry.cpp
View file

@ -1,4 +1,4 @@
#include "HandleTableSizeEntry.h" #include <nx/HandleTableSizeEntry.h>

2
lib/nx/HandleTableSizeHandler.cpp → lib/libnx/source/HandleTableSizeHandler.cpp
View file

@ -1,4 +1,4 @@
#include "HandleTableSizeHandler.h" #include <nx/HandleTableSizeHandler.h>

2
lib/nx/InteruptEntry.cpp → lib/libnx/source/InteruptEntry.cpp
View file

@ -1,4 +1,4 @@
#include "InteruptEntry.h" #include <nx/InteruptEntry.h>

2
lib/nx/InteruptHandler.cpp → lib/libnx/source/InteruptHandler.cpp
View file

@ -1,4 +1,4 @@
#include "InteruptHandler.h" #include <nx/InteruptHandler.h>

2
lib/nx/KcBinary.cpp → lib/libnx/source/KcBinary.cpp
View file

@ -1,4 +1,4 @@
#include "KcBinary.h" #include <nx/KcBinary.h>

2
lib/nx/KernelCapability.cpp → lib/libnx/source/KernelCapability.cpp
View file

@ -1,4 +1,4 @@
#include "KernelCapability.h" #include <nx/KernelCapability.h>
using namespace nx; using namespace nx;

Some files were not shown because too many files have changed in this diff Show more