Use val field of getopt option struct

Signed-off-by: Aiden Isik <aidenisik+srht@member.fsf.org>

.gitignore

@@ -0,0 +1,6 @@
+build
+result
+*~
+*#
+\#*
+*.orig

CMakeLists.txt

@@ -16,61 +16,63 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# This version of CMake is available on Debian bullseye backports. I think that's a reasonably old version that most people should have.
-cmake_minimum_required(VERSION 3.25.1)
+cmake_minimum_required(VERSION 3.24.2)
 project(synthxex)
 
-# Setting sources...
-set(allsources ${CMAKE_SOURCE_DIR}/src/main.c)
+if(MSVC)
+  message(SEND_ERROR "Compiling with MSVC is not supported. Please use GCC or Clang via the -DCMAKE_C_COMPILER flag or CC environment variable. (Example: cmake -DCMAKE_C_COMPILER=\"gcc\" ..).")
+  return()
+endif()
 
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/common/common.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/common/crypto.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/common/datastorage.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/common/datastorage.c)
+# Gather all source and header files
+file(GLOB_RECURSE allsources
+  ${CMAKE_SOURCE_DIR}/src/*.c
+  ${CMAKE_SOURCE_DIR}/src/*.h
+  ${CMAKE_SOURCE_DIR}/include/getopt_port/*.c
+  ${CMAKE_SOURCE_DIR}/include/getopt_port/*.h
+  ${CMAKE_SOURCE_DIR}/include/nettle/*.c
+  ${CMAKE_SOURCE_DIR}/include/nettle/*.h
+)
 
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/getdata/getdata.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/getdata/getdata.c)
-
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/pemapper/pemapper.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/pemapper/pemapper.c)
-
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/placer/placer.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/placer/placer.c)
-
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/setdata/optheaders.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/setdata/pagedescriptors.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/setdata/populateheaders.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/setdata/optheaders.c)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/setdata/pagedescriptors.c)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/setdata/populateheaders.c)
-
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/write/headerhash.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/write/writexex.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/write/headerhash.c)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/src/write/writexex.c)
-
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/include/getopt_port/getopt.h)
-list(APPEND allsources ${CMAKE_SOURCE_DIR}/include/getopt_port/getopt.c)
-
-# Setting compilation settings...
+# Setting compilation settings
 add_executable(synthxex ${allsources})
 target_include_directories(synthxex PRIVATE ${CMAKE_SOURCE_DIR}/include)
-target_link_libraries(synthxex PRIVATE libnettle.a) # SynthXEX uses the nettle library for it's cryptography
-target_compile_options(synthxex PRIVATE -Wno-multichar) # Shut up the torrent of warnings from the endian check
 
-# If we're doing a debug build, compile with debugging and git commit hash
-if(NOT ("${CMAKE_BUILD_TYPE}" STREQUAL "Release"))
-	target_compile_options(synthxex PRIVATE -O0 -g -fsanitize=address)
-	target_link_options(synthxex PRIVATE -fsanitize=address)
+# Debug/release build handling
+if(GENERATOR_IS_MULTI_CONFIG)
+  set(SYNTHXEX_BUILD_TYPE "MultiConf") # Multi-config generators handle debug build options themselves, don't apply ours
+else()
+  if(CMAKE_BUILD_TYPE)
+    set(SYNTHXEX_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+  else()
+    set(SYNTHXEX_BUILD_TYPE "Debug")
+  endif()
+endif()
 
-	execute_process(
-			COMMAND git rev-parse --short HEAD
-			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-			OUTPUT_VARIABLE GIT_COMMIT
-			OUTPUT_STRIP_TRAILING_WHITESPACE
-		)
+if(${SYNTHXEX_BUILD_TYPE} MATCHES "Deb")
+  add_compile_definitions(_DEBUG=1)
 
-	add_compile_definitions(GIT_COMMIT="${GIT_COMMIT}")
+  if(NOT MINGW)
+    target_compile_options(synthxex PRIVATE -O0 -g -fsanitize=address -fsanitize=undefined)
+    target_link_options(synthxex PRIVATE -lasan -lubsan -fsanitize=address -fsanitize=undefined)
+  else()
+    target_compile_options(synthxex PRIVATE -O0 -g)
+  endif()
+endif()
+
+# Set the version
+execute_process(
+  COMMAND git describe --tags --dirty
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  OUTPUT_VARIABLE VERSION_STRING
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+# Only use the result from the git command if it's a valid version string
+if(${VERSION_STRING} MATCHES "^v[0-9]+\.[0-9]+\.[0-9]+(-[0-9]+-g[0-9a-f]+(-dirty)?)?$")
+  add_compile_definitions(SYNTHXEX_VERSION="${VERSION_STRING}")
+else()
+  add_compile_definitions(SYNTHXEX_VERSION="v0.0.5") # Only used as a fallback
 endif()
 
 # Setting install target settings...

CONTRIBUTING.md

@@ -0,0 +1,124 @@
+# Contributing to SynthXEX
+
+## Bug reports
+Please direct any bug reports to either the [main repository](https://git.aidenisik.scot/FreeChainXenon/SynthXEX/issues), or the [GitHub mirror](https://github.com/FreeChainXenon/SynthXEX/issues).
+
+## Patches
+To contribute code, first ensure you have read and adhered to the [code style](#code-style) section.
+
+There are two ways to contribute code patches:
+
+- Pull requests, which you can submit either to the [main repository](https://git.aidenisik.scot/FreeChainXenon/SynthXEX/pulls), or the [GitHub mirror](https://github.com/FreeChainXenon/SynthXEX/pulls).
+
+- Patch files, generated by Git, can be sent to \<aidenisik+git@member.fsf.org\>, which I will review and possibly merge.
+
+## Code Style
+
+If you are using [AStyle](https://astyle.sourceforge.net/), the following command will format the code correctly (run from the project root):
+```
+astyle --style=allman --add-braces --break-blocks --indent-labels --indent-switches --unpad-paren --align-pointer=name --pad-oper --indent-preproc-block --add-one-line-braces --squeeze-ws --squeeze-lines=1 --recursive "./src/*.c" "./src/*.h"
+```
+
+The code style used in SynthXEX is the [Allman/BSD style as specified by AStyle](https://astyle.sourceforge.net/astyle.html#_style=allman), with the following extra specifications:
+
+- C++-style comments are used, rather than multiline/C89-style comments, e.g:
+```
+// This is a comment
+// This is another comment
+// This is yet another comment
+```
+
+- All conditional statements utilise curly brackets, even when there is only one line within them, e.g:
+```
+if(condition)
+{
+    printf("Hello!\n");
+}
+```
+
+- It is acceptable to have the curly brackets on the same line as the code if it is short, e.g:
+```
+if(condition) { printf("Hello!\n"); }
+
+if(condition)
+{ printf("Hello!\n"); }
+```
+
+- All brackets immediately succeed/precede the name/keyword they correspond to with no spaces, e.g:
+```
+foo(bar);
+(float)(a + b);
+```
+
+- All code blocks have one empty line between the start/end and any other code, e.g.:
+```
+int a = 1;
+
+if(a == 2)
+{
+    printf("Hi!\n");
+}
+
+int b = 2;
+```
+
+- Labels are always 1 indentation level below the current level, e.g:
+```
+if(1)
+{
+    if(2)
+    {
+        int a = 1;
+    label1:
+        int b = 2;
+    }
+}
+```
+
+- Case statements are always 1 indentation level above their corresponding switch, e.g.:
+```
+switch(val)
+{
+    case 1:
+        printf("1\n");
+        break;
+
+    default:
+        printf("0\n");
+        break;
+}
+```
+
+- Pointer operators are always attached to variables, e.g:
+```
+char *string = NULL;
+int a = 0;
+setA(&a);
+```
+
+- Operators are always padded to be one space away from their operands, e.g:
+```
+int a = 1 + 2;
+```
+
+- Commas in function calls, etc, always have one space after them, e.g:
+```
+myFunc(1, 2);
+```
+
+- Preprocessor macros outside functions are indented, just like regular code, e.g:
+```
+#ifdef MACRO_ONE
+    #define MACRO 1
+#else
+    #define MACRO 0
+#endif
+```
+
+- There should never be more than one blank line between code, e.g:
+```
+int a;
+int b;
+
+int c;
+```

README.md

@@ -10,29 +10,25 @@ SynthXEX is the XEX(2) builder (and thus the last step in building an executable
 
 This was developed by referencing public knowledge on the XEX(2) file format, along with staring at XEX files in a hex editor to decypher aspects which do not seem to be documented anywhere. No Microsoft code was decompiled to develop SynthXEX, and I ask that any contributors do not do so either.
 
-This is in early development and MANY features are missing (most notable imports/exports). No guarantees are made as to the functionality of the program, or it's stability. Functionality may change at any time.
+This is in early development and MANY features are missing (most notable exports). No guarantees are made as to the functionality of the program, or it's stability. Functionality may change at any time.
 
-This *should* support any POSIX-compliant operating system. Windows is not supported at the moment (maybe WSL would work).
+This *should* support any POSIX-compliant operating system, along with Windows.
 
-## Installing
 
-SynthXEX is part of the FreeChainXenon toolchain. It's installer is located [here](https://git.aidenisik.scot/FreeChainXenon/FCX-Installer).
-
-## Building
+## Building (POSIX, standard method)
 
 ### Prerequisites
 
 - A C compiler (GCC/Clang)
-- CMake (>= 3.25.1)
+- CMake (>= 3.24.2)
 - Make
-- GNU Nettle development libraries
 - Git
 
-To install these on Debian: ```sudo apt install gcc cmake make nettle-dev git```
+To install these on Debian: ```sudo apt install gcc cmake make git```
 
 ### Downloading
 
-Run: ```git clone https://git.aidenisik.scot/FreeChainXenon/SynthXEX```
+Clone: ```git clone https://git.aidenisik.scot/FreeChainXenon/SynthXEX```
 
 ### Compiling
 
@@ -46,9 +42,102 @@ Build: ```make```
 
 Install: ```sudo make install```
 
+
+## Building (Guix)
+
+### Prerequisites
+
+- Guix
+- Git
+
+### Compiling
+
+Choose ONE of the options below.
+
+#### Compiling & Installing
+
+Clone: ```git clone https://git.aidenisik.scot/FreeChainXenon/SynthXEX```
+
+Switch to the newly cloned directory: ```cd SynthXEX```
+
+Install: ```guix time-machine -C channels.scm -- package -f synthxex.scm```
+
+#### Compiling Only
+
+Clone: ```git clone https://git.aidenisik.scot/FreeChainXenon/SynthXEX```
+
+Switch to the newly cloned directory: ```cd SynthXEX```
+
+Build: ```guix time-machine -C channels.scm -- build -f synthxex.scm```
+
+#### Compiling & Installing to Config
+
+TODO
+
+
+## Building (Nix)
+
+### Prerequisites
+
+- Nix
+- Git
+
+### Compiling
+
+Choose ONE of the options below.
+
+#### Compiling & Installing
+
+Clone: ```git clone https://git.aidenisik.scot/FreeChainXenon/SynthXEX```
+
+Switch to the newly cloned directory: ```cd SynthXEX```
+
+Run: ```nix profile install .#synthxex```
+
+#### Compiling Only
+
+Clone: ```git clone https://git.aidenisik.scot/FreeChainXenon/SynthXEX```
+
+Switch to the newly cloned directory: ```cd SynthXEX```
+
+Run: ```nix build .#synthxex```
+
+#### Compiling & Installing to Config
+
+Add SynthXEX to your configuration.nix file:
+
+```
+{ config, modulesPath, lib, pkgs, ... }:
+
+let
+  synthxex = builtins.getFlake "git+https://git.aidenisik.scot/FreeChainXenon/SynthXEX";
+  synthxexPkgs = synthxex.packages.${pkgs.hostPlatform.system};
+in {
+  # ...
+  environment.systemPackages = with pkgs; [
+    # ...
+    synthxexPkgs.synthxex
+  ];
+}
+```
+
+
+## Special thanks to:
+- [InvoxiPlayGames](https://github.com/InvoxiPlayGames), for help understanding the XEX format
+- [emoose](https://github.com/emoose), for xex1tool, which was very useful for taking apart XEX files and getting info from them
+- [Free60Project](https://github.com/Free60Project), for documentation on the XEX format, which was useful in the early days
+- [Vali0004](https://github.com/Vali0004), for helping clean up and harden code, along with Nix packaging
+- Several members of the Xbox360Hub Discord server, for a multitude of reasons
+
+
+## Contributing
+
+See [CONTRIBUTING.md](./CONTRIBUTING.md).
+
+
 ## Licensing
 
-### SynthXEX (src/*, CMakeLists.txt)
+### SynthXEX
 
 Copyright (c) 2024-25 Aiden Isik
 
@@ -65,7 +154,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-### getopt_port (include/getopt_port/*)
+### getopt_port
 
 Copyright (c) 2012-2023, Kim Grasman <kim.grasman@gmail.com>
 
@@ -93,7 +182,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-### GNU Nettle (SHA1)
+### GNU Nettle
 
 Copyright (C) 2001, 2013 Niels Möller
 
@@ -121,4 +210,4 @@ General Public License for more details.
 
 You should have received copies of the GNU General Public License and
 the GNU Lesser General Public License along with this program. If
-not, see http://www.gnu.org/licenses/.
+not, see http://www.gnu.org/licenses/.

channels.scm

@@ -0,0 +1,14 @@
+;;; Lock the Guix repository to a specific commit.
+;;; For reproducibility purposes in building SynthXEX.
+
+(list (channel
+       (name 'guix)
+       (url "https://codeberg.org/guix/guix.git")
+       (branch "master")
+       (commit
+        "95f8c22bbe9cf25ce492ef520f94a34f7ec3d160")
+       (introduction
+        (make-channel-introduction
+         "9edb3f66fd807b096b48283debdcddccfea34bad"
+         (openpgp-fingerprint
+          "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA")))))

flake.lock

@@ -0,0 +1,60 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1750032973,
+        "narHash": "sha256-UqiBHZueCKKB8oQrVFooBA0DHh8AUVwhqiLSdhSXyYA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5a0be37d950a180a4853647674c89ec286e538c1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "utils": "utils"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,35 @@
+{
+  inputs = {
+    utils.url = "github:numtide/flake-utils";
+    # to update: nix flake update nixpkgs
+    nixpkgs.url = "github:nixos/nixpkgs";
+  };
+  outputs = { self, utils, nixpkgs }:
+  (utils.lib.eachSystem [ "x86_64-linux" "ppc64" "ppc32" ] (system:
+  let
+    pkgsLut = {
+      x86_64-linux = nixpkgs.legacyPackages.${system}.extend self.overlay;
+      ppc32 = import nixpkgs {
+        crossSystem.config = "powerpc-none-eabi";
+        system = "x86_64-linux";
+        overlays = [ self.overlay ];
+      };
+      ppc64 = import nixpkgs {
+        crossSystem.config = "powerpc64-unknown-linux-gnuabielfv2";
+        system = "x86_64-linux";
+        overlays = [ self.overlay ];
+        config.allowUnsupportedSystem = true;
+      };
+    };
+    pkgs = pkgsLut.${system};
+  in {
+    packages = {
+      inherit (pkgs) synthxex;
+    };
+    devShell = pkgs.synthxex;
+  })) // {
+    overlay = self: super: {
+      synthxex = self.callPackage ./synthxex.nix {};
+    };
+  };
+}

include/nettle/COPYING.LESSERv3

@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

include/nettle/COPYINGv2

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

include/nettle/COPYINGv3

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.

include/nettle/README

@@ -0,0 +1,58 @@
+MODIFIED BY AIDEN ISIK
+
+Changes:
+- Stripped out everything except requirements for SHA1 hashing
+
+-------------------------
+
+What is GNU Nettle? A quote from the introduction in the Nettle Manual:
+
+  Nettle is a cryptographic library that is designed to fit easily in more
+  or less any context: In crypto toolkits for object-oriented languages
+  (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in
+  kernel space. In most contexts, you need more than the basic
+  cryptographic algorithms, you also need some way to keep track of available
+  algorithms, their properties and variants. You often have some algorithm
+  selection process, often dictated by a protocol you want to implement.
+  
+  And as the requirements of applications differ in subtle and not so
+  subtle ways, an API that fits one application well can be a pain to use
+  in a different context. And that is why there are so many different
+  cryptographic libraries around.
+  
+  Nettle tries to avoid this problem by doing one thing, the low-level
+  crypto stuff, and providing a simple but general interface to it.
+  In particular, Nettle doesn't do algorithm selection. It doesn't do
+  memory allocation. It doesn't do any I/O.
+  
+  The idea is that one can build several application and context specific
+  interfaces on top of Nettle, and share the code, test cases, benchmarks,
+  documentation, etc. Examples are the Nettle module for the Pike
+  language, and LSH, which both use an object-oriented abstraction on top
+  of the library.
+
+GNU Nettle is free software; you can redistribute it and/or modify it
+under the terms contained in the files COPYING* (see the manual for
+information on how these licenses apply).
+
+If you have downloaded a Nettle release, build it with the usual
+./configure && make && make check && make install (see the INSTALL
+file for further instructions). Using GNU make is strongly
+recommended. Nettle's support for public key algorithms, such as RSA
+and ECDSA, depends on the GNU GMP library.
+
+You can also get Nettle from git, see
+http://www.lysator.liu.se/~nisse/nettle/ for current instructions. In
+particular, you need to run the ./.bootstrap script after checkout and
+before running ./configure.
+
+Read the manual. Mail me if you have any questions or suggestions.
+
+You may want to subscribe to the nettle-bugs mailing list. See
+<URL: https://lists.lysator.liu.se/mailman3/postorius/lists/nettle-bugs.lists.lysator.liu.se/>.
+
+See CONTRIBUTING.md for information on contibuting patches.
+
+
+Happy hacking,
+/Niels Möller <nisse@lysator.liu.se>

include/nettle/macros.h

@@ -0,0 +1,246 @@
+/* macros.h
+
+   Copyright (C) 2001, 2010 Niels Möller
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef NETTLE_MACROS_H_INCLUDED
+#define NETTLE_MACROS_H_INCLUDED
+
+/* Reads a 64-bit integer, in network, big-endian, byte order */
+#define READ_UINT64(p)				\
+(  (((uint64_t) (p)[0]) << 56)			\
+ | (((uint64_t) (p)[1]) << 48)			\
+ | (((uint64_t) (p)[2]) << 40)			\
+ | (((uint64_t) (p)[3]) << 32)			\
+ | (((uint64_t) (p)[4]) << 24)			\
+ | (((uint64_t) (p)[5]) << 16)			\
+ | (((uint64_t) (p)[6]) << 8)			\
+ |  ((uint64_t) (p)[7]))
+
+#define WRITE_UINT64(p, i)			\
+do {						\
+  (p)[0] = ((i) >> 56) & 0xff;			\
+  (p)[1] = ((i) >> 48) & 0xff;			\
+  (p)[2] = ((i) >> 40) & 0xff;			\
+  (p)[3] = ((i) >> 32) & 0xff;			\
+  (p)[4] = ((i) >> 24) & 0xff;			\
+  (p)[5] = ((i) >> 16) & 0xff;			\
+  (p)[6] = ((i) >> 8) & 0xff;			\
+  (p)[7] = (i) & 0xff;				\
+} while(0)
+
+/* Reads a 32-bit integer, in network, big-endian, byte order */
+#define READ_UINT32(p)				\
+(  (((uint32_t) (p)[0]) << 24)			\
+ | (((uint32_t) (p)[1]) << 16)			\
+ | (((uint32_t) (p)[2]) << 8)			\
+ |  ((uint32_t) (p)[3]))
+
+#define WRITE_UINT32(p, i)			\
+do {						\
+  (p)[0] = ((i) >> 24) & 0xff;			\
+  (p)[1] = ((i) >> 16) & 0xff;			\
+  (p)[2] = ((i) >> 8) & 0xff;			\
+  (p)[3] = (i) & 0xff;				\
+} while(0)
+
+/* Analogous macros, for 24 and 16 bit numbers */
+#define READ_UINT24(p)				\
+(  (((uint32_t) (p)[0]) << 16)			\
+ | (((uint32_t) (p)[1]) << 8)			\
+ |  ((uint32_t) (p)[2]))
+
+#define WRITE_UINT24(p, i)			\
+do {						\
+  (p)[0] = ((i) >> 16) & 0xff;			\
+  (p)[1] = ((i) >> 8) & 0xff;			\
+  (p)[2] = (i) & 0xff;				\
+} while(0)
+
+#define READ_UINT16(p)				\
+(  (((uint32_t) (p)[0]) << 8)			\
+ |  ((uint32_t) (p)[1]))
+
+#define WRITE_UINT16(p, i)			\
+do {						\
+  (p)[0] = ((i) >> 8) & 0xff;			\
+  (p)[1] = (i) & 0xff;				\
+} while(0)
+
+/* And the other, little-endian, byteorder */
+#define LE_READ_UINT64(p)			\
+(  (((uint64_t) (p)[7]) << 56)			\
+ | (((uint64_t) (p)[6]) << 48)			\
+ | (((uint64_t) (p)[5]) << 40)			\
+ | (((uint64_t) (p)[4]) << 32)			\
+ | (((uint64_t) (p)[3]) << 24)			\
+ | (((uint64_t) (p)[2]) << 16)			\
+ | (((uint64_t) (p)[1]) << 8)			\
+ |  ((uint64_t) (p)[0]))
+
+#define LE_WRITE_UINT64(p, i)			\
+do {						\
+  (p)[7] = ((i) >> 56) & 0xff;			\
+  (p)[6] = ((i) >> 48) & 0xff;			\
+  (p)[5] = ((i) >> 40) & 0xff;			\
+  (p)[4] = ((i) >> 32) & 0xff;			\
+  (p)[3] = ((i) >> 24) & 0xff;			\
+  (p)[2] = ((i) >> 16) & 0xff;			\
+  (p)[1] = ((i) >> 8) & 0xff;			\
+  (p)[0] = (i) & 0xff;				\
+} while (0)
+
+#define LE_READ_UINT32(p)			\
+(  (((uint32_t) (p)[3]) << 24)			\
+ | (((uint32_t) (p)[2]) << 16)			\
+ | (((uint32_t) (p)[1]) << 8)			\
+ |  ((uint32_t) (p)[0]))
+
+#define LE_WRITE_UINT32(p, i)			\
+do {						\
+  (p)[3] = ((i) >> 24) & 0xff;			\
+  (p)[2] = ((i) >> 16) & 0xff;			\
+  (p)[1] = ((i) >> 8) & 0xff;			\
+  (p)[0] = (i) & 0xff;				\
+} while(0)
+
+/* Analogous macros, for 16 bit numbers */
+#define LE_READ_UINT16(p)			\
+  (  (((uint32_t) (p)[1]) << 8)			\
+     |  ((uint32_t) (p)[0]))
+
+#define LE_WRITE_UINT16(p, i)			\
+  do {						\
+    (p)[1] = ((i) >> 8) & 0xff;			\
+    (p)[0] = (i) & 0xff;			\
+  } while(0)
+
+/* Macro to make it easier to loop over several blocks. */
+#define FOR_BLOCKS(length, dst, src, blocksize)	\
+  assert( !((length) % (blocksize)));           \
+  for (; (length); ((length) -= (blocksize),	\
+		  (dst) += (blocksize),		\
+		  (src) += (blocksize)) )
+
+/* The masking of the right shift is needed to allow n == 0 (using
+   just 32 - n and 64 - n results in undefined behaviour). Most uses
+   of these macros use a constant and non-zero rotation count. */
+#define ROTL32(n,x) (((x)<<(n)) | ((x)>>((-(n)&31))))
+
+#define ROTL64(n,x) (((x)<<(n)) | ((x)>>((-(n))&63)))
+
+/* Requires that size > 0 */
+#define INCREMENT(size, ctr)			\
+  do {						\
+    unsigned increment_i = (size) - 1;		\
+    if (++(ctr)[increment_i] == 0)		\
+      while (increment_i > 0			\
+	     && ++(ctr)[--increment_i] == 0 )	\
+	;					\
+  } while (0)
+
+
+/* Helper macro for Merkle-Damgård hash functions. Assumes the context
+   structs includes the following fields:
+
+     uint8_t block[...];		// Buffer holding one block
+     unsigned int index;		// Index into block
+*/
+
+/* Currently used by sha512 (and sha384) only. */
+#define MD_INCR(ctx) ((ctx)->count_high += !++(ctx)->count_low)
+
+/* Takes the compression function f as argument. NOTE: also clobbers
+   length and data. */
+#define MD_UPDATE(ctx, length, data, f, incr)				\
+  do {									\
+    if (!length) goto __md_done;					\
+    if ((ctx)->index)							\
+      {									\
+	/* Try to fill partial block */					\
+	unsigned __md_left = sizeof((ctx)->block) - (ctx)->index;	\
+	if ((length) < __md_left)					\
+	  {								\
+	    memcpy((ctx)->block + (ctx)->index, (data), (length));	\
+	    (ctx)->index += (length);					\
+	    goto __md_done; /* Finished */				\
+	  }								\
+	else								\
+	  {								\
+	    memcpy((ctx)->block + (ctx)->index, (data), __md_left);	\
+									\
+	    f((ctx), (ctx)->block);					\
+	    (incr);							\
+									\
+	    (data) += __md_left;					\
+	    (length) -= __md_left;					\
+	  }								\
+      }									\
+    while ((length) >= sizeof((ctx)->block))				\
+      {									\
+	f((ctx), (data));						\
+	(incr);								\
+									\
+	(data) += sizeof((ctx)->block);					\
+	(length) -= sizeof((ctx)->block);				\
+      }									\
+    memcpy ((ctx)->block, (data), (length));				\
+    (ctx)->index = (length);						\
+  __md_done:								\
+    ;									\
+  } while (0)
+
+/* Pads the block to a block boundary with the bit pattern 1 0*,
+   leaving size octets for the length field at the end. If needed,
+   compresses the block and starts a new one. */
+#define MD_PAD(ctx, size, f)						\
+  do {									\
+    unsigned __md_i;							\
+    __md_i = (ctx)->index;						\
+									\
+    /* Set the first char of padding to 0x80. This is safe since there	\
+       is always at least one byte free */				\
+									\
+    assert(__md_i < sizeof((ctx)->block));				\
+    (ctx)->block[__md_i++] = 0x80;					\
+									\
+    if (__md_i > (sizeof((ctx)->block) - (size)))			\
+      { /* No room for length in this block. Process it and		\
+	   pad with another one */					\
+	memset((ctx)->block + __md_i, 0, sizeof((ctx)->block) - __md_i); \
+									\
+	f((ctx), (ctx)->block);						\
+	__md_i = 0;							\
+      }									\
+    memset((ctx)->block + __md_i, 0,					\
+	   sizeof((ctx)->block) - (size) - __md_i);			\
+									\
+  } while (0)
+
+#endif /* NETTLE_MACROS_H_INCLUDED */

include/nettle/nettle-types.h

@@ -0,0 +1,131 @@
+/* nettle-types.h
+
+   Copyright (C) 2005, 2014 Niels Möller
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef NETTLE_TYPES_H
+#define NETTLE_TYPES_H
+
+/* For size_t */
+#include <stddef.h>
+#include <stdint.h>
+
+/* Attributes we want to use in installed header files, and hence
+   can't rely on config.h. */
+#ifdef __GNUC__
+
+#define _NETTLE_ATTRIBUTE_PURE __attribute__((pure))
+#ifndef _NETTLE_ATTRIBUTE_DEPRECATED
+/* Variant without message is supported since gcc-3.1 or so. */
+#define _NETTLE_ATTRIBUTE_DEPRECATED __attribute__((deprecated))
+#endif
+
+#else /* !__GNUC__ */
+
+#define _NETTLE_ATTRIBUTE_PURE
+#define _NETTLE_ATTRIBUTE_DEPRECATED
+
+#endif /* !__GNUC__ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* An aligned 16-byte block. */
+union nettle_block16
+{
+  uint8_t b[16];
+  unsigned long w[16 / sizeof(unsigned long)] _NETTLE_ATTRIBUTE_DEPRECATED;
+  uint64_t u64[2];
+};
+
+union nettle_block8
+{
+  uint8_t b[8];
+  uint64_t u64;
+};
+
+/* Randomness. Used by key generation and dsa signature creation. */
+typedef void nettle_random_func(void *ctx,
+				size_t length, uint8_t *dst);
+
+/* Progress report function, mainly for key generation. */
+typedef void nettle_progress_func(void *ctx, int c);
+
+/* Realloc function, used by struct nettle_buffer. */
+typedef void *nettle_realloc_func(void *ctx, void *p, size_t length);
+
+/* Ciphers */
+typedef void nettle_set_key_func(void *ctx, const uint8_t *key);
+
+/* For block ciphers, const context. */
+typedef void nettle_cipher_func(const void *ctx,
+				size_t length, uint8_t *dst,
+				const uint8_t *src);
+
+
+/* Uses a void * for cipher contexts. Used for crypt operations where
+   the internal state changes during the encryption. */
+typedef void nettle_crypt_func(void *ctx,
+			       size_t length, uint8_t *dst,
+			       const uint8_t *src);
+
+/* Hash algorithms */
+typedef void nettle_hash_init_func(void *ctx);
+typedef void nettle_hash_update_func(void *ctx,
+				     size_t length,
+				     const uint8_t *src);
+typedef void nettle_hash_digest_func(void *ctx,
+				     size_t length, uint8_t *dst);
+
+/* ASCII armor codecs. NOTE: Experimental and subject to change. */
+
+typedef size_t nettle_armor_length_func(size_t length);
+typedef void nettle_armor_init_func(void *ctx);
+
+typedef size_t nettle_armor_encode_update_func(void *ctx,
+					       char *dst,
+					       size_t src_length,
+					       const uint8_t *src);
+
+typedef size_t nettle_armor_encode_final_func(void *ctx, char *dst);
+
+typedef int nettle_armor_decode_update_func(void *ctx,
+					    size_t *dst_length,
+					    uint8_t *dst,
+					    size_t src_length,
+					    const char *src);
+
+typedef int nettle_armor_decode_final_func(void *ctx);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NETTLE_TYPES_H */

include/nettle/nettle-write.h

@@ -0,0 +1,57 @@
+/* nettle-write.h
+
+   Internal functions to write out word-sized data to byte arrays.
+
+   Copyright (C) 2010 Niels Möller
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef NETTLE_WRITE_H_INCLUDED
+#define NETTLE_WRITE_H_INCLUDED
+
+/* For size_t */
+#include <stddef.h>
+#include <stdint.h>
+
+/* Write the word array at SRC to the byte array at DST, using little
+   endian (le) or big endian (be) byte order, and truncating the
+   result to LENGTH bytes. */
+
+/* FIXME: Use a macro shortcut to memcpy for native endianness. */
+void
+_nettle_write_be32(size_t length, uint8_t *dst,
+		   const uint32_t *src);
+void
+_nettle_write_le32(size_t length, uint8_t *dst,
+		   const uint32_t *src);
+
+void
+_nettle_write_le64(size_t length, uint8_t *dst,
+		   const uint64_t *src);
+
+#endif /* NETTLE_WRITE_H_INCLUDED */

include/nettle/sha1-compress.c

@@ -0,0 +1,260 @@
+/* sha1-compress.c
+
+   The compression function of the sha1 hash function.
+
+   Copyright (C) 2001, 2004 Peter Gutmann, Andrew Kuchling, Niels Möller
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+*/
+
+/* Here's the first paragraph of Peter Gutmann's posting,
+ * <30ajo5$oe8@ccu2.auckland.ac.nz>: 
+ *
+ * The following is my SHA (FIPS 180) code updated to allow use of the "fixed"
+ * SHA, thanks to Jim Gillogly and an anonymous contributor for the information on
+ * what's changed in the new version.  The fix is a simple change which involves
+ * adding a single rotate in the initial expansion function.  It is unknown
+ * whether this is an optimal solution to the problem which was discovered in the
+ * SHA or whether it's simply a bandaid which fixes the problem with a minimum of
+ * effort (for example the reengineering of a great many Capstone chips).
+ */
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifndef SHA1_DEBUG
+# define SHA1_DEBUG 0
+#endif
+
+#if SHA1_DEBUG
+# include <stdio.h>
+# define DEBUG(i) \
+  fprintf(stderr, "%2d: %8x %8x %8x %8x %8x\n", i, A, B, C, D ,E)
+#else
+# define DEBUG(i)
+#endif
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "sha1.h"
+
+#include "macros.h"
+
+/* A block, treated as a sequence of 32-bit words. */
+#define SHA1_DATA_LENGTH 16
+
+/* The SHA f()-functions.  The f1 and f3 functions can be optimized to
+   save one boolean operation each - thanks to Rich Schroeppel,
+   rcs@cs.arizona.edu for discovering this */
+
+/* FIXME: Can save a temporary in f3 by using ( (x & y) + (z & (x ^
+   y)) ), and then, in the round, compute one of the terms and add it
+   into the destination word before computing the second term. Credits
+   to George Spelvin for pointing this out. Unfortunately, gcc
+   doesn't seem to be smart enough to take advantage of this. */
+
+/* #define f1(x,y,z) ( ( x & y ) | ( ~x & z ) )            Rounds  0-19 */
+#define f1(x,y,z)   ( z ^ ( x & ( y ^ z ) ) )           /* Rounds  0-19 */
+#define f2(x,y,z)   ( x ^ y ^ z )                       /* Rounds 20-39 */
+/* #define f3(x,y,z) ( ( x & y ) | ( x & z ) | ( y & z ) ) Rounds 40-59 */
+#define f3(x,y,z)   ( ( x & y ) | ( z & ( x | y ) ) )   /* Rounds 40-59 */
+#define f4 f2
+
+/* The SHA Mysterious Constants */
+
+#define K1  0x5A827999L                                 /* Rounds  0-19 */
+#define K2  0x6ED9EBA1L                                 /* Rounds 20-39 */
+#define K3  0x8F1BBCDCL                                 /* Rounds 40-59 */
+#define K4  0xCA62C1D6L                                 /* Rounds 60-79 */
+
+/* The initial expanding function.  The hash function is defined over an
+   80-word expanded input array W, where the first 16 are copies of the input
+   data, and the remaining 64 are defined by
+
+        W[ i ] = W[ i - 16 ] ^ W[ i - 14 ] ^ W[ i - 8 ] ^ W[ i - 3 ]
+
+   This implementation generates these values on the fly in a circular
+   buffer - thanks to Colin Plumb, colin@nyx10.cs.du.edu for this
+   optimization.
+
+   The updated SHA changes the expanding function by adding a rotate of 1
+   bit.  Thanks to Jim Gillogly, jim@rand.org, and an anonymous contributor
+   for this information */
+
+#define expand(W,i) ( W[ i & 15 ] = \
+		      ROTL32( 1, ( W[ i & 15 ] ^ W[ (i - 14) & 15 ] ^ \
+				   W[ (i - 8) & 15 ] ^ W[ (i - 3) & 15 ] ) ) )
+
+
+/* The prototype SHA sub-round.  The fundamental sub-round is:
+
+        a' = e + ROTL32( 5, a ) + f( b, c, d ) + k + data;
+        b' = a;
+        c' = ROTL32( 30, b );
+        d' = c;
+        e' = d;
+
+   but this is implemented by unrolling the loop 5 times and renaming the
+   variables ( e, a, b, c, d ) = ( a', b', c', d', e' ) each iteration.
+   This code is then replicated 20 times for each of the 4 functions, using
+   the next 20 values from the W[] array each time */
+
+#define subRound(a, b, c, d, e, f, k, data) \
+    ( e += ROTL32( 5, a ) + f( b, c, d ) + k + data, b = ROTL32( 30, b ) )
+
+/* For fat builds */
+#if HAVE_NATIVE_sha1_compress
+void
+_nettle_sha1_compress_c(uint32_t *state, const uint8_t *input);
+#define nettle_sha1_compress _nettle_sha1_compress_c
+#endif
+
+/* Perform the SHA transformation.  Note that this code, like MD5, seems to
+   break some optimizing compilers due to the complexity of the expressions
+   and the size of the basic block.  It may be necessary to split it into
+   sections, e.g. based on the four subrounds. */
+
+void
+nettle_sha1_compress(uint32_t *state, const uint8_t *input)
+{
+  uint32_t data[SHA1_DATA_LENGTH];
+  uint32_t A, B, C, D, E;     /* Local vars */
+  int i;
+
+  for (i = 0; i < SHA1_DATA_LENGTH; i++, input+= 4)
+    {
+      data[i] = READ_UINT32(input);
+    }
+
+  /* Set up first buffer and local data buffer */
+  A = state[0];
+  B = state[1];
+  C = state[2];
+  D = state[3];
+  E = state[4];
+
+  DEBUG(-1);
+  /* Heavy mangling, in 4 sub-rounds of 20 interations each. */
+  subRound( A, B, C, D, E, f1, K1, data[ 0] ); DEBUG(0);
+  subRound( E, A, B, C, D, f1, K1, data[ 1] ); DEBUG(1);
+  subRound( D, E, A, B, C, f1, K1, data[ 2] );
+  subRound( C, D, E, A, B, f1, K1, data[ 3] );
+  subRound( B, C, D, E, A, f1, K1, data[ 4] );
+  subRound( A, B, C, D, E, f1, K1, data[ 5] );
+  subRound( E, A, B, C, D, f1, K1, data[ 6] );
+  subRound( D, E, A, B, C, f1, K1, data[ 7] );
+  subRound( C, D, E, A, B, f1, K1, data[ 8] );
+  subRound( B, C, D, E, A, f1, K1, data[ 9] );
+  subRound( A, B, C, D, E, f1, K1, data[10] );
+  subRound( E, A, B, C, D, f1, K1, data[11] );
+  subRound( D, E, A, B, C, f1, K1, data[12] );
+  subRound( C, D, E, A, B, f1, K1, data[13] );
+  subRound( B, C, D, E, A, f1, K1, data[14] );
+  subRound( A, B, C, D, E, f1, K1, data[15] ); DEBUG(15);
+  subRound( E, A, B, C, D, f1, K1, expand( data, 16 ) ); DEBUG(16);
+  subRound( D, E, A, B, C, f1, K1, expand( data, 17 ) ); DEBUG(17);
+  subRound( C, D, E, A, B, f1, K1, expand( data, 18 ) ); DEBUG(18);
+  subRound( B, C, D, E, A, f1, K1, expand( data, 19 ) ); DEBUG(19);
+
+  subRound( A, B, C, D, E, f2, K2, expand( data, 20 ) ); DEBUG(20);
+  subRound( E, A, B, C, D, f2, K2, expand( data, 21 ) ); DEBUG(21);
+  subRound( D, E, A, B, C, f2, K2, expand( data, 22 ) );
+  subRound( C, D, E, A, B, f2, K2, expand( data, 23 ) );
+  subRound( B, C, D, E, A, f2, K2, expand( data, 24 ) );
+  subRound( A, B, C, D, E, f2, K2, expand( data, 25 ) );
+  subRound( E, A, B, C, D, f2, K2, expand( data, 26 ) );
+  subRound( D, E, A, B, C, f2, K2, expand( data, 27 ) );
+  subRound( C, D, E, A, B, f2, K2, expand( data, 28 ) );
+  subRound( B, C, D, E, A, f2, K2, expand( data, 29 ) );
+  subRound( A, B, C, D, E, f2, K2, expand( data, 30 ) );
+  subRound( E, A, B, C, D, f2, K2, expand( data, 31 ) );
+  subRound( D, E, A, B, C, f2, K2, expand( data, 32 ) );
+  subRound( C, D, E, A, B, f2, K2, expand( data, 33 ) );
+  subRound( B, C, D, E, A, f2, K2, expand( data, 34 ) );
+  subRound( A, B, C, D, E, f2, K2, expand( data, 35 ) );
+  subRound( E, A, B, C, D, f2, K2, expand( data, 36 ) );
+  subRound( D, E, A, B, C, f2, K2, expand( data, 37 ) );
+  subRound( C, D, E, A, B, f2, K2, expand( data, 38 ) ); DEBUG(38);
+  subRound( B, C, D, E, A, f2, K2, expand( data, 39 ) ); DEBUG(39);
+
+  subRound( A, B, C, D, E, f3, K3, expand( data, 40 ) ); DEBUG(40);
+  subRound( E, A, B, C, D, f3, K3, expand( data, 41 ) ); DEBUG(41);
+  subRound( D, E, A, B, C, f3, K3, expand( data, 42 ) );
+  subRound( C, D, E, A, B, f3, K3, expand( data, 43 ) );
+  subRound( B, C, D, E, A, f3, K3, expand( data, 44 ) );
+  subRound( A, B, C, D, E, f3, K3, expand( data, 45 ) );
+  subRound( E, A, B, C, D, f3, K3, expand( data, 46 ) );
+  subRound( D, E, A, B, C, f3, K3, expand( data, 47 ) );
+  subRound( C, D, E, A, B, f3, K3, expand( data, 48 ) );
+  subRound( B, C, D, E, A, f3, K3, expand( data, 49 ) );
+  subRound( A, B, C, D, E, f3, K3, expand( data, 50 ) );
+  subRound( E, A, B, C, D, f3, K3, expand( data, 51 ) );
+  subRound( D, E, A, B, C, f3, K3, expand( data, 52 ) );
+  subRound( C, D, E, A, B, f3, K3, expand( data, 53 ) );
+  subRound( B, C, D, E, A, f3, K3, expand( data, 54 ) );
+  subRound( A, B, C, D, E, f3, K3, expand( data, 55 ) );
+  subRound( E, A, B, C, D, f3, K3, expand( data, 56 ) );
+  subRound( D, E, A, B, C, f3, K3, expand( data, 57 ) );
+  subRound( C, D, E, A, B, f3, K3, expand( data, 58 ) ); DEBUG(58);
+  subRound( B, C, D, E, A, f3, K3, expand( data, 59 ) ); DEBUG(59);
+
+  subRound( A, B, C, D, E, f4, K4, expand( data, 60 ) ); DEBUG(60);
+  subRound( E, A, B, C, D, f4, K4, expand( data, 61 ) ); DEBUG(61);
+  subRound( D, E, A, B, C, f4, K4, expand( data, 62 ) );
+  subRound( C, D, E, A, B, f4, K4, expand( data, 63 ) );
+  subRound( B, C, D, E, A, f4, K4, expand( data, 64 ) );
+  subRound( A, B, C, D, E, f4, K4, expand( data, 65 ) );
+  subRound( E, A, B, C, D, f4, K4, expand( data, 66 ) );
+  subRound( D, E, A, B, C, f4, K4, expand( data, 67 ) );
+  subRound( C, D, E, A, B, f4, K4, expand( data, 68 ) );
+  subRound( B, C, D, E, A, f4, K4, expand( data, 69 ) );
+  subRound( A, B, C, D, E, f4, K4, expand( data, 70 ) );
+  subRound( E, A, B, C, D, f4, K4, expand( data, 71 ) );
+  subRound( D, E, A, B, C, f4, K4, expand( data, 72 ) );
+  subRound( C, D, E, A, B, f4, K4, expand( data, 73 ) );
+  subRound( B, C, D, E, A, f4, K4, expand( data, 74 ) );
+  subRound( A, B, C, D, E, f4, K4, expand( data, 75 ) );
+  subRound( E, A, B, C, D, f4, K4, expand( data, 76 ) );
+  subRound( D, E, A, B, C, f4, K4, expand( data, 77 ) );
+  subRound( C, D, E, A, B, f4, K4, expand( data, 78 ) ); DEBUG(78);
+  subRound( B, C, D, E, A, f4, K4, expand( data, 79 ) ); DEBUG(79);
+
+  /* Build message digest */
+  state[0] += A;
+  state[1] += B;
+  state[2] += C;
+  state[3] += D;
+  state[4] += E;
+
+#if SHA1_DEBUG
+  fprintf(stderr, "99: %8x %8x %8x %8x %8x\n",
+	  state[0], state[1], state[2], state[3], state[4]);
+#endif
+}

include/nettle/sha1.c

@@ -0,0 +1,100 @@
+/* sha1.c
+
+   The sha1 hash function.
+   Defined by http://www.itl.nist.gov/fipspubs/fip180-1.htm.
+
+   Copyright (C) 2001, 2013 Niels Möller
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+*/
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "sha1.h"
+
+#include "macros.h"
+#include "nettle-write.h"
+
+/* Initialize the SHA values */
+void
+sha1_init(struct sha1_ctx *ctx)
+{
+  /* FIXME: Put the buffer last in the struct, and arrange so that we
+     can initialize with a single memcpy. */
+  static const uint32_t iv[_SHA1_DIGEST_LENGTH] = 
+    {
+      /* SHA initial values, first 4 identical to md5's. */
+      0x67452301L,
+      0xEFCDAB89L,
+      0x98BADCFEL,
+      0x10325476L,
+      0xC3D2E1F0L,
+    };
+
+  memcpy(ctx->state, iv, sizeof(ctx->state));
+  ctx->count = 0;
+  
+  /* Initialize buffer */
+  ctx->index = 0;
+}
+
+#define COMPRESS(ctx, data) (nettle_sha1_compress((ctx)->state, data))
+
+void
+sha1_update(struct sha1_ctx *ctx,
+	    size_t length, const uint8_t *data)
+{
+  MD_UPDATE (ctx, length, data, COMPRESS, ctx->count++);
+}
+	  
+void
+sha1_digest(struct sha1_ctx *ctx,
+	    size_t length,
+	    uint8_t *digest)
+{
+  uint64_t bit_count;
+
+  assert(length <= SHA1_DIGEST_SIZE);
+
+  MD_PAD(ctx, 8, COMPRESS);
+
+  /* There are 512 = 2^9 bits in one block */
+  bit_count = (ctx->count << 9) | (ctx->index << 3);
+
+  /* append the 64 bit count */
+  WRITE_UINT64(ctx->block + (SHA1_BLOCK_SIZE - 8), bit_count);
+  nettle_sha1_compress(ctx->state, ctx->block);
+
+  _nettle_write_be32(length, digest, ctx->state);
+  sha1_init(ctx);
+}

include/nettle/sha1.h

@@ -0,0 +1,92 @@
+/* sha1.h
+
+   The sha1 hash function.
+
+   Copyright (C) 2001, 2012 Niels Möller
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+*/
+ 
+#ifndef NETTLE_SHA1_H_INCLUDED
+#define NETTLE_SHA1_H_INCLUDED
+
+#include "nettle-types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Name mangling */
+#define sha1_init nettle_sha1_init
+#define sha1_update nettle_sha1_update
+#define sha1_digest nettle_sha1_digest
+#define sha1_compress nettle_sha1_compress
+
+/* SHA1 */
+
+#define SHA1_DIGEST_SIZE 20
+#define SHA1_BLOCK_SIZE 64
+/* For backwards compatibility */
+#define SHA1_DATA_SIZE SHA1_BLOCK_SIZE
+
+/* Digest is kept internally as 5 32-bit words. */
+#define _SHA1_DIGEST_LENGTH 5
+
+struct sha1_ctx
+{
+  uint32_t state[_SHA1_DIGEST_LENGTH];    /* State variables */
+  uint64_t count;                         /* 64-bit block count */
+  unsigned int index;                     /* index into buffer */
+  uint8_t block[SHA1_BLOCK_SIZE];         /* SHA1 data buffer */
+};
+
+void
+sha1_init(struct sha1_ctx *ctx);
+
+void
+sha1_update(struct sha1_ctx *ctx,
+	    size_t length,
+	    const uint8_t *data);
+
+void
+sha1_digest(struct sha1_ctx *ctx,
+	    size_t length,
+	    uint8_t *digest);
+
+/* SHA1 compression function. STATE points to 5 uint32_t words,
+   and DATA points to 64 bytes of input data, possibly unaligned. */
+void
+sha1_compress(uint32_t *state, const uint8_t *data);
+
+/* Old name, for backwards compatibility. */
+#define _nettle_sha1_compress nettle_sha1_compress
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NETTLE_SHA1_H_INCLUDED */

include/nettle/write-be32.c

@@ -0,0 +1,77 @@
+/* write-be32.c
+
+   Copyright (C) 2001 Niels Möller
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+*/
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include "nettle-write.h"
+
+#include "macros.h"
+
+void
+_nettle_write_be32(size_t length, uint8_t *dst,
+		   const uint32_t *src)
+{
+  size_t i;
+  size_t words;
+  unsigned leftover;
+  
+  words = length / 4;
+  leftover = length % 4;
+
+  for (i = 0; i < words; i++, dst += 4)
+    WRITE_UINT32(dst, src[i]);
+
+  if (leftover)
+    {
+      uint32_t word;
+      unsigned j = leftover;
+      
+      word = src[i];
+      
+      switch (leftover)
+	{
+	default:
+	  abort();
+	case 3:
+	  dst[--j] = (word >> 8) & 0xff;
+	  /* Fall through */
+	case 2:
+	  dst[--j] = (word >> 16) & 0xff;
+	  /* Fall through */
+	case 1:
+	  dst[--j] = (word >> 24) & 0xff;
+	}
+    }
+}

src/common/common.h

@@ -19,24 +19,28 @@
 #pragma once
 
 #include <stdio.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdbool.h>
 
-// Program identifiers
-#define NAME "SynthXEX"
-#define VERSION "v0.0.1"
-#define COPYRIGHT "2024-25"
+// Forbid the use of the free function
+#define freeOnlyUseThisFunctionInTheNullAndFreeFunctionNowhereElse free
+#pragma GCC poison free
 
-#ifdef GIT_COMMIT
-#define VERSION_STRING NAME " " VERSION "-dev-" GIT_COMMIT 
+// Program identifiers (version set in CMakeLists.txt)
+#if defined(DEBUG) || defined(_DEBUG)
+    #define SYNTHXEX_NAME "SynthXEX-Debug"
 #else
-#define VERSION_STRING NAME " " VERSION
+    #define SYNTHXEX_NAME "SynthXEX"
 #endif
 
+#define SYNTHXEX_COPYRIGHT "2024-2025"
+#define SYNTHXEX_VERSION_STRING SYNTHXEX_NAME " " SYNTHXEX_VERSION
+
 // Print constants
-#define PRINT_STEM "SynthXEX>"
+#define SYNTHXEX_PRINT_STEM SYNTHXEX_NAME ">"
 
 // Return values
 #define SUCCESS 0
@@ -45,7 +49,9 @@
 #define ERR_MISSING_SECTION_FLAG -2
 #define ERR_FILE_OPEN -3
 #define ERR_FILE_READ -4
-#define ERR_OUT_OF_MEM -5
-#define ERR_UNSUPPORTED_STRUCTURE -6
-
-void infoPrint(char *str);
+#define ERR_FILE_WRITE -5
+#define ERR_OUT_OF_MEM -6
+#define ERR_UNSUPPORTED_STRUCTURE -7
+#define ERR_INVALID_RVA_OR_OFFSET -8
+#define ERR_INVALID_IMPORT_NAME -9
+#define ERR_DATA_OVERFLOW -10

src/common/datastorage.c

@@ -18,74 +18,260 @@
 
 #include "datastorage.h"
 
-uint32_t getNextAligned(uint32_t offset, uint32_t alignment)
+// Frees memory and sets the pointer to NULL
+// If the pointer is currently NULL, do nothing (avoid double-free)
+// Disable pointer type checking here to make this easier to use
+void nullAndFree(void **ptr)
 {
-  if(offset % alignment) // If offset not aligned
+    if(ptr != NULL)
     {
-      return offset + (alignment - (offset % alignment)); // Align
+        if(*ptr != NULL)
+        {
+            freeOnlyUseThisFunctionInTheNullAndFreeFunctionNowhereElse(*ptr);
+            *ptr = NULL;
+        }
     }
-
-  return offset; // Offset already aligned
 }
 
-// TODO: Combine all of these into a single function
+// These functions together handle freeing all of the main structs.
+// They can also be called individually, and it doesn't matter if you call them twice.
+// Each function checks if the struct going to be accessed is NULL, so it doesn't try
+// to access unallocated data.
+//
+// DO NOT CALL THESE OUTWITH MAIN. Those which take double pointers will replace
+// the pointer given to them with null ONLY in the function they're called in, not it's callers
+// (including main), which WILL result in a double free.
+//
+// Even if it doesn't access data right now, it's still there so it's not forgotten
+// about if it becomes necessary with future additions.
+void freeOffsetsStruct(struct offsets **offsets)
+{
+    if(offsets != NULL)
+    {
+        if(*offsets != NULL)
+        {
+            nullAndFree((void **) & ((*offsets)->optHeaders));
+            nullAndFree((void **)offsets);
+        }
+    }
+}
+
+void freeXexHeaderStruct(struct xexHeader **xexHeader)
+{
+    if(xexHeader != NULL)
+    {
+        if(*xexHeader != NULL)
+        { nullAndFree((void **)xexHeader); }
+    }
+}
+
+void freeSecInfoHeaderStruct(struct secInfoHeader **secInfoHeader)
+{
+    if(secInfoHeader != NULL)
+    {
+        if(*secInfoHeader != NULL)
+        {
+            struct pageDescriptor *descriptors = (*secInfoHeader)->descriptors; // To avoid dereferencing an unaligned pointer
+            nullAndFree((void **)&descriptors);
+            //(*secInfoHeader)->descriptors = descriptors; // Not required in this case as secInfoHeader is freed anyways
+            nullAndFree((void **)secInfoHeader);
+        }
+    }
+}
+
+void freeSectionsStruct(struct sections *sections)
+{
+    nullAndFree((void **) & (sections->section));
+}
+
+void freePeImportInfoStruct(struct peImportInfo *peImportInfo)
+{
+    if(peImportInfo->tables != NULL)
+    {
+        // Free the imports within each table first, then the tables,
+        // otherwise we'll have a memory leak
+        for(uint32_t i = 0; i < peImportInfo->tableCount; i++)
+        {
+            nullAndFree((void **) & (peImportInfo->tables[i].name));
+            nullAndFree((void **) & (peImportInfo->tables[i].imports));
+        }
+
+        nullAndFree((void **) & (peImportInfo->tables));
+    }
+}
+
+void freePeDataStruct(struct peData **peData)
+{
+    if(*peData != NULL)
+    {
+        freeSectionsStruct(&((*peData)->sections));
+        freePeImportInfoStruct(&((*peData)->peImportInfo));
+        nullAndFree((void **)peData);
+    }
+}
+
+void freeOptHeaderEntriesStruct(struct optHeaderEntries **optHeaderEntries)
+{
+    if(*optHeaderEntries != NULL)
+    {
+        nullAndFree((void **) & ((*optHeaderEntries)->optHeaderEntry));
+        nullAndFree((void **)optHeaderEntries);
+    }
+}
+
+void freeImportLibrariesStruct(struct importLibraries *importLibraries)
+{
+    struct importTable *importTables = importLibraries->importTables;
+    char *nameTable = importLibraries->nameTable; // Use these to avoid dereferencing unaligned pointers
+
+    nullAndFree((void **)&nameTable);
+
+    if(importTables != NULL)
+    {
+        for(uint32_t i = 0; i < importLibraries->tableCount; i++)
+        {
+            uint32_t *addresses = importTables[i].addresses; // Avoid dereferencing unaligned pointer
+            nullAndFree((void **)&addresses);
+            importTables[i].addresses = addresses;
+        }
+
+        nullAndFree((void **)&importTables);
+        importLibraries->importTables = importTables;
+    }
+}
+
+void freeOptHeadersStruct(struct optHeaders **optHeaders)
+{
+    if(*optHeaders != NULL)
+    {
+        freeImportLibrariesStruct(&((*optHeaders)->importLibraries));
+        nullAndFree((void **)optHeaders);
+    }
+}
+
+void freeAllMainStructs(struct offsets **offsets, struct xexHeader **xexHeader, struct secInfoHeader **secInfoHeader,
+                        struct peData **peData, struct optHeaderEntries **optHeaderEntries, struct optHeaders **optHeaders)
+{
+    freeOffsetsStruct(offsets);
+    freeXexHeaderStruct(xexHeader);
+    freeSecInfoHeaderStruct(secInfoHeader);
+    freePeDataStruct(peData);
+    freeOptHeaderEntriesStruct(optHeaderEntries);
+    freeOptHeadersStruct(optHeaders);
+}
+
+uint32_t getNextAligned(uint32_t offset, uint32_t alignment)
+{
+    if(offset % alignment) // If offset not aligned
+    {
+        return offset + (alignment - (offset % alignment)); // Align
+    }
+
+    return offset; // Offset already aligned
+}
+
+uint32_t rvaToOffset(uint32_t rva, struct sections *sections)
+{
+    if((sections->count > 0) && (rva >= sections->section[sections->count - 1].rva + sections->section[sections->count - 1].virtualSize))
+    {
+        return 0; // Not found (beyond end of PE)
+    }
+
+    for(int32_t i = sections->count - 1; i >= 0; i--)
+    {
+        if(rva >= sections->section[i].rva)
+        { return (rva - sections->section[i].rva) + sections->section[i].offset; }
+    }
+
+    return 0; // Not found
+}
+
+uint32_t offsetToRVA(uint32_t offset, struct sections *sections)
+{
+    if((sections->count > 0)
+            && (offset >= sections->section[sections->count - 1].offset + sections->section[sections->count - 1].rawSize))
+    {
+        return 0; // Not found (beyond end of PE)
+    }
+
+    for(int32_t i = sections->count - 1; i >= 0; i--)
+    {
+        if(offset >= sections->section[i].offset)
+        { return (offset - sections->section[i].offset) + sections->section[i].rva; }
+    }
+
+    return 0; // Not found
+}
 
 uint32_t get32BitFromPE(FILE *pe)
 {
-  uint8_t store[4];
-  fread(store, sizeof(uint8_t), 4, pe);
-  
-  uint32_t result = 0;
+    uint32_t result;
+    errno = SUCCESS;
 
-  for(int i = 0; i < 4; i++)
+    if(fread(&result, sizeof(uint32_t), 1, pe) != 1)
     {
-      result |= store[i] << i * 8;
+        errno = ERR_FILE_READ;
+        return 0;
     }
 
-  // If system is big endian, swap endianness (PE is LE)
+    // If system is big endian, swap endianness (PE is LE)
 #ifdef BIG_ENDIAN_SYSTEM
-  result = htonl(result);
+    return __builtin_bswap32(result);
+#else
+    return result;
 #endif
-  
-  return result;
 }
 
-uint32_t get16BitFromPE(FILE *pe)
+uint16_t get16BitFromPE(FILE *pe)
 {
-  uint8_t store[2];
-  fread(store, sizeof(uint8_t), 2, pe);
-  
-  uint16_t result = 0;
+    uint16_t result;
+    errno = SUCCESS;
 
-  for(int i = 0; i < 2; i++)
+    if(fread(&result, sizeof(uint16_t), 1, pe) != 1)
     {
-      result |= store[i] << i * 8;
+        errno = ERR_FILE_READ;
+        return 0;
     }
 
-  // If system is big endian, swap endianness (PE is LE)
 #ifdef BIG_ENDIAN_SYSTEM
-  result = htons(result);
+    return __builtin_bswap16(result);
+#else
+    return result;
 #endif
-  
-  return result;
 }
 
 uint32_t get32BitFromXEX(FILE *xex)
 {
-  uint8_t store[4];
-  fread(store, sizeof(uint8_t), 4, xex);
-  
-  uint32_t result = 0;
+    uint32_t result;
+    errno = SUCCESS;
 
-  for(int i = 0; i < 4; i++)
+    if(fread(&result, sizeof(uint32_t), 1, xex) != 1)
     {
-      result |= store[i] << i * 8;
+        errno = ERR_FILE_READ;
+        return 0;
     }
 
-  // If system and file endianness don't match we need to change it
 #ifdef LITTLE_ENDIAN_SYSTEM
-  result = ntohl(result);
+    return __builtin_bswap32(result);
+#else
+    return result;
+#endif
+}
+
+uint16_t get16BitFromXEX(FILE *xex)
+{
+    uint16_t result;
+    errno = SUCCESS;
+
+    if(fread(&result, sizeof(uint16_t), 1, xex) != 1)
+    {
+        errno = ERR_FILE_READ;
+        return 0;
+    }
+
+#ifdef LITTLE_ENDIAN_SYSTEM
+    return __builtin_bswap16(result);
+#else
+    return result;
 #endif
-  
-  return result;
 }

src/common/datastorage.h

@@ -18,14 +18,15 @@
 
 #pragma once
 
-#include <arpa/inet.h> // For endian-swapping
 #include "common.h"
 
 // Endian test
-#if 'AB' == 0b100000101000010
-#define LITTLE_ENDIAN_SYSTEM
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+    #define LITTLE_ENDIAN_SYSTEM
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+    #define BIG_ENDIAN_SYSTEM
 #else
-#define BIG_ENDIAN_SYSTEM
+    #error "System is not big or little endian! SynthXEX does not support this archaic dinosaur, sorry!"
 #endif
 
 // Preprocessor definitions
@@ -35,8 +36,13 @@
 #define XEX_IMG_FLAG_4KIB_PAGES  0x10000000
 #define XEX_IMG_FLAG_REGION_FREE 0x20000000
 
+// PE characteristics flags
+#define PE_CHAR_FLAG_DLL 0x2000
+
 // Module flags
-#define XEX_MOD_FLAG_TITLE 0x00000001
+#define XEX_MOD_FLAG_TITLE   0x00000001
+#define XEX_MOD_FLAG_EXPORTS 0x00000002
+#define XEX_MOD_FLAG_DLL     0x00000008
 
 // Region flags
 #define XEX_REG_FLAG_REGION_FREE 0xFFFFFFFF
@@ -48,7 +54,7 @@
 #define XEX_OPT_ID_TLS_INFO        0x20104
 #define XEX_OPT_ID_SYS_FLAGS       0x30000
 
-// System flags  
+// System flags
 #define XEX_SYS_GAMEPAD_DISCONNECT 0x00000020
 #define XEX_SYS_INSECURE_SOCKETS   0x00000040
 #define XEX_SYS_XAM_HOOKS          0x00001000
@@ -61,6 +67,9 @@
 #define PE_SECTION_FLAG_READ        0x40000000
 #define PE_SECTION_FLAG_WRITE       0x80000000
 
+// PE import ordinal flag
+#define PE_IMPORT_ORDINAL_FLAG 0x80000000
+
 // RWX flags (XEX)
 #define XEX_SECTION_CODE   0x1
 #define XEX_SECTION_RWDATA 0x2
@@ -69,129 +78,202 @@
 // Page RWX flags
 struct sections
 {
-  uint16_t count;
-  struct sectionPerms *sectionPerms;
+    uint16_t count;
+    struct section *section;
 };
 
-struct sectionPerms
+struct section
 {
-  uint8_t permFlag;
-  uint32_t rva;
+    uint8_t permFlag;
+    uint32_t virtualSize;
+    uint32_t rva;
+    uint32_t rawSize;
+    uint32_t offset;
+};
+
+struct peImport
+{
+    uint32_t iatAddr;
+};
+
+struct peImportTable
+{
+    char *name;
+    uint32_t rva;
+    uint32_t importCount;
+    struct peImport *imports;
+};
+
+struct peImportInfo
+{
+    uint32_t idtRVA;
+    uint32_t tableCount;
+    uint32_t totalImportCount;
+    struct peImportTable *tables;
+};
+
+struct peExportInfo
+{
+    uint16_t count;
 };
 
 // Data structs
 struct peData
 {
-  uint32_t size;
-  uint32_t baseAddr;
-  uint32_t entryPoint;
-  uint32_t tlsAddr;
-  uint32_t tlsSize;
-  uint32_t peHeaderOffset;
-  uint16_t numberOfSections;
-  uint32_t sectionTableSize;
-  uint32_t headerSize;
-  uint32_t pageSize;
-  struct sections sections;
+    uint32_t size;
+    uint32_t baseAddr;
+    uint32_t entryPoint;
+    uint32_t tlsAddr;
+    uint32_t tlsSize;
+    uint32_t peHeaderOffset;
+    uint16_t numberOfSections;
+    uint32_t sectionTableSize;
+    uint32_t headerSize;
+    uint32_t pageSize;
+    uint16_t characteristics;
+    struct sections sections;
+    struct peImportInfo peImportInfo;
+    struct peExportInfo peExportInfo;
 };
 
 // Most of these are 8-byte aligned. Basefile is 4KiB aligned.
 // In order of appearance
 struct offsets
 {
-  uint32_t xexHeader;
-  uint32_t optHeaderEntries;
-  uint32_t secInfoHeader;
-  uint32_t *optHeaders;
-  uint32_t basefile;
+    uint32_t xexHeader;
+    uint32_t optHeaderEntries;
+    uint32_t secInfoHeader;
+    uint32_t *optHeaders;
+    uint32_t basefile;
 };
 
 struct __attribute__((packed)) xexHeader
 {
-  char magic[4];
-  uint32_t moduleFlags;
-  uint32_t peOffset;
-  uint32_t reserved;
-  uint32_t secInfoOffset;
-  uint32_t optHeaderCount;
+    char magic[4];
+    uint32_t moduleFlags;
+    uint32_t peOffset;
+    uint32_t reserved;
+    uint32_t secInfoOffset;
+    uint32_t optHeaderCount;
 };
 
 struct __attribute__((packed)) pageDescriptor
 {
-  uint32_t sizeAndInfo; // First 28 bits == size, last 4 == info (RO/RW/X)
-  uint8_t sha1[0x14];
+    uint32_t sizeAndInfo; // First 28 bits == size, last 4 == info (RO/RW/X)
+    uint8_t sha1[0x14];
 };
 
 struct __attribute__((packed)) secInfoHeader
 {
-  uint32_t headerSize;
-  uint32_t peSize;
-  // - IMAGE INFO -
-  uint8_t signature[0x100];
-  uint32_t imageInfoSize;
-  uint32_t imageFlags;
-  uint32_t baseAddr;
-  uint8_t imageSha1[0x14];
-  uint32_t importTableCount;
-  uint8_t importTableSha1[0x14];
-  uint8_t mediaID[0x10];
-  uint8_t aesKey[0x10];
-  uint32_t exportTableAddr;
-  uint8_t headersHash[0x14];
-  uint32_t gameRegion;
-  // - IMAGE INFO -
-  uint32_t mediaTypes;
-  uint32_t pageDescCount;
-  struct pageDescriptor *descriptors;
+    uint32_t headerSize;
+    uint32_t peSize;
+    // - IMAGE INFO -
+    uint8_t signature[0x100];
+    uint32_t imageInfoSize;
+    uint32_t imageFlags;
+    uint32_t baseAddr;
+    uint8_t imageSha1[0x14];
+    uint32_t importTableCount;
+    uint8_t importTableSha1[0x14];
+    uint8_t mediaID[0x10];
+    uint8_t aesKey[0x10];
+    uint32_t exportTableAddr;
+    uint8_t headersHash[0x14];
+    uint32_t gameRegion;
+    // - IMAGE INFO -
+    uint32_t mediaTypes;
+    uint32_t pageDescCount;
+    struct pageDescriptor *descriptors;
 };
 
 struct __attribute__((packed)) basefileFormat
 {
-  uint32_t size;
-  uint16_t encType;
-  uint16_t compType;
-  uint32_t dataSize;
-  uint32_t zeroSize;
+    uint32_t size;
+    uint16_t encType;
+    uint16_t compType;
+    uint32_t dataSize;
+    uint32_t zeroSize;
+};
+
+struct __attribute__((packed)) importTable
+{
+    uint32_t size;
+    uint8_t sha1[0x14];
+    uint32_t unknown; // Unique to each executable imported from, and always the same
+    uint32_t targetVer;
+    uint32_t minimumVer;
+    uint8_t padding;
+    uint8_t tableIndex;
+    uint16_t addressCount;
+    uint32_t *addresses; // IAT entry address followed by branch stub code address for functions, just IAT address for other symbols
 };
 
 struct __attribute__((packed)) importLibraries
 {
-  uint32_t size;
-  uint8_t *data;
+    uint32_t size;
+    uint32_t nameTableSize;
+    uint32_t tableCount;
+    char *nameTable;
+    struct importTable *importTables;
 };
 
 struct __attribute__((packed)) tlsInfo
 {
-  uint32_t slotCount;
-  uint32_t rawDataAddr;
-  uint32_t dataSize;
-  uint32_t rawDataSize;
+    uint32_t slotCount;
+    uint32_t rawDataAddr;
+    uint32_t dataSize;
+    uint32_t rawDataSize;
 };
 
 struct optHeaderEntries
 {
-  uint32_t count;
-  struct optHeaderEntry *optHeaderEntry;
+    uint32_t count;
+    struct optHeaderEntry *optHeaderEntry;
 };
 
 struct __attribute__((packed)) optHeaderEntry
 {
-  uint32_t id;
-  uint32_t dataOrOffset;
+    uint32_t id;
+    uint32_t dataOrOffset;
 };
 
 struct optHeaders
 {
-  struct basefileFormat basefileFormat;
-  struct importLibraries importLibraries;
-  struct tlsInfo tlsInfo;
+    struct basefileFormat basefileFormat;
+    struct importLibraries importLibraries;
+    struct tlsInfo tlsInfo;
 };
 
+// Functions used for easier memory management
+
+// Frees memory and sets the pointer to NULL
+// If the pointer is currently NULL, do nothing (avoid double-free)
+void nullAndFree(void **ptr);
+
+// These functions together handle freeing all of the main structs.
+// They can also be called individually, and it doesn't matter if you call them twice.
+// DO NOT CALL THESE OUTWITH MAIN. Those which take double pointers will replace
+// the pointer given to them with null ONLY in the function they're called in, not it's callers
+// (including main), which WILL result in a double free.
+void freeOffsetsStruct(struct offsets **offsets);
+void freeXexHeaderStruct(struct xexHeader **xexHeader);
+void freeSecInfoHeaderStruct(struct secInfoHeader **secInfoHeader);
+void freeSectionsStruct(struct sections *sections);
+void freePeImportInfoStruct(struct peImportInfo *peImportInfo);
+void freePeDataStruct(struct peData **peData);
+void freeOptHeaderEntriesStruct(struct optHeaderEntries **optHeaderEntries);
+void freeOptHeadersStruct(struct optHeaders **optHeaders);
+void freeAllMainStructs(struct offsets **offsets, struct xexHeader **xexHeader, struct secInfoHeader **secInfoHeader,
+                        struct peData **peData, struct optHeaderEntries **optHeaderEntries, struct optHeaders **optHeaders);
+
 // Functions used for file data manipulation
 
 uint32_t getNextAligned(uint32_t offset, uint32_t alignment);
 
-// TODO: combine these into a single function
+uint32_t rvaToOffset(uint32_t rva, struct sections *sections);
+uint32_t offsetToRVA(uint32_t offset, struct sections *sections);
+
 uint32_t get32BitFromPE(FILE *pe);
-uint32_t get16BitFromPE(FILE *pe);
+uint16_t get16BitFromPE(FILE *pe);
 uint32_t get32BitFromXEX(FILE *xex);
+uint16_t get16BitFromXEX(FILE *xex);

src/getdata/getdata.c

@@ -1,220 +0,0 @@
-// This file is part of SynthXEX, one component of the
-// FreeChainXenon development toolchain
-//
-// Copyright (c) 2024-25 Aiden Isik
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-#include "getdata.h"
-
-// Validate PE. This isn't thorough, but it's enough to catch any non-PE/360 files.
-// I was considering merging this with getHdrData and mapPEToBasefile as we're
-// basically reading the same data twice, but I think it's beneficial to have a
-// dedicated place where we validate the input.
-bool validatePE(FILE *pe, bool skipMachineCheck) // True if valid, else false 
-{
-  // Check if we have at least the size of a DOS header, so we don't overrun the PE
-  fseek(pe, 0, SEEK_END);
-  size_t finalOffset = ftell(pe);
-
-  if(finalOffset < 0x3C + 0x4)
-    {
-      return false;
-    }
-  
-  // Check magic
-  fseek(pe, 0, SEEK_SET);
-  uint16_t magic = get16BitFromPE(pe);
-
-  if(magic != 0x5A4D) // PE magic
-    {
-      return false;
-    }
-
-  // Check if pointer to PE header is valid
-  fseek(pe, 0x3C, SEEK_SET);
-  size_t peHeaderOffset = get32BitFromPE(pe);
-  
-  if(finalOffset < peHeaderOffset)
-    {
-      return false;
-    }
-
-  // Check if the file is big enough to get size of optional header, and therefore size of whole PE header 
-  if(finalOffset < 0x14 + 0x2)
-    {
-      return false;
-    }
-
-  // Check section count
-  fseek(pe, peHeaderOffset + 0x6, SEEK_SET);
-  uint16_t sectionCount = get16BitFromPE(pe);
-  
-  if(sectionCount == 0)
-    {
-      return false;
-    }
-  
-  // Check if the file is large enough to contain the whole PE header
-  fseek(pe, peHeaderOffset + 0x14, SEEK_SET);
-  uint16_t sizeOfOptHdr = get16BitFromPE(pe);
-
-  // 0x18 == size of COFF header, 0x28 == size of one entry in section table
-  if(finalOffset < peHeaderOffset + 0x18 + sizeOfOptHdr + (sectionCount * 0x28))
-    {
-      return false;
-    }
-  
-  // Check machine ID
-  fseek(pe, peHeaderOffset + 0x4, SEEK_SET);
-  uint16_t machineID = get16BitFromPE(pe);
-
-  if(machineID != 0x1F2 && !skipMachineCheck) // 0x1F2 == POWERPCBE
-    {
-      return false;
-    }
-
-  // Check subsystem
-  fseek(pe, peHeaderOffset + 0x5C, SEEK_SET);
-  uint16_t subsystem = get16BitFromPE(pe);
-
-  if(subsystem != 0xE) // 0xE == XBOX
-    {
-      return false;
-    }
-
-  // Check page size/alignment
-  fseek(pe, peHeaderOffset + 0x38, SEEK_SET);
-  uint32_t pageSize = get32BitFromPE(pe);
-
-  if(pageSize != 0x1000 && pageSize != 0x10000) // 4KiB and 64KiB are the only valid sizes
-    {
-      return false;
-    }
-
-  // Check each raw offset + raw size in section table
-  fseek(pe, peHeaderOffset + 0x18 + sizeOfOptHdr + 0x10, SEEK_SET); // 0x10 == raw offset in entry
-
-  for(uint16_t i = 0; i < sectionCount; i++)
-    {
-      // If raw size + raw offset exceeds file size, PE is invalid
-      if(finalOffset < get32BitFromPE(pe) + get32BitFromPE(pe))
-	{
-	  return false;
-	}
-
-      fseek(pe, 0x20, SEEK_CUR); // Next entry
-    }
-  
-  return true; // Checked enough, this is an Xbox 360 PE file
-}
-
-int getSectionRwxFlags(FILE *pe, struct sections *sections)
-{
-  fseek(pe, 0x3C, SEEK_SET);
-  uint32_t peOffset = get32BitFromPE(pe);
-
-  fseek(pe, peOffset + 0x6, SEEK_SET); // 0x6 == section count
-  sections->count = get16BitFromPE(pe);
-  
-  sections->sectionPerms = calloc(sections->count, sizeof(struct sectionPerms)); // free() is called for this in setdata
-  if(sections->sectionPerms == NULL) {return ERR_OUT_OF_MEM;}
-  fseek(pe, peOffset + 0xF8, SEEK_SET); // 0xF8 == beginning of section table
-
-  for(uint16_t i = 0; i < sections->count; i++)
-    {
-      fseek(pe, 0xC, SEEK_CUR); // Seek to RVA of section
-      sections->sectionPerms[i].rva = get32BitFromPE(pe);
-
-      fseek(pe, 0x14, SEEK_CUR); // Now progress to characteristics, where we will check flags
-      uint32_t characteristics = get32BitFromPE(pe);
-
-      if(characteristics & PE_SECTION_FLAG_EXECUTE)
-	{
-	  sections->sectionPerms[i].permFlag = XEX_SECTION_CODE | 0b10000; // | 0b(1)0000 == include size of 1
-	}
-      else if(characteristics & PE_SECTION_FLAG_WRITE || characteristics & PE_SECTION_FLAG_DISCARDABLE)
-	{
-	  sections->sectionPerms[i].permFlag = XEX_SECTION_RWDATA | 0b10000;
-	}
-      else if(characteristics & PE_SECTION_FLAG_READ)
-	{
-	  sections->sectionPerms[i].permFlag = XEX_SECTION_RODATA | 0b10000;
-	}
-      else
-	{
-	  return ERR_MISSING_SECTION_FLAG;
-	}
-
-      // Don't need to progress any more to get to beginning of next entry, as characteristics is last field
-    }
-  
-  return SUCCESS;
-}
-
-int getHdrData(FILE *pe, struct peData *peData, uint8_t flags)
-{
-  // No flags supported at this time (will be used for getting additional info, for e.g. other optional headers)
-  if(flags)
-    {
-      return ERR_UNKNOWN_DATA_REQUEST;
-    }
-  
-  // Get header data required for ANY XEX
-  // PE size
-  fseek(pe, 0, SEEK_SET); // If we don't do this, the size returned is wrong (?)
-  struct stat peStat;
-  fstat(fileno(pe), &peStat);
-  peData->size = peStat.st_size;
-  
-  // Getting PE header offset before we go any further..
-  fseek(pe, 0x3C, SEEK_SET);
-  peData->peHeaderOffset = get32BitFromPE(pe);
-
-  // Number of sections
-  fseek(pe, peData->peHeaderOffset + 0x6, SEEK_SET);
-  peData->numberOfSections = get16BitFromPE(pe);
-
-  // Size of section table
-  peData->sectionTableSize = peData->numberOfSections * 0x28;
-  
-  // Size of header
-  // 0x18 == size of COFF header, get16BitFromPE value == size of optional header
-  fseek(pe, peData->peHeaderOffset + 0x14, SEEK_SET);
-  peData->headerSize = (peData->peHeaderOffset + 1) + 0x18 + get16BitFromPE(pe);
-  
-  // Entry point (RVA)
-  fseek(pe, peData->peHeaderOffset + 0x28, SEEK_SET);
-  peData->entryPoint = get32BitFromPE(pe);
-  
-  // Base address
-  fseek(pe, peData->peHeaderOffset + 0x34, SEEK_SET);
-  peData->baseAddr = get32BitFromPE(pe);
-
-  // Page alignment/size
-  fseek(pe, peData->peHeaderOffset + 0x38, SEEK_SET);
-  peData->pageSize = get32BitFromPE(pe);
-
-  // TLS status (PE TLS is currently UNSUPPORTED, so if we find it, we'll need to abort)
-  fseek(pe, peData->peHeaderOffset + 0xC0, SEEK_SET);
-  peData->tlsAddr = get32BitFromPE(pe);
-  peData->tlsSize = get32BitFromPE(pe);
-  if(peData->tlsAddr != 0 || peData->tlsSize != 0) {return ERR_UNSUPPORTED_STRUCTURE;}
-
-  // Page RWX flags
-  int ret = getSectionRwxFlags(pe, &(peData->sections));
-  if(ret != 0) {return ret;}
-
-  return SUCCESS;
-}

src/getdata/gethdrdata.c

@@ -0,0 +1,280 @@
+// This file is part of SynthXEX, one component of the
+// FreeChainXenon development toolchain
+//
+// Copyright (c) 2024-25 Aiden Isik
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#include "gethdrdata.h"
+
+// Validate PE. This isn't thorough, but it's enough to catch any non-PE/360 files.
+// I was considering merging this with getHdrData and mapPEToBasefile as we're
+// basically reading the same data twice, but I think it's beneficial to have a
+// dedicated place where we validate the input.
+bool validatePE(FILE *pe, bool skipMachineCheck) // True if valid, else false
+{
+    // Check if we have at least the size of a DOS header, so we don't overrun the PE
+    fseek(pe, 0, SEEK_END);
+    size_t finalOffset = ftell(pe);
+
+    if(finalOffset < 0x3C + 0x4)
+    { return false; }
+
+    // Check magic
+    fseek(pe, 0, SEEK_SET);
+    uint16_t magic = get16BitFromPE(pe);
+
+    if(magic != 0x5A4D || errno != SUCCESS) // PE magic
+    { return false; }
+
+    // Check if pointer to PE header is valid
+    fseek(pe, 0x3C, SEEK_SET);
+    size_t peHeaderOffset = get32BitFromPE(pe);
+
+    if(finalOffset < peHeaderOffset || errno != SUCCESS)
+    { return false; }
+
+    // Check if the file is big enough to get size of optional header, and therefore size of whole PE header
+    if(finalOffset < 0x14 + 0x2)
+    { return false; }
+
+    // Check section count
+    fseek(pe, peHeaderOffset + 0x6, SEEK_SET);
+    uint16_t sectionCount = get16BitFromPE(pe);
+
+    if(sectionCount == 0 || errno != SUCCESS)
+    { return false; }
+
+    // Check if the file is large enough to contain the whole PE header
+    fseek(pe, peHeaderOffset + 0x14, SEEK_SET);
+    uint16_t sizeOfOptHdr = get16BitFromPE(pe);
+
+    // 0x18 == size of COFF header, 0x28 == size of one entry in section table
+    if(finalOffset < peHeaderOffset + 0x18 + sizeOfOptHdr + (sectionCount * 0x28) || errno != SUCCESS)
+    { return false; }
+
+    // Check machine ID
+    fseek(pe, peHeaderOffset + 0x4, SEEK_SET);
+
+    // 0x1F2 == POWERPCBE
+    uint16_t machineID = get16BitFromPE(pe);
+
+    if((machineID != 0x1F2 && !skipMachineCheck) || errno != SUCCESS)
+    { return false; }
+
+    // Check subsystem
+    fseek(pe, peHeaderOffset + 0x5C, SEEK_SET);
+
+    uint16_t subsystem = get16BitFromPE(pe);
+
+    if(subsystem != 0xE || errno != SUCCESS) // 0xE == XBOX
+    { return false; }
+
+    // Check page size/alignment
+    fseek(pe, peHeaderOffset + 0x38, SEEK_SET);
+
+    // 4KiB and 64KiB are the only valid sizes
+    uint32_t pageSize = get32BitFromPE(pe);
+
+    if((pageSize != 0x1000 && pageSize != 0x10000) || errno != SUCCESS)
+    { return false; }
+
+    // Check each raw offset + raw size in section table
+    fseek(pe, peHeaderOffset + 0x18 + sizeOfOptHdr + 0x10, SEEK_SET); // 0x10 == raw offset in entry
+
+    for(uint16_t i = 0; i < sectionCount; i++)
+    {
+        // If raw size + raw offset exceeds file size, PE is invalid
+        uint32_t rawSize = get32BitFromPE(pe);
+
+        if(errno != SUCCESS)
+        { return false; }
+
+        uint32_t rawOffset = get32BitFromPE(pe);
+
+        if(errno != SUCCESS)
+        { return false; }
+
+        if(finalOffset < rawSize + rawOffset)
+        { return false; }
+
+        // Next entry
+        fseek(pe, 0x20, SEEK_CUR);
+    }
+
+    return true; // Checked enough, this is an Xbox 360 PE file
+}
+
+int getSectionInfo(FILE *pe, struct sections *sections)
+{
+    fseek(pe, 0x3C, SEEK_SET);
+    uint32_t peOffset = get32BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    fseek(pe, peOffset + 0x6, SEEK_SET); // 0x6 == section count
+    sections->count = get16BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    sections->section = calloc(sections->count, sizeof(struct section)); // free() is called for this in setdata
+
+    if(sections->section == NULL)
+    { return ERR_OUT_OF_MEM; }
+
+    fseek(pe, peOffset + 0xF8, SEEK_SET); // 0xF8 == beginning of section table
+
+    for(uint16_t i = 0; i < sections->count; i++)
+    {
+        fseek(pe, 0x8, SEEK_CUR); // Seek to virtual size of section
+        sections->section[i].virtualSize = get32BitFromPE(pe);
+
+        if(errno != SUCCESS)
+        { return errno; }
+
+        sections->section[i].rva = get32BitFromPE(pe);
+
+        if(errno != SUCCESS)
+        { return errno; }
+
+        sections->section[i].rawSize = get32BitFromPE(pe);
+
+        if(errno != SUCCESS)
+        { return errno; }
+
+        sections->section[i].offset = get32BitFromPE(pe);
+
+        if(errno != SUCCESS)
+        { return errno; }
+
+        fseek(pe, 0xC, SEEK_CUR); // Now progress to characteristics, where we will check flags
+        uint32_t characteristics = get32BitFromPE(pe);
+
+        if(errno != SUCCESS)
+        { return errno; }
+
+        if(characteristics & PE_SECTION_FLAG_EXECUTE)
+        {
+            sections->section[i].permFlag = XEX_SECTION_CODE | 0b10000; // | 0b(1)0000 == include size of 1
+        }
+        else if(characteristics & PE_SECTION_FLAG_WRITE || characteristics & PE_SECTION_FLAG_DISCARDABLE)
+        { sections->section[i].permFlag = XEX_SECTION_RWDATA | 0b10000; }
+        else if(characteristics & PE_SECTION_FLAG_READ)
+        { sections->section[i].permFlag = XEX_SECTION_RODATA | 0b10000; }
+        else
+        { return ERR_MISSING_SECTION_FLAG; }
+    }
+
+    // Don't need to progress any more to get to beginning of next entry, as characteristics is last field
+    return SUCCESS;
+}
+
+int getHdrData(FILE *pe, struct peData *peData, uint8_t flags)
+{
+    // No flags supported at this time (will be used for getting additional info, for e.g. other optional headers)
+    if(flags)
+    { return ERR_UNKNOWN_DATA_REQUEST; }
+
+    // Getting PE header offset before we go any further..
+    fseek(pe, 0x3C, SEEK_SET);
+    peData->peHeaderOffset = get32BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    // Number of sections
+    fseek(pe, peData->peHeaderOffset + 0x6, SEEK_SET);
+    peData->numberOfSections = get16BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    // Size of section table
+    peData->sectionTableSize = peData->numberOfSections * 0x28;
+
+    // Size of header
+    // 0x18 == size of COFF header, get16BitFromPE value == size of optional header
+    fseek(pe, peData->peHeaderOffset + 0x14, SEEK_SET);
+    peData->headerSize = (peData->peHeaderOffset + 1) + 0x18 + get16BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    // PE characteristics
+    fseek(pe, peData->peHeaderOffset + 0x16, SEEK_SET);
+    peData->characteristics = get16BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    // Entry point (RVA)
+    fseek(pe, peData->peHeaderOffset + 0x28, SEEK_SET);
+    peData->entryPoint = get32BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    // Base address
+    fseek(pe, peData->peHeaderOffset + 0x34, SEEK_SET);
+    peData->baseAddr = get32BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    // Page alignment/size
+    fseek(pe, peData->peHeaderOffset + 0x38, SEEK_SET);
+    peData->pageSize = get32BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    // Export tables
+    fseek(pe, peData->peHeaderOffset + 0x78, SEEK_SET);
+    peData->peExportInfo.count = (get32BitFromPE(pe) == 0 ? 0 : 1); // TODO: Actually read the data
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    // Import tables
+    fseek(pe, peData->peHeaderOffset + 0x80, SEEK_SET);
+    peData->peImportInfo.idtRVA = get32BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    // TLS status (PE TLS is currently UNSUPPORTED, so if we find it, we'll need to abort)
+    fseek(pe, peData->peHeaderOffset + 0xC0, SEEK_SET);
+    peData->tlsAddr = get32BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    peData->tlsSize = get32BitFromPE(pe);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    if(peData->tlsAddr != 0 || peData->tlsSize != 0)
+    { return ERR_UNSUPPORTED_STRUCTURE; }
+
+    // Section info
+    int ret = getSectionInfo(pe, &(peData->sections));
+
+    if(ret != 0)
+    { return ret; }
+
+    return SUCCESS;
+}

src/getdata/gethdrdata.h

@@ -1,7 +1,7 @@
 // This file is part of SynthXEX, one component of the
 // FreeChainXenon development toolchain
 //
-// Copyright (c) 2024 Aiden Isik
+// Copyright (c) 2024-25 Aiden Isik
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include <sys/stat.h>
 #include "../common/common.h"
 #include "../common/datastorage.h"
 

src/getdata/getimports.c

@@ -0,0 +1,206 @@
+// This file is part of SynthXEX, one component of the
+// FreeChainXenon development toolchain
+//
+// Copyright (c) 2025 Aiden Isik
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#include "getimports.h"
+
+int getImports(FILE *pe, struct peData *peData)
+{
+    // Make sure the peImportInfo struct is blank, except the IDT RVA
+    memset(&(peData->peImportInfo.tableCount), 0, sizeof(struct peImportInfo) - sizeof(uint32_t));
+
+    // If there is no IDT, just skip handling imports
+    if(peData->peImportInfo.idtRVA == 0)
+    { return SUCCESS; }
+
+    // Seek to the IDT and read the first entry
+    uint32_t idtOffset = rvaToOffset(peData->peImportInfo.idtRVA, &(peData->sections));
+
+    if(idtOffset == 0)
+    { return ERR_INVALID_RVA_OR_OFFSET; }
+
+    if(fseek(pe, idtOffset, SEEK_SET) != 0)
+    { return ERR_FILE_READ; }
+
+    uint32_t *currentIDT = malloc(5 * sizeof(uint32_t));
+
+    if(currentIDT == NULL)
+    { return ERR_OUT_OF_MEM; }
+
+    uint32_t *blankIDT = calloc(5, sizeof(uint32_t)); // Blank IDT for comparisons
+
+    if(blankIDT == NULL)
+    {
+        nullAndFree((void **)&currentIDT);
+        return ERR_OUT_OF_MEM;
+    }
+
+    if(fread(currentIDT, sizeof(uint32_t), 5, pe) < 5)
+    {
+        nullAndFree((void **)&currentIDT);
+        nullAndFree((void **)&blankIDT);
+        return ERR_FILE_READ;
+    }
+
+    // While the IDT is not blank, process it
+    for(uint32_t i = 0; memcmp(currentIDT, blankIDT, 5 * sizeof(uint32_t)) != 0; i++)
+    {
+        // Allocate space for the current table data
+        peData->peImportInfo.tableCount++;
+        peData->peImportInfo.tables = realloc(peData->peImportInfo.tables, (i + 1) * sizeof(struct peImportTable));
+
+        if(peData->peImportInfo.tables == NULL)
+        {
+            nullAndFree((void **)&currentIDT);
+            nullAndFree((void **)&blankIDT);
+            return ERR_OUT_OF_MEM;
+        }
+
+        memset(&(peData->peImportInfo.tables[i]), 0, sizeof(struct peImportTable)); // Make sure it's blank
+
+#ifdef BIG_ENDIAN_SYSTEM
+
+        // Byteswap the IDT fields
+        for(uint8_t j = 0; j < 5; j++)
+        { currentIDT[j] = __builtin_bswap32(currentIDT[j]); }
+
+#endif
+
+        // Retrieve the name pointed to by the table
+        uint32_t savedOffset = ftell(pe);
+        uint32_t tableNameOffset = rvaToOffset(currentIDT[3], &(peData->sections));
+
+        if(tableNameOffset == 0)
+        {
+            nullAndFree((void **)&currentIDT);
+            nullAndFree((void **)&blankIDT);
+            return ERR_INVALID_RVA_OR_OFFSET;
+        }
+
+        if(fseek(pe, tableNameOffset, SEEK_SET) != 0)
+        {
+            nullAndFree((void **)&currentIDT);
+            nullAndFree((void **)&blankIDT);
+            return ERR_FILE_READ;
+        }
+
+        // Allocating is expensive, go 16 bytes at a time to avoid excessive realloc calls
+        for(uint32_t j = 0;; j += 16)
+        {
+            peData->peImportInfo.tables[i].name = realloc(peData->peImportInfo.tables[i].name, (j + 16) * sizeof(char));
+
+            if(peData->peImportInfo.tables[i].name == NULL)
+            {
+                nullAndFree((void **)&currentIDT);
+                nullAndFree((void **)&blankIDT);
+                return ERR_OUT_OF_MEM;
+            }
+
+            if(fread(peData->peImportInfo.tables[i].name + j, sizeof(char), 16, pe) < 16)
+            {
+                nullAndFree((void **)&currentIDT);
+                nullAndFree((void **)&blankIDT);
+                return ERR_FILE_READ;
+            }
+
+            // Check for null terminator
+            for(uint32_t k = j; k < j + 16; k++)
+                if(peData->peImportInfo.tables[i].name[k] == '\0')
+                { goto doneGettingTableName; }
+        }
+
+    doneGettingTableName:
+        // Store the IAT RVA for this table
+        peData->peImportInfo.tables[i].rva = currentIDT[4];
+
+        // Seek to the IAT and read the first entry
+        uint32_t iatOffset = rvaToOffset(currentIDT[4], &(peData->sections));
+
+        if(iatOffset == 0)
+        {
+            nullAndFree((void **)&currentIDT);
+            nullAndFree((void **)&blankIDT);
+            return ERR_INVALID_RVA_OR_OFFSET;
+        }
+
+        if(fseek(pe, iatOffset, SEEK_SET) != 0)
+        {
+            nullAndFree((void **)&currentIDT);
+            nullAndFree((void **)&blankIDT);
+            return ERR_FILE_READ;
+        }
+
+        uint32_t currentImport;
+
+        if(fread(&currentImport, sizeof(uint32_t), 1, pe) < 1)
+        {
+            nullAndFree((void **)&currentIDT);
+            nullAndFree((void **)&blankIDT);
+            return ERR_FILE_READ;
+        }
+
+        // While the import is not blank, process it
+        for(int j = 0; currentImport != 0; j++)
+        {
+#ifdef BIG_ENDIAN_SYSTEM
+            // Byteswap the import
+            currentImport = __builtin_bswap32(currentImport);
+#endif
+            // Allocate space for the current import
+            peData->peImportInfo.tables[i].importCount++;
+            peData->peImportInfo.tables[i].imports = realloc(peData->peImportInfo.tables[i].imports, (j + 1) * sizeof(struct peImport));
+
+            // Store the address of the current import entry in iatAddr
+            uint32_t currentImportRVA = offsetToRVA(ftell(pe) - 4, &(peData->sections));
+
+            if(currentImportRVA == 0)
+            {
+                nullAndFree((void **)&currentIDT);
+                nullAndFree((void **)&blankIDT);
+                return ERR_INVALID_RVA_OR_OFFSET;
+            }
+
+            peData->peImportInfo.tables[i].imports[j].iatAddr = peData->baseAddr + currentImportRVA;
+
+            // Read the next import
+            if(fread(&currentImport, sizeof(uint32_t), 1, pe) < 1)
+            {
+                nullAndFree((void **)&currentIDT);
+                nullAndFree((void **)&blankIDT);
+                return ERR_FILE_READ;
+            }
+        }
+
+        // Add table's import count to total and return to next IDT entry
+        peData->peImportInfo.totalImportCount += peData->peImportInfo.tables[i].importCount;
+
+        if(fseek(pe, savedOffset, SEEK_SET) != 0)
+        {
+            nullAndFree((void **)&currentIDT);
+            nullAndFree((void **)&blankIDT);
+            return ERR_FILE_READ;
+        }
+
+        // Read next IDT
+        if(fread(currentIDT, sizeof(uint32_t), 5, pe) < 5)
+        { return ERR_FILE_READ; }
+    }
+
+    nullAndFree((void **)&currentIDT);
+    nullAndFree((void **)&blankIDT);
+    return SUCCESS;
+}

src/getdata/getimports.h

@@ -0,0 +1,24 @@
+// This file is part of SynthXEX, one component of the
+// FreeChainXenon development toolchain
+//
+// Copyright (c) 2025 Aiden Isik
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#pragma once
+
+#include "../common/common.h"
+#include "../common/datastorage.h"
+
+int getImports(FILE *pe, struct peData *peData);

src/main.c

@@ -16,10 +16,14 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+// TODO: Harden all functions against bad data, unallocated data (check for NULL), etc.
+// Some functions are not robust as I wanted things up and running as quickly as possible.
+
 #include "common/common.h"
 #include "common/datastorage.h"
 #include "pemapper/pemapper.h"
-#include "getdata/getdata.h"
+#include "getdata/gethdrdata.h"
+#include "getdata/getimports.h"
 #include "setdata/populateheaders.h"
 #include "setdata/pagedescriptors.h"
 #include "setdata/optheaders.h"
@@ -32,379 +36,499 @@
 
 void dispLibs()
 {
-  printf("\nLibraries utilised by SynthXEX:\n\n");
+    printf("\nLibraries utilised by SynthXEX:\n\n");
 
-  printf("----- GETOPT_PORT -----\n\n");
-  printf("Copyright (c) 2012-2023, Kim Grasman <kim.grasman@gmail.com>\n");
-  printf("All rights reserved.\n\n");
+    printf("----- GETOPT_PORT -----\n\n");
+    printf("Copyright (c) 2012-2023, Kim Grasman <kim.grasman@gmail.com>\n");
+    printf("All rights reserved.\n\n");
 
-  printf("Redistribution and use in source and binary forms, with or without\n");
-  printf("modification, are permitted provided that the following conditions are met:\n");
-  printf("* Redistributions of source code must retain the above copyright\n");
-  printf("  notice, this list of conditions and the following disclaimer.\n");
-  printf("* Redistributions in binary form must reproduce the above copyright\n");
-  printf("  notice, this list of conditions and the following disclaimer in the\n");
-  printf("  documentation and/or other materials provided with the distribution.\n");
-  printf("* Neither the name of Kim Grasman nor the\n");
-  printf("  names of contributors may be used to endorse or promote products\n");
-  printf("  derived from this software without specific prior written permission.\n\n");
+    printf("Redistribution and use in source and binary forms, with or without\n");
+    printf("modification, are permitted provided that the following conditions are met:\n");
+    printf("* Redistributions of source code must retain the above copyright\n");
+    printf("  notice, this list of conditions and the following disclaimer.\n");
+    printf("* Redistributions in binary form must reproduce the above copyright\n");
+    printf("  notice, this list of conditions and the following disclaimer in the\n");
+    printf("  documentation and/or other materials provided with the distribution.\n");
+    printf("* Neither the name of Kim Grasman nor the\n");
+    printf("  names of contributors may be used to endorse or promote products\n");
+    printf("  derived from this software without specific prior written permission.\n\n");
 
-  printf("THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\n");
-  printf("ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n");
-  printf("WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n");
-  printf("DISCLAIMED. IN NO EVENT SHALL KIM GRASMAN BE LIABLE FOR ANY\n");
-  printf("DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n");
-  printf("(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n");
-  printf("LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n");
-  printf("ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n");
-  printf("(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n");
-  printf("SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\n\n");
+    printf("THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\n");
+    printf("ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n");
+    printf("WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n");
+    printf("DISCLAIMED. IN NO EVENT SHALL KIM GRASMAN BE LIABLE FOR ANY\n");
+    printf("DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n");
+    printf("(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n");
+    printf("LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n");
+    printf("ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n");
+    printf("(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n");
+    printf("SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\n\n");
 
-  printf("----- GNU NETTLE (SHA-1) -----\n\n");
-  printf("Copyright (C) 2001, 2013 Niels Möller\n");
-  printf("This file is part of GNU Nettle.\n\n");
+    printf("----- GNU NETTLE (SHA-1) -----\n\n");
+    printf("Copyright (C) 2001, 2013 Niels Möller\n");
+    printf("This file is part of GNU Nettle.\n\n");
 
-  printf("GNU Nettle is free software: you can redistribute it and/or\n");
-  printf("modify it under the terms of either:\n\n");
-  printf("* the GNU Lesser General Public License as published by the Free\n");
-  printf("  Software Foundation; either version 3 of the License, or (at your\n");
-  printf("  option) any later version.\n\n");
-  printf("or\n\n");
-  printf("* the GNU General Public License as published by the Free\n");
-  printf("  Software Foundation; either version 2 of the License, or (at your\n");
-  printf("  option) any later version.\n\n");
-  printf("or both in parallel, as here.\n\n");
+    printf("GNU Nettle is free software: you can redistribute it and/or\n");
+    printf("modify it under the terms of either:\n\n");
+    printf("* the GNU Lesser General Public License as published by the Free\n");
+    printf("  Software Foundation; either version 3 of the License, or (at your\n");
+    printf("  option) any later version.\n\n");
+    printf("or\n\n");
+    printf("* the GNU General Public License as published by the Free\n");
+    printf("  Software Foundation; either version 2 of the License, or (at your\n");
+    printf("  option) any later version.\n\n");
+    printf("or both in parallel, as here.\n\n");
 
-  printf("GNU Nettle is distributed in the hope that it will be useful,\n");
-  printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
-  printf("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n");
-  printf("General Public License for more details.\n\n");
-  printf("You should have received copies of the GNU General Public License and\n");
-  printf("the GNU Lesser General Public License along with this program. If\n");
-  printf("not, see http://www.gnu.org/licenses/.\n\n");
+    printf("GNU Nettle is distributed in the hope that it will be useful,\n");
+    printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
+    printf("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n");
+    printf("General Public License for more details.\n\n");
+    printf("You should have received copies of the GNU General Public License and\n");
+    printf("the GNU Lesser General Public License along with this program. If\n");
+    printf("not, see http://www.gnu.org/licenses/.\n\n");
 }
 
 void dispVer()
 {
-  printf("\n%s\n\nThe XEX builder of the FreeChainXenon project\n\n", VERSION_STRING);
-  printf("Copyright (c) %s Aiden Isik\n\nThis program is free software: you can redistribute it and/or modify\n", COPYRIGHT);
-  printf("it under the terms of the GNU Affero General Public License as published by\n");
-  printf("the Free Software Foundation, either version 3 of the License, or\n");
-  printf("(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\n");
-  printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n");
-  printf("GNU Affero General Public License for more details.\n\n");
-  printf("You should have received a copy of the GNU Affero General Public License\n");
-  printf("along with this program. If not, see <https://www.gnu.org/licenses/>.\n\n");
+    printf("\n%s\n\nThe XEX builder of the FreeChainXenon project\n\n", SYNTHXEX_VERSION_STRING);
+    printf("Copyright (c) %s Aiden Isik\n\nThis program is free software: you can redistribute it and/or modify\n", SYNTHXEX_COPYRIGHT);
+    printf("it under the terms of the GNU Affero General Public License as published by\n");
+    printf("the Free Software Foundation, either version 3 of the License, or\n");
+    printf("(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\n");
+    printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n");
+    printf("GNU Affero General Public License for more details.\n\n");
+    printf("You should have received a copy of the GNU Affero General Public License\n");
+    printf("along with this program. If not, see <https://www.gnu.org/licenses/>.\n\n");
 }
 
 void dispHelp(char **argv)
 {
-  printf("\nUsage: %s [OPTION] <ARG>\n\n", argv[0]);
-  printf("Options:\n");
-  printf("-h,\t--help,\t\t\tShow this information\n");
-  printf("-v,\t--version,\t\tShow version and licensing information\n");
-  printf("-l,\t--libs,\t\t\tShow licensing information of libraries used\n");
-  printf("-s,\t--skip-machine-check,\tSkip the PE file machine ID check\n");
-  printf("-i,\t--input,\t\tSpecify input PE file path\n");
-  printf("-o,\t--output,\t\tSpecify output XEX file path\n\n");
+    printf("\nUsage: %s [OPTION] <ARG>\n\n", argv[0]);
+    printf("Options:\n");
+    printf("-h,\t--help,\t\t\tShow this information\n");
+    printf("-v,\t--version,\t\tShow version and licensing information\n");
+    printf("-l,\t--libs,\t\t\tShow licensing information of libraries used\n");
+    printf("-s,\t--skip-machine-check,\tSkip the PE file machine ID check\n");
+    printf("-i,\t--input,\t\tSpecify input PE file path\n");
+    printf("-o,\t--output,\t\tSpecify output XEX file path\n");
+    printf("-t,\t--type,\t\t\tOverride automatic executable type detection\n\t\t\t\t(options: title, titledll, sysdll, dll)\n\n");
+}
+
+void handleError(int ret)
+{
+    switch(ret)
+    {
+        case ERR_UNKNOWN_DATA_REQUEST:
+            fprintf(stderr, "%s ERROR: Internal error getting data from PE file. THIS IS A BUG, please report it. Aborting.\n", SYNTHXEX_PRINT_STEM);
+            break;
+
+        case ERR_FILE_READ:
+            fprintf(stderr, "%s ERROR: Failed to read data from PE file. Aborting.\n", SYNTHXEX_PRINT_STEM);
+            break;
+
+        case ERR_FILE_WRITE:
+            fprintf(stderr, "%s ERROR: Failed to write data to file. Aborting.\n", SYNTHXEX_PRINT_STEM);
+            break;
+
+        case ERR_OUT_OF_MEM:
+            fprintf(stderr, "%s ERROR: Out of memory. Aborting.\n", SYNTHXEX_PRINT_STEM);
+            break;
+
+        case ERR_MISSING_SECTION_FLAG:
+            fprintf(stderr, "%s ERROR: R/W/X flag missing from PE section. Aborting.\n", SYNTHXEX_PRINT_STEM);
+            break;
+
+        case ERR_UNSUPPORTED_STRUCTURE:
+            fprintf(stderr, "%s ERROR: Encountered an unsupported data structure in PE. Aborting.\n", SYNTHXEX_PRINT_STEM);
+            break;
+
+        case ERR_INVALID_RVA_OR_OFFSET:
+            fprintf(stderr, "%s ERROR: Invalid RVA or offset found. Aborting.\n", SYNTHXEX_PRINT_STEM);
+            break;
+
+        case ERR_INVALID_IMPORT_NAME:
+            fprintf(stderr, "%s ERROR: Invalid import name found. Aborting.\n", SYNTHXEX_PRINT_STEM);
+            break;
+
+        case ERR_DATA_OVERFLOW:
+            fprintf(stderr, "%s ERROR: Data overflow. Aborting.\n", SYNTHXEX_PRINT_STEM);
+            break;
+
+        default:
+            fprintf(stderr, "%s ERROR: Unknown error: %d. Aborting.\n", SYNTHXEX_PRINT_STEM, ret);
+            break;
+    }
 }
 
 int main(int argc, char **argv)
 {
-  static struct option longOptions[] =
-  {
-    {"help", no_argument, 0, 0},
-    {"version", no_argument, 0, 0},
-    {"libs", no_argument, 0, 0},
-    {"skip-machine-check", no_argument, 0, 0},
-    {"input", required_argument, 0, 0},
-    {"output", required_argument, 0, 0},
-    {0, 0, 0, 0}
-  };
-
-  int optIndex = 0;
-  int option = 0;
-
-  bool gotInput = false;
-  bool gotOutput = false;
-  bool skipMachineCheck = false;
-  
-  char *pePath = NULL;
-  char *xexfilePath = NULL;
-  
-  while((option = getopt_long(argc, argv, "hvlsi:o:", longOptions, &optIndex)) != -1)
-    {      
-      if(option == 'h' || option == '?' || (option == 0 && strcmp(longOptions[optIndex].name, "help") == 0))
-	{
-	  dispHelp(argv);
-	  return SUCCESS;
-	}
-      else if(option == 'v' || (option == 0 && strcmp(longOptions[optIndex].name, "version") == 0))
-	{
-	  dispVer();
-	  return SUCCESS;
-	}
-      else if(option == 'l' || (option == 0 && strcmp(longOptions[optIndex].name, "libs") == 0))
-	{
-	  dispLibs();
-	  return SUCCESS;
-	}
-      else if(option == 's' || (option == 0 && strcmp(longOptions[optIndex].name, "skip-machine-check") == 0))
-	{
-	  printf("%s WARNING: Skipping machine ID check.\n", PRINT_STEM);
-	  skipMachineCheck = true;
-	}
-      else if(option == 'i' || (option == 0 && strcmp(longOptions[optIndex].name, "input") == 0))
-	{
-	  gotInput = true;
-	  pePath = malloc(strlen(optarg) + 1);
-
-	  if(pePath == NULL)
-	    {
-	      printf("%s ERROR: Out of memory. Aborting.\n", PRINT_STEM);
-	      if(xexfilePath != NULL) {free(xexfilePath);}
-	      return -1;
-	    }
-	  
-	  strncpy(pePath, optarg, strlen(optarg) + 1);
-	}
-      else if(option == 'o' || (option == 0 && strcmp(longOptions[optIndex].name, "output") == 0))
-	{
-	  gotOutput = true;
-	  xexfilePath = malloc(strlen(optarg) + 1);
-
-	  if(xexfilePath == NULL)
-	    {
-	      printf("%s ERROR: Out of memory. Aborting.\n", PRINT_STEM);
-	      if(pePath != NULL) {free(pePath);}
-	      return -1;
-	    }
-	  
-	  strncpy(xexfilePath, optarg, strlen(optarg) + 1);
-	}
-    }
-
-  printf("%s This is %s. Copyright (c) %s Aiden Isik.\n", PRINT_STEM, VERSION_STRING, COPYRIGHT);
-  printf("%s This program is free/libre software. Run \"%s --version\" for info.\n\n", PRINT_STEM, argv[0]);
-  
-  // Check we got everything we need
-  if(!gotInput)
+    static struct option longOptions[] =
     {
-      if(gotOutput)
-	{
-	  free(xexfilePath);
-	}
-      
-      printf("%s ERROR: PE input expected but not found. Aborting.\n", PRINT_STEM);
-      return -1;
-    }
-  else if(!gotOutput)
+        { "help", no_argument, 0, 'h' },
+        { "version", no_argument, 0, 'v' },
+        { "libs", no_argument, 0, 'l' },
+        { "skip-machine-check", no_argument, 0, 's' },
+        { "input", required_argument, 0, 'i' },
+        { "output", required_argument, 0, 'o' },
+        { "type", required_argument, 0, 't' },
+        { 0, 0, 0, 0 }
+    };
+
+    struct offsets *offsets = calloc(1, sizeof(struct offsets));
+    struct xexHeader *xexHeader = calloc(1, sizeof(struct xexHeader));
+    struct secInfoHeader *secInfoHeader = calloc(1, sizeof(struct secInfoHeader));
+    struct peData *peData = calloc(1, sizeof(struct peData));
+    struct optHeaderEntries *optHeaderEntries = calloc(1, sizeof(struct optHeaderEntries));
+    struct optHeaders *optHeaders = calloc(1, sizeof(struct optHeaders));
+
+    if(offsets == NULL || xexHeader == NULL || secInfoHeader == NULL ||
+            peData == NULL || optHeaderEntries == NULL || optHeaders == NULL)
     {
-      if(gotInput)
-	{
-	  free(pePath);
-	}
-
-      printf("%s ERROR: XEX file output expected but not found. Aborting.\n", PRINT_STEM);
-      return -1;
+        printf("%s ERROR: Out of memory. Aborting\n", SYNTHXEX_PRINT_STEM);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData,
+                           &optHeaderEntries, &optHeaders);
+        return -1;
     }
 
-  // Opening the files now that they've been validated
-  FILE *pe = fopen(pePath, "rb");
+    int optIndex = 0;
+    int option = 0;
 
-  if(pe == NULL)
+    bool gotInput = false;
+    bool gotOutput = false;
+    bool skipMachineCheck = false;
+
+    char *pePath = NULL;
+    char *xexfilePath = NULL;
+
+    while((option = getopt_long(argc, argv, "hvlsi:o:t:", longOptions, &optIndex)) != -1)
     {
-      printf("%s ERROR: Failed to open PE file. Do you have read permissions? Aborting.\n", PRINT_STEM);
-      free(pePath);
-      free(xexfilePath);
-      return -1;
+        switch(option)
+        {
+            case 'v':
+                dispVer();
+                freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData,
+                                   &optHeaderEntries, &optHeaders);
+                return SUCCESS;
+
+            case 'l':
+                dispLibs();
+                freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData,
+                                   &optHeaderEntries, &optHeaders);
+                return SUCCESS;
+
+            case 's':
+                printf("%s WARNING: Skipping machine ID check.\n", SYNTHXEX_PRINT_STEM);
+                skipMachineCheck = true;
+                break;
+
+            case 'i':
+                gotInput = true;
+                pePath = malloc(strlen(optarg) + 1);
+
+                if(pePath == NULL)
+                {
+                    printf("%s ERROR: Out of memory. Aborting.\n", SYNTHXEX_PRINT_STEM);
+                    nullAndFree((void **)&xexfilePath);
+                    freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData,
+                                       &optHeaderEntries, &optHeaders);
+                    return -1;
+                }
+
+                strcpy(pePath, optarg);
+                break;
+
+            case 'o':
+                gotOutput = true;
+                xexfilePath = malloc(strlen(optarg) + 1);
+
+                if(xexfilePath == NULL)
+                {
+                    printf("%s ERROR: Out of memory. Aborting.\n", SYNTHXEX_PRINT_STEM);
+                    nullAndFree((void **)&pePath);
+                    freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData,
+                                       &optHeaderEntries, &optHeaders);
+                    return -1;
+                }
+
+                strcpy(xexfilePath, optarg);
+                break;
+
+            case 't':
+                if(strcmp(optarg, "title") == 0)
+                { xexHeader->moduleFlags = XEX_MOD_FLAG_TITLE; }
+                else if(strcmp(optarg, "titledll") == 0)
+                { xexHeader->moduleFlags = XEX_MOD_FLAG_TITLE | XEX_MOD_FLAG_DLL; }
+                else if(strcmp(optarg, "sysdll") == 0)
+                { xexHeader->moduleFlags = XEX_MOD_FLAG_EXPORTS | XEX_MOD_FLAG_DLL; }
+                else if(strcmp(optarg, "dll") == 0)
+                { xexHeader->moduleFlags = XEX_MOD_FLAG_DLL; }
+                else
+                {
+                    printf("%s ERROR: Invalid type override \"%s\" (valid: title, titledll, sysdll, dll). Aborting.\n",
+                           SYNTHXEX_PRINT_STEM, optarg);
+
+                    nullAndFree((void **)&pePath);
+                    nullAndFree((void **)&xexfilePath);
+                    freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData,
+                                       &optHeaderEntries, &optHeaders);
+                    return -1;
+                }
+
+                break;
+
+            case 'h':
+            default:
+                dispHelp(argv);
+                freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData,
+                                   &optHeaderEntries, &optHeaders);
+                return SUCCESS;
+        }
     }
 
-  free(pePath);
-  
-  FILE *xex = fopen(xexfilePath, "wb+");
+    printf("%s This is %s. Copyright (c) %s Aiden Isik.\n", SYNTHXEX_PRINT_STEM, SYNTHXEX_VERSION_STRING, SYNTHXEX_COPYRIGHT);
+    printf("%s This program is free/libre software. Run \"%s --version\" for info.\n\n", SYNTHXEX_PRINT_STEM, argv[0]);
 
-  if(xex == NULL)
+    if(!gotInput)
     {
-      printf("%s ERROR: Failed to create XEX file. Do you have write permissions? Aborting.\n", PRINT_STEM);
-      fclose(pe);
-      free(xexfilePath);
-      return -1;
+        if(gotOutput)
+        { nullAndFree((void **)&xexfilePath); }
+
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        printf("%s ERROR: PE input expected but not found. Aborting.\n", SYNTHXEX_PRINT_STEM);
+        return -1;
     }
-
-  // Don't free this yet. We need it to determine where we can put the mapped basefile.
-  // There *are* ways to get the file path from file pointer, but none of them are portable.
-  //free(xexfilePath);
-
-  int ret;
-  
-  struct offsets offsets;
-  struct xexHeader xexHeader;
-  struct secInfoHeader secInfoHeader;
-  struct peData peData;
-  struct optHeaderEntries optHeaderEntries;
-  struct optHeaders optHeaders;
-
-  printf("%s Validating PE file...\n", PRINT_STEM);
-  
-  if(!validatePE(pe, skipMachineCheck))
+    else if(!gotOutput)
     {
-      printf("%s ERROR: Input PE is not Xbox 360 PE. Aborting.\n", PRINT_STEM);
-      free(xexfilePath);
-      fclose(pe);
-      fclose(xex);
-      return -1;
+        if(gotInput)
+        { nullAndFree((void **)&pePath); }
+
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        printf("%s ERROR: XEX file output expected but not found. Aborting.\n", SYNTHXEX_PRINT_STEM);
+        return -1;
     }
 
-  printf("%s PE valid!\n", PRINT_STEM);
+    FILE *pe = fopen(pePath, "rb");
 
-  // Reading in header data from PE
-  printf("%s Retrieving header data from PE...\n", PRINT_STEM);
-  ret = getHdrData(pe, &peData, 0);
-  
-  if(ret == ERR_UNKNOWN_DATA_REQUEST)
+    if(pe == NULL)
     {
-      printf("%s ERROR: Internal error getting data from PE file. THIS IS A BUG, please report it. Aborting.\n", PRINT_STEM);
-      fclose(pe);
-      fclose(xex);
-      return -1;
-    }
-  else if(ret == ERR_FILE_READ)
-    {
-      printf("%s ERROR: Failed to read data from PE file. Aborting.\n", PRINT_STEM);
-      fclose(pe);
-      fclose(xex);
-      return -1;
-    }
-  else if(ret == ERR_OUT_OF_MEM)
-    {
-      printf("%s ERROR: Out of memory. Aborting.\n", PRINT_STEM);
-      fclose(pe);
-      fclose(xex);
-      return -1;
-    }
-  else if(ret == ERR_MISSING_SECTION_FLAG)
-    {
-      printf("%s ERROR: R/W/X flag missing from PE section. Aborting.\n", PRINT_STEM);
-      fclose(pe);
-      fclose(xex);
-      return -1;
-    }
-  else if(ret == ERR_UNSUPPORTED_STRUCTURE)
-    {
-      printf("%s ERROR: Encountered an unsupported data structure in PE. Aborting.\n", PRINT_STEM);
-      fclose(pe);
-      fclose(xex);
-      return -1;
+        printf("%s ERROR: Failed to open PE file. Do you have read permissions? Aborting.\n", SYNTHXEX_PRINT_STEM);
+        nullAndFree((void **)&pePath);
+        nullAndFree((void **)&xexfilePath);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        return -1;
     }
 
-  printf("%s Got header data from PE!\n", PRINT_STEM);
-  
-  // Determine the path we should save the basefile at and open it.
-  printf("%s Creating basefile from PE...\n", PRINT_STEM);
-  char *basefilePath = malloc((strlen(xexfilePath) + strlen(".basefile") + 1) * sizeof(char));
+    nullAndFree((void **)&pePath);
 
-  if(basefilePath == NULL)
+    FILE *xex = fopen(xexfilePath, "wb+");
+
+    if(xex == NULL)
     {
-      printf("%s ERROR: Out of memory. Aborting.\n", PRINT_STEM);
-      free(xexfilePath);
-      fclose(pe);
-      fclose(xex);
-      return -1;
+        printf("%s ERROR: Failed to create XEX file. Do you have write permissions? Aborting.\n", SYNTHXEX_PRINT_STEM);
+        fclose(pe);
+        nullAndFree((void **)&xexfilePath);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        return -1;
     }
 
-  strcpy(basefilePath, xexfilePath);
-  strcat(basefilePath, ".basefile");
-  
-  FILE* basefile = fopen(basefilePath, "wb+");
-  free(xexfilePath); // *Now* we're done with it.
-  free(basefilePath);
-  
-  if(basefile == NULL)
+    // Keep xexfilePath for later use
+    // Do NOT free xexfilePath here yet
+
+    int ret = 0;
+
+    printf("%s Validating PE file...\n", SYNTHXEX_PRINT_STEM);
+
+    if(!validatePE(pe, skipMachineCheck))
     {
-      printf("%s ERROR: Could not create basefile. Do you have write permission? Aborting.\n", PRINT_STEM);
-      fclose(pe);
-      fclose(xex);
-      return -1;
+        printf("%s ERROR: Input PE is not Xbox 360 PE. Aborting.\n", SYNTHXEX_PRINT_STEM);
+        nullAndFree((void **)&xexfilePath);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(pe);
+        fclose(xex);
+        return -1;
     }
 
-  // Map the PE into the basefile (RVAs become offsets)
-  ret = mapPEToBasefile(pe, basefile, &peData);
-  fclose(pe);
+    printf("%s PE valid!\n", SYNTHXEX_PRINT_STEM);
 
-  if(ret == ERR_OUT_OF_MEM)
-    {
-      printf("%s ERROR: Out of memory. Aborting.\n", PRINT_STEM);
-      fclose(basefile);
-      fclose(xex);
-      return -1;
-    }
-  
-  printf("%s Created basefile!\n", PRINT_STEM);  
-  
-  // Setting final XEX data structs
-  printf("%s Building XEX header...\n", PRINT_STEM);
-  setXEXHeader(&xexHeader);
-  
-  printf("%s Building security header...\n", PRINT_STEM);
-  setSecInfoHeader(&secInfoHeader, &peData);
-  
-  printf("%s Setting page descriptors...\n", PRINT_STEM);
-  ret = setPageDescriptors(basefile, &peData, &secInfoHeader);
+    printf("%s Retrieving header data from PE...\n", SYNTHXEX_PRINT_STEM);
+    ret = getHdrData(pe, peData, 0);
 
-  if(ret == ERR_OUT_OF_MEM)
+    if(ret != SUCCESS)
     {
-      printf("%s ERROR: Out of memory. Aborting.\n", PRINT_STEM);
-      fclose(basefile);
-      fclose(xex);
-      return -1;
-    }
-  
-  printf("%s Building optional headers...\n", PRINT_STEM);
-  ret = setOptHeaders(&secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
-
-  if(ret == ERR_OUT_OF_MEM)
-    {
-      printf("%s ERROR: Out of memory. Aborting.\n", PRINT_STEM);
-      fclose(basefile);
-      fclose(xex);
-      return -1;
-    }
-  
-  // Setting data positions...
-  printf("%s Aligning data...\n", PRINT_STEM);
-  ret = placeStructs(&offsets, &xexHeader, &optHeaderEntries, &secInfoHeader, &optHeaders);
-
-  if(ret == ERR_OUT_OF_MEM)
-    {
-      printf("%s ERROR: Out of memory. Aborting.\n", PRINT_STEM);
-      fclose(basefile);
-      fclose(xex);
-      return -1;
-    }
-  
-  // Write out all of the XEX data to file
-  printf("%s Writing data to XEX file...\n", PRINT_STEM);
-  ret = writeXEX(&xexHeader, &optHeaderEntries, &secInfoHeader, &optHeaders, &offsets, basefile, xex);
-  
-  if(ret == ERR_OUT_OF_MEM)
-    {
-      printf("%s ERROR: Out of memory. Aborting.\n", PRINT_STEM);
-      fclose(basefile);
-      fclose(xex);
-      return -1;
+        handleError(ret);
+        nullAndFree((void **)&xexfilePath);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(pe);
+        fclose(xex);
+        return -1;
     }
 
-  printf("%s Main data written to XEX file!\n", PRINT_STEM);
+    printf("%s Got header data from PE!\n", SYNTHXEX_PRINT_STEM);
 
-  // Final pass (sets & writes header hash)
-  printf("%s Calculating and writing header SHA1...\n", PRINT_STEM);
-  setHeaderSha1(xex);
-  printf("%s Header SHA1 written!\n", PRINT_STEM);
-  
-  fclose(basefile);
-  fclose(xex);
-  
-  printf("%s XEX built. Have a nice day!\n\n", PRINT_STEM);
-  return SUCCESS;
+    printf("%s Retrieving import data from PE...\n", SYNTHXEX_PRINT_STEM);
+    ret = getImports(pe, peData);
+
+    if(ret != SUCCESS)
+    {
+        handleError(ret);
+        nullAndFree((void **)&xexfilePath);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(pe);
+        fclose(xex);
+        return -1;
+    }
+
+    printf("%s Got import data from PE!\n", SYNTHXEX_PRINT_STEM);
+
+    printf("%s Creating basefile from PE...\n", SYNTHXEX_PRINT_STEM);
+    char *basefilePath = malloc((strlen(xexfilePath) + strlen(".basefile") + 1) * sizeof(char));
+
+    if(!basefilePath)
+    {
+        printf("%s ERROR: Out of memory. Aborting.\n", SYNTHXEX_PRINT_STEM);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        nullAndFree((void **)&xexfilePath);
+        fclose(pe);
+        fclose(xex);
+        return -1;
+    }
+
+    strcpy(basefilePath, xexfilePath);
+    strcat(basefilePath, ".basefile");
+
+    FILE *basefile = fopen(basefilePath, "wb+");
+    nullAndFree((void **)&xexfilePath);
+    nullAndFree((void **)&basefilePath);
+
+    if(!basefile)
+    {
+        printf("%s ERROR: Could not create basefile. Do you have write permission? Aborting.\n", SYNTHXEX_PRINT_STEM);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(pe);
+        fclose(xex);
+        return -1;
+    }
+
+    // Map the PE into the basefile (RVAs become offsets)
+    ret = mapPEToBasefile(pe, basefile, peData);
+    fclose(pe);
+
+    if(ret != SUCCESS)
+    {
+        handleError(ret);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(basefile);
+        fclose(xex);
+        return -1;
+    }
+
+    printf("%s Created basefile!\n", SYNTHXEX_PRINT_STEM);
+
+    // Setting final XEX data structs
+    printf("%s Building security header...\n", SYNTHXEX_PRINT_STEM);
+    ret = setSecInfoHeader(secInfoHeader, peData);
+
+    if(ret != SUCCESS)
+    {
+        handleError(ret);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(basefile);
+        fclose(xex);
+        return -1;
+    }
+
+    printf("%s Setting page descriptors...\n", SYNTHXEX_PRINT_STEM);
+    ret = setPageDescriptors(basefile, peData, secInfoHeader);
+
+    if(ret != SUCCESS)
+    {
+        handleError(ret);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(basefile);
+        fclose(xex);
+        return -1;
+    }
+
+    // Done with this now
+    freeSectionsStruct(&(peData->sections));
+
+    printf("%s Building optional headers...\n", SYNTHXEX_PRINT_STEM);
+    ret = setOptHeaders(secInfoHeader, peData, optHeaderEntries, optHeaders);
+
+    if(ret != SUCCESS)
+    {
+        handleError(ret);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(basefile);
+        fclose(xex);
+        return -1;
+    }
+
+    printf("%s Building XEX header...\n", SYNTHXEX_PRINT_STEM);
+    ret = setXEXHeader(xexHeader, optHeaderEntries, peData);
+
+    if(ret != SUCCESS)
+    {
+        handleError(ret);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(basefile);
+        fclose(xex);
+        return -1;
+    }
+
+    // Done with this now
+    freePeImportInfoStruct(&(peData->peImportInfo));
+
+    // Setting data positions
+    printf("%s Aligning data...\n", SYNTHXEX_PRINT_STEM);
+    ret = placeStructs(offsets, xexHeader, optHeaderEntries, secInfoHeader, optHeaders);
+
+    if(ret != SUCCESS)
+    {
+        handleError(ret);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(basefile);
+        fclose(xex);
+        return -1;
+    }
+
+    // We're done with this now
+    freePeDataStruct(&peData);
+
+    // Write out all of the XEX data to file
+    printf("%s Writing XEX...\n", SYNTHXEX_PRINT_STEM);
+    ret = writeXEX(xexHeader, optHeaderEntries, secInfoHeader, optHeaders, offsets, basefile, xex);
+
+    if(ret != SUCCESS)
+    {
+        handleError(ret);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(basefile);
+        fclose(xex);
+        return -1;
+    }
+
+    // Final pass (sets & writes header hash)
+    printf("%s Calculating and writing header SHA1...\n", SYNTHXEX_PRINT_STEM);
+    ret = setHeaderSha1(xex);
+
+    if(ret != SUCCESS)
+    {
+        handleError(ret);
+        freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+        fclose(basefile);
+        fclose(xex);
+        return -1;
+    }
+
+    printf("%s Header SHA1 written!\n", SYNTHXEX_PRINT_STEM);
+
+    // Free files
+    fclose(xex);
+    fclose(basefile);
+    // Free structs
+    freeAllMainStructs(&offsets, &xexHeader, &secInfoHeader, &peData, &optHeaderEntries, &optHeaders);
+
+    printf("%s XEX built. Have a nice day!\n\n", SYNTHXEX_PRINT_STEM);
+    return SUCCESS;
 }

src/pemapper/pemapper.c

@@ -20,69 +20,165 @@
 
 struct sectionInfo
 {
-  uint32_t virtualSize;
-  uint32_t rva;
-  uint32_t rawSize;
-  uint32_t offset;
+    uint32_t virtualSize;
+    uint32_t rva;
+    uint32_t rawSize;
+    uint32_t offset;
 };
 
+// Strips the ordinal flags from IAT entries, and swaps them to big endian
+// Also adds module indexes to them
+int xenonifyIAT(FILE *basefile, struct peData *peData)
+{
+    // Loop through each import table and handle their IAT entries
+    for(uint32_t i = 0; i < peData->peImportInfo.tableCount; i++)
+    {
+        // Seek to the first IAT entry for this table
+        if(fseek(basefile, peData->peImportInfo.tables[i].rva, SEEK_SET) != 0)
+        { return ERR_FILE_READ; }
+
+        // Loop through each import and handle it's IAT entry
+        for(uint32_t j = 0; j < peData->peImportInfo.tables[i].importCount; j++)
+        {
+            // Read in the current IAT entry
+            uint32_t iatEntry = get32BitFromPE(basefile);
+
+            if(errno != SUCCESS)
+            { return ERR_FILE_READ; }
+
+            // Seek back so we can write back to the same place
+            if(fseek(basefile, -0x4, SEEK_CUR) != 0)
+            { return ERR_FILE_READ; }
+
+            // Xenonify the IAT entry
+            iatEntry &= ~PE_IMPORT_ORDINAL_FLAG; // Strip the import by ordinal flag
+            iatEntry |= (i & 0x000000FF) << 16; // Add the module index
+
+            // Write back out as big endian (TODO: make a utility function for this like get32BitFromPE)
+#ifdef LITTLE_ENDIAN_SYSTEM
+            iatEntry = __builtin_bswap32(iatEntry);
+#endif
+
+            if(fwrite(&iatEntry, sizeof(uint32_t), 1, basefile) < 1)
+            { return ERR_FILE_WRITE; }
+
+            // Call file positioning function between reads and writes to the same file.
+            // This is mandated by the C standard.
+            fseek(basefile, 0, SEEK_CUR);
+        }
+    }
+
+    return SUCCESS;
+}
+
 // Maps the PE file into the basefile (RVAs become offsets)
 int mapPEToBasefile(FILE *pe, FILE *basefile, struct peData *peData)
 {
-  // Retrieve data for each section
-  struct sectionInfo *sectionInfo = malloc(peData->numberOfSections * sizeof(struct sectionInfo));
-  fseek(pe, (peData->headerSize - 1) + 0x8, SEEK_SET); // Seek to the first section in the section table at virtualSize
+    // Retrieve the section info from PE (TODO: use the data we get from getHdrData for this, right now we're duplicating work)
+    struct sectionInfo *sectionInfo = malloc(peData->numberOfSections *sizeof(struct sectionInfo));
 
-  for(uint16_t i = 0; i < peData->numberOfSections; i++)
+    if(!sectionInfo)
+    { return ERR_OUT_OF_MEM; }
+
+    // Seek to the first section in the section table at virtualSize
+    if(fseek(pe, (peData->headerSize - 1) + 0x8, SEEK_SET) != 0)
+    { return ERR_FILE_READ; }
+
+    for(uint16_t i = 0; i < peData->numberOfSections; i++)
     {
-      sectionInfo[i].virtualSize = get32BitFromPE(pe);
-      sectionInfo[i].rva = get32BitFromPE(pe);
-      sectionInfo[i].rawSize = get32BitFromPE(pe);
-      sectionInfo[i].offset = get32BitFromPE(pe);      
-      fseek(pe, 0x18, SEEK_CUR); // Seek to next entry at virtualSize
-    }
-  
-  // Copy the PE header and section table to the basefile verbatim
-  fseek(pe, 0, SEEK_SET);
-  uint8_t *buffer = malloc(peData->headerSize + peData->sectionTableSize);
-  if(buffer == NULL) {return ERR_OUT_OF_MEM;}
+        sectionInfo[i].virtualSize = get32BitFromPE(pe);
 
-  fread(buffer, sizeof(uint8_t), peData->headerSize + peData->sectionTableSize, pe);
-  fwrite(buffer, sizeof(uint8_t), peData->headerSize + peData->sectionTableSize, basefile);
+        if(errno != SUCCESS)
+        { return errno; }
 
-  // Now map the sections and write them
-  for(uint16_t i = 0; i < peData->numberOfSections; i++)
-    {
-      buffer = realloc(buffer, sectionInfo[i].rawSize * sizeof(uint8_t));
-      if(buffer == NULL) {return ERR_OUT_OF_MEM;}
-      
-      fseek(pe, sectionInfo[i].offset, SEEK_SET);
-      fread(buffer, sizeof(uint8_t), sectionInfo[i].rawSize, pe);
+        sectionInfo[i].rva = get32BitFromPE(pe);
 
-      fseek(basefile, sectionInfo[i].rva, SEEK_SET);
-      fwrite(buffer, sizeof(uint8_t), sectionInfo[i].rawSize, basefile);
+        if(errno != SUCCESS)
+        { return errno; }
+
+        sectionInfo[i].rawSize = get32BitFromPE(pe);
+
+        if(errno != SUCCESS)
+        { return errno; }
+
+        sectionInfo[i].offset = get32BitFromPE(pe);
+
+        if(errno != SUCCESS)
+        { return errno; }
+
+        // Seek to the next entry at virtualSize
+        if(fseek(pe, 0x18, SEEK_CUR) != 0)
+        { return ERR_FILE_READ; }
     }
 
-  // Pad the rest of the final page with zeroes, we can achieve this by seeking
-  // to the end and placing a single zero there (unless the data runs all the way up to the end!)
-  uint32_t currentOffset = ftell(basefile);
-  uint32_t nextAligned = getNextAligned(currentOffset, peData->pageSize) - 0x1;
+    if(fseek(pe, 0, SEEK_SET) != 0)
+    { return ERR_FILE_READ; }
 
-  if(nextAligned != currentOffset)
+    // Copy the PE header and section table to the basefile verbatim
+    uint8_t *buffer = malloc(peData->headerSize + peData->sectionTableSize);
+
+    if(!buffer)
+    { return ERR_OUT_OF_MEM; }
+
+    size_t totalHeader = peData->headerSize + peData->sectionTableSize;
+
+    if(fread(buffer, 1, totalHeader, pe) != totalHeader)
+    { return ERR_FILE_READ; }
+
+    if(fwrite(buffer, 1, totalHeader, basefile) != totalHeader)
+    { return ERR_FILE_READ; }
+
+    // Now map the sections and write them
+    for(uint16_t i = 0; i < peData->numberOfSections; i++)
     {
-      buffer = realloc(buffer, 1 * sizeof(uint8_t));
-      if(buffer == NULL) {return ERR_OUT_OF_MEM;}
-      buffer[0] = 0;
-      fseek(basefile, nextAligned, SEEK_SET);
-      fwrite(buffer, sizeof(uint8_t), 1, basefile);
+        buffer = realloc(buffer, sectionInfo[i].rawSize);
+
+        if(!buffer)
+        { return ERR_OUT_OF_MEM; }
+
+        if(fseek(pe, sectionInfo[i].offset, SEEK_SET) != 0)
+        { return ERR_FILE_READ; }
+
+        if(fread(buffer, 1, sectionInfo[i].rawSize, pe) != sectionInfo[i].rawSize)
+        { return ERR_FILE_READ; }
+
+        if(fseek(basefile, sectionInfo[i].rva, SEEK_SET) != 0)
+        { return ERR_FILE_READ; }
+
+        if(fwrite(buffer, 1, sectionInfo[i].rawSize, basefile) != sectionInfo[i].rawSize)
+        { return ERR_FILE_READ; }
     }
 
-  // Make sure to update the PE (basefile) size
-  peData->size = ftell(basefile);
-  
-  // We're done with these, free them
-  free(buffer);
-  free(sectionInfo);
+    // Pad the rest of the final page with zeroes, we can achieve this by seeking
+    // to the end and placing a single zero there (unless the data runs all the way up to the end!)
+    uint32_t currentOffset = ftell(basefile);
+    uint32_t nextAligned = getNextAligned(currentOffset, peData->pageSize) - 1;
 
-  return SUCCESS;
+    if(nextAligned != currentOffset)
+    {
+        buffer = realloc(buffer, 1);
+
+        if(!buffer)
+        { return ERR_OUT_OF_MEM; }
+
+        buffer[0] = 0;
+
+        if(fseek(basefile, nextAligned, SEEK_SET) != 0)
+        { return ERR_FILE_READ; }
+
+        if(fwrite(buffer, 1, 1, basefile) != 1)
+        { return ERR_FILE_READ; }
+    }
+
+    // Make sure to update the PE (basefile) size
+    peData->size = ftell(basefile);
+
+    // We're done with these now, free them
+    nullAndFree((void **)&buffer);
+    nullAndFree((void **)&sectionInfo);
+
+    // While we're writing the basefile, let's do the required modifications to the IAT.
+    // We can skip the return check because this is the last function call.
+    // The outcome of this is the outcome of the whole function.
+    return xenonifyIAT(basefile, peData);
 }

src/placer/placer.c

@@ -21,85 +21,89 @@
 // Internal struct, defined here so it cannot be accessed outwith this file
 struct importLibIdcs
 {
-  uint32_t header;
-  uint32_t entry;
+    uint32_t header;
+    uint32_t entry;
 };
 
 int setOptHeaderOffsets(struct offsets *offsets, struct optHeaderEntries *optHeaderEntries, struct optHeaders *optHeaders, uint32_t *currentOffset, struct importLibIdcs *importLibIdcs)
 {
-  offsets->optHeaders = calloc(optHeaderEntries->count, sizeof(uint32_t)); // Calloc because 0 values will be used to determine if a header is not present.
-  if(offsets->optHeaders == NULL) {return ERR_OUT_OF_MEM;}
-  uint32_t sepHeader = 0; // Separate header iterator, i.e. one with it's data outwith the entries
-  
-  for(uint32_t i = 0; i < optHeaderEntries->count; i++)
+    // Calloc because 0 values will be used to determine if a header is not present.
+    offsets->optHeaders = calloc(optHeaderEntries->count, sizeof(uint32_t));
+
+    if(offsets->optHeaders == NULL)
+    { return ERR_OUT_OF_MEM; }
+
+    // Separate header iterator, i.e. one with it's data outwith the entries
+    uint32_t sepHeader = 0;
+
+    for(uint32_t i = 0; i < optHeaderEntries->count; i++)
     {
-      *currentOffset = getNextAligned(*currentOffset, 0x8);
-         
-      switch(optHeaderEntries->optHeaderEntry[i].id)
-	{
-	case XEX_OPT_ID_BASEFILE_FORMAT:
-	  *currentOffset += sizeof(struct basefileFormat);
-	  optHeaderEntries->optHeaderEntry[i].dataOrOffset = *currentOffset;
-	  offsets->optHeaders[sepHeader] = *currentOffset;
-	  sepHeader++;
-	  break;
+        *currentOffset = getNextAligned(*currentOffset, 0x8);
 
-	case XEX_OPT_ID_IMPORT_LIBS:
-	  importLibIdcs->header = sepHeader;
-	  importLibIdcs->entry = i;
-	  sepHeader++;
-	  break;
+        switch(optHeaderEntries->optHeaderEntry[i].id)
+        {
+            case XEX_OPT_ID_BASEFILE_FORMAT:
+                optHeaderEntries->optHeaderEntry[i].dataOrOffset = *currentOffset;
+                offsets->optHeaders[sepHeader] = *currentOffset;
+                *currentOffset += sizeof(struct basefileFormat);
+                sepHeader++;
+                break;
 
-	case XEX_OPT_ID_TLS_INFO:
-	  *currentOffset += sizeof(struct tlsInfo);
-	  optHeaderEntries->optHeaderEntry[i].dataOrOffset = *currentOffset;
-	  offsets->optHeaders[sepHeader] = *currentOffset;
-	  sepHeader++;
-	  break;
-	}
+            case XEX_OPT_ID_IMPORT_LIBS:
+                importLibIdcs->header = sepHeader;
+                importLibIdcs->entry = i;
+                sepHeader++;
+                break;
+
+            case XEX_OPT_ID_TLS_INFO:
+                optHeaderEntries->optHeaderEntry[i].dataOrOffset = *currentOffset;
+                offsets->optHeaders[sepHeader] = *currentOffset;
+                *currentOffset += sizeof(struct tlsInfo);
+                sepHeader++;
+                break;
+        }
     }
 
-  return SUCCESS;
+    return SUCCESS;
 }
 
-// Todo in future: implement a dynamic optional header selection mechanism instead of hard-coding the basic 5
 int placeStructs(struct offsets *offsets, struct xexHeader *xexHeader, struct optHeaderEntries *optHeaderEntries, struct secInfoHeader *secInfoHeader, struct optHeaders *optHeaders)
 {
-  // XEX Header
-  uint32_t currentOffset = 0x0;
-  offsets->xexHeader = currentOffset;
-  currentOffset += sizeof(struct xexHeader);
+    // XEX Header
+    uint32_t currentOffset = 0x0;
+    offsets->xexHeader = currentOffset;
+    currentOffset += sizeof(struct xexHeader);
 
-  // Optional header entries (no alignment, they immediately follow XEX header)
-  offsets->optHeaderEntries = currentOffset;
-  currentOffset += optHeaderEntries->count * sizeof(struct optHeaderEntry);
-  
-  // Security header
-  currentOffset = getNextAligned(currentOffset, 0x8); // 8-byte alignment for these headers etc
-  offsets->secInfoHeader = currentOffset;
-  xexHeader->secInfoOffset = currentOffset;
-  currentOffset += (sizeof(struct secInfoHeader) - sizeof(void*)) + (secInfoHeader->pageDescCount * sizeof(struct pageDescriptor));
+    // Optional header entries (no alignment, they immediately follow XEX header)
+    offsets->optHeaderEntries = currentOffset;
+    currentOffset += optHeaderEntries->count *sizeof(struct optHeaderEntry);
 
-  // Optional headers (minus imports)
-  struct importLibIdcs importLibIdcs;
-  uint32_t importLibsIdx; // Entry in opt header entries of import libs
-  int ret = setOptHeaderOffsets(offsets, optHeaderEntries, optHeaders, &currentOffset, &importLibIdcs);
+    // Security header
+    currentOffset = getNextAligned(currentOffset, 0x8); // 8-byte alignment for these headers, at least 8 bytes beyond end of optional header entries
+    offsets->secInfoHeader = currentOffset;
+    xexHeader->secInfoOffset = currentOffset;
+    currentOffset += (sizeof(struct secInfoHeader) - sizeof(void *)) + (secInfoHeader->pageDescCount *sizeof(struct pageDescriptor));
 
-  if(ret != SUCCESS)
+    // Optional headers (minus imports)
+    struct importLibIdcs importLibIdcs;
+    int ret = setOptHeaderOffsets(offsets, optHeaderEntries, optHeaders, &currentOffset, &importLibIdcs);
+
+    if(ret != SUCCESS)
+    { return ret; }
+
+    currentOffset += optHeaders->importLibraries.size; // Reserving bytes for imports
+
+    // PE basefile
+    currentOffset = getNextAligned(currentOffset, 0x1000); // 4KiB alignment for basefile
+    offsets->basefile = currentOffset;
+    xexHeader->peOffset = currentOffset;
+
+    // Imports, the end of this header is aligned to the start of the basefile, so they are a special case
+    if(optHeaders->importLibraries.tableCount > 0)
     {
-      return ret;
+        offsets->optHeaders[importLibIdcs.header] = offsets->basefile - optHeaders->importLibraries.size;
+        optHeaderEntries->optHeaderEntry[importLibIdcs.entry].dataOrOffset = offsets->optHeaders[importLibIdcs.header];
     }
-  
-  //currentOffset += optHeaders->importLibraries.size; // Reserving bytes for imports
-  
-  // PE basefile
-  currentOffset = getNextAligned(currentOffset, 0x1000); // 4KiB alignment for basefile
-  offsets->basefile = currentOffset;
-  xexHeader->peOffset = currentOffset;
 
-  // Imports, the end of this header is aligned to the start of the basefile, so they are a special case
-  //offsets->optHeaders[importLibIdcs.header] = offsets->basefile - optHeaders->importLibraries.size;
-  //optHeaderEntries->optHeaderEntry[importLibIdcs.entry].dataOrOffset = offsets->optHeaders[importLibIdcs.header];
-
-  return SUCCESS;
+    return SUCCESS;
 }

src/setdata/optheaders.c

@@ -1,7 +1,7 @@
 // This file is part of SynthXEX, one component of the
 // FreeChainXenon development toolchain
 //
-// Copyright (c) 2024 Aiden Isik
+// Copyright (c) 2024-25 Aiden Isik
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -20,55 +20,335 @@
 
 void setBasefileFormat(struct basefileFormat *basefileFormat, struct secInfoHeader *secInfoHeader)
 {
-  basefileFormat->size = (1 * 8) + 8; // (Block count * size of raw data descriptor) + size of data descriptor
-  basefileFormat->encType = 0x0; // No encryption
-  basefileFormat->compType = 0x1; // No compression
-  basefileFormat->dataSize = secInfoHeader->peSize;
-  basefileFormat->zeroSize = 0x0; // We aren't going to be removing any zeroes. TODO: implement this, it can make files much smaller
+    basefileFormat->size = (1 * 8) + 8; // (Block count * size of raw data descriptor) + size of data descriptor
+    basefileFormat->encType = 0x0; // No encryption
+    basefileFormat->compType = 0x1; // No compression
+    basefileFormat->dataSize = secInfoHeader->peSize;
+    basefileFormat->zeroSize = 0x0; // We aren't going to be removing any zeroes. TODO: implement this, it can make files much smaller
 }
 
 // STUB. TLS info not supported.
 void setTLSInfo(struct tlsInfo *tlsInfo)
 {
-  tlsInfo->slotCount = 0x40;
-  tlsInfo->rawDataAddr = 0x0;
-  tlsInfo->dataSize = 0x0;
-  tlsInfo->rawDataSize = 0x0;
+    tlsInfo->slotCount = 0x40;
+    tlsInfo->rawDataAddr = 0x0;
+    tlsInfo->dataSize = 0x0;
+    tlsInfo->rawDataSize = 0x0;
+}
+
+int setImportLibsInfo(struct importLibraries *importLibraries, struct peImportInfo *peImportInfo, struct secInfoHeader *secInfoHeader)
+{
+    // Set table count and allocate enough memory for all tables
+    importLibraries->tableCount = peImportInfo->tableCount;
+    secInfoHeader->importTableCount = peImportInfo->tableCount;
+
+    importLibraries->importTables = calloc(importLibraries->tableCount, sizeof(struct importTable));
+
+    if(!importLibraries->importTables)
+    { return ERR_OUT_OF_MEM; }
+
+    if(peImportInfo->tableCount <= 0 || peImportInfo->tableCount > 65535)
+    { return ERR_OUT_OF_MEM; }
+
+    // Use this to avoid dereferencing an unaligned pointer
+    struct importTable *importTables = importLibraries->importTables;
+
+    // Initialise the size of the import libraries to just the size of the header (- 2 * sizeof(void*) to exclude addresses for internal use only)
+    importLibraries->size = (sizeof(struct importLibraries) + importLibraries->nameTableSize) - (2 * sizeof(void *));
+
+    int ret = ERR_INVALID_IMPORT_NAME;
+
+    // Allocate name list
+    char **names = calloc(importLibraries->tableCount, sizeof(char *));
+
+    if(!names)
+    { goto cleanup_tables; }
+
+    // Populate each table, then compute it's hash and store in the previous table
+    for(int64_t i = importLibraries->tableCount - 1; i >= 0; i--)
+    {
+        // Set the table index field to the current index
+        importTables[i].tableIndex = i;
+
+        // Extract the name, target, and minimum versions from the name string
+        // Major and minor version are always 2 and 0, respectively
+        // Strings are definitely null-terminated as otherwise they couldn't have been read in
+        const uint8_t majorVer = 2;
+        const uint8_t minorVer = 0;
+        char *targetBuildVerStr = NULL;
+        char *targetHotfixVerStr = NULL;
+        char *minimumBuildVerStr = NULL;
+        char *minimumHotfixVerStr = NULL;
+        uint16_t buildVer = 0;
+        uint8_t hotfixVer = 0;
+        char *strtoulRet = NULL;
+
+        // Get the name
+        uint32_t oldNameLen = strlen(peImportInfo->tables[i].name);
+        names[i] = strtok(peImportInfo->tables[i].name, "@");
+
+        if(!peImportInfo->tables[i].name)
+        { goto cleanup_names_invalid; } // Encountered '\0', not '@'
+
+        // Target versions first
+        targetBuildVerStr = strtok(NULL, ".");
+
+        if(!targetBuildVerStr)
+        { goto cleanup_names_invalid; }
+
+        if(strlen(names[i]) + 1 + strlen(targetBuildVerStr) == oldNameLen)
+        { goto cleanup_names_invalid; } // Encountered null terminator instead of '.'
+
+        buildVer = (uint16_t)strtoul(targetBuildVerStr, &strtoulRet, 10);
+
+        if(*strtoulRet != 0 || strtoulRet == targetBuildVerStr)
+        { goto cleanup_names_invalid; } // Encountered a non-number, or string was empty
+
+        targetHotfixVerStr = strtok(NULL, "+");
+
+        if(!targetHotfixVerStr)
+        { goto cleanup_names_invalid; }
+
+        if(strlen(names[i]) + 1 + strlen(targetBuildVerStr) + 1 + strlen(targetHotfixVerStr) == oldNameLen)
+        { goto cleanup_names_invalid; }
+
+        hotfixVer = (uint8_t)strtoul(targetHotfixVerStr, &strtoulRet, 10);
+
+        if(*strtoulRet != 0 || strtoulRet == targetHotfixVerStr)
+        { goto cleanup_names_invalid; }
+
+        // Now pack these into the target version bitfield
+        importTables[i].targetVer =
+            ((majorVer & 0xF) << 28) |
+            ((minorVer & 0xF) << 24) |
+            (buildVer << 8) |
+            hotfixVer;
+
+        // Now onto the minimum versions, this works much the same
+        minimumBuildVerStr = strtok(NULL, ".");
+
+        if(!minimumBuildVerStr)
+        { goto cleanup_names_invalid; } // No more tokens
+
+        if(strlen(names[i]) + 1 + strlen(targetBuildVerStr) + 1 + strlen(targetHotfixVerStr)
+                + 1 + strlen(minimumBuildVerStr) == oldNameLen)
+        { goto cleanup_names_invalid; } // Encountered null terminator instead of '.'
+
+        buildVer = (uint16_t)strtoul(minimumBuildVerStr, &strtoulRet, 10);
+
+        if(*strtoulRet != 0 || strtoulRet == minimumBuildVerStr)
+        { goto cleanup_names_invalid; } // Encountered a non-number, or string was empty
+
+        minimumHotfixVerStr = strtok(NULL, "\0");
+
+        if(!minimumHotfixVerStr)
+        { goto cleanup_names_invalid; }
+
+        hotfixVer = (uint8_t)strtoul(minimumHotfixVerStr, &strtoulRet, 10);
+
+        if(*strtoulRet != 0 || strtoulRet == minimumHotfixVerStr)
+        { goto cleanup_names_invalid; }
+
+        // Now pack these into the minimum version bitfield
+        importTables[i].minimumVer =
+            ((majorVer & 0xF) << 28) |
+            ((minorVer & 0xF) << 24) |
+            (buildVer << 8) |
+            hotfixVer;
+
+        // Hardcode a currently unknown value. TODO: find out how this is calculated.
+        if(strcmp(names[i], "xboxkrnl.exe") == 0)
+        { importTables[i].unknown = 0x45DC17E0; }
+        else if(strcmp(names[i], "xam.xex") == 0)
+        { importTables[i].unknown = 0xFCA15C76; }
+        else if(strcmp(names[i], "xbdm.xex") == 0)
+        { importTables[i].unknown = 0xECEB8109; }
+        else
+        { goto cleanup_names_invalid; }
+
+        // Determine the number of addresses
+        importTables[i].addressCount = peImportInfo->tables[i].importCount;
+
+        // Allocate enough memory for the addresses
+        importTables[i].addresses = calloc(importTables[i].addressCount, sizeof(uint32_t));
+
+        if(!importTables[i].addresses)
+        { goto cleanup_names_invalid; }
+
+        uint32_t *addresses = importTables[i].addresses; // Use this to avoid dereferencing an unaligned pointer
+        uint16_t currentAddr = 0;
+
+        // Populate the addresses
+        for(uint16_t j = 0; j < peImportInfo->tables[i].importCount; j++)
+        {
+            if(currentAddr >= importTables[i].addressCount)
+            { goto cleanup_names_invalid; }
+
+            addresses[currentAddr++] = peImportInfo->tables[i].imports[j].iatAddr;
+        }
+
+        // Determine the total size, in bytes, of the current table (- sizeof(void*) to exclude address to addresses at the end)
+        importTables[i].size = (sizeof(struct importTable) - sizeof(void *) + (importTables[i].addressCount *sizeof(uint32_t)));
+        importLibraries->size += importTables[i].size;
+
+        // Init sha1 hash
+        struct sha1_ctx shaContext;
+        memset(&shaContext, 0, sizeof(shaContext));
+        sha1_init(&shaContext);
+
+        // On little endian this ensures the byteswapped address count doesn't cause any trouble when using it.
+        // On big endian it's pointless but here so the code isn't too complex with differences between endianness.
+        uint16_t addressCount = importTables[i].addressCount;
+
+        // If we're on a little endian system, swap everything into big endian for hashing
+#ifdef LITTLE_ENDIAN_SYSTEM
+        importTables[i].size = __builtin_bswap32(importTables[i].size);
+        importTables[i].unknown = __builtin_bswap32(importTables[i].unknown);
+        importTables[i].targetVer = __builtin_bswap32(importTables[i].targetVer);
+        importTables[i].minimumVer = __builtin_bswap32(importTables[i].minimumVer);
+        importTables[i].addressCount = __builtin_bswap16(importTables[i].addressCount);
+
+        // Byteswap the addresses
+        for(uint16_t j = 0; j < addressCount; j++)
+        { addresses[j] = __builtin_bswap32(addresses[j]); }
+
+#endif
+        // - sizeof(void*) to exclude the address to the addresses at the end (not part of the XEX format)
+        // +/- sizeof(uint32_t) to exclude table size from hash
+        sha1_update(&shaContext, sizeof(struct importTable) - sizeof(void *) - sizeof(uint32_t), (void *)&importTables[i] + sizeof(uint32_t));
+        sha1_update(&shaContext, addressCount *sizeof(uint32_t), (void *)addresses);
+
+        // If we're on a little endian system, swap everything back into little endian
+#ifdef LITTLE_ENDIAN_SYSTEM
+        importTables[i].size = __builtin_bswap32(importTables[i].size);
+        importTables[i].unknown = __builtin_bswap32(importTables[i].unknown);
+        importTables[i].targetVer = __builtin_bswap32(importTables[i].targetVer);
+        importTables[i].minimumVer = __builtin_bswap32(importTables[i].minimumVer);
+        importTables[i].addressCount = __builtin_bswap16(importTables[i].addressCount);
+
+        // Byteswap the addresses
+        for(uint16_t j = 0; j < addressCount; j++)
+        { addresses[j] = __builtin_bswap32(addresses[j]); }
+
+#endif
+
+        sha1_digest(&shaContext, 0x14, i != 0 ? importTables[i - 1].sha1 : secInfoHeader->importTableSha1);
+    }
+
+    // Allocate offset table
+    uint32_t *nameOffsets = calloc(importLibraries->tableCount, sizeof(uint32_t));
+
+    if(!nameOffsets)
+    { goto cleanup_names; }
+
+    for(uint32_t i = 0; i < importLibraries->tableCount; i++)
+    {
+        nameOffsets[i] = importLibraries->nameTableSize;
+        importLibraries->nameTableSize += getNextAligned(strlen(names[i]) + 1, sizeof(uint32_t));
+    }
+
+    importLibraries->size += importLibraries->nameTableSize;
+    importLibraries->nameTable = calloc(importLibraries->nameTableSize, sizeof(char));
+
+    if(!importLibraries->nameTable)
+    { goto cleanup_offsets; }
+
+    // Use this to avoid dereferencing an unaligned pointer
+    char *nameTable = importLibraries->nameTable;
+
+    // Populate the name table
+    for(uint32_t i = 0; i < importLibraries->tableCount; i++)
+    { strcpy(&(nameTable[nameOffsets[i]]), names[i]); }
+
+    nullAndFree((void **)&nameOffsets);
+    nullAndFree((void **)&names);
+    return SUCCESS;
+
+cleanup_offsets:
+    nullAndFree((void **)&nameOffsets);
+cleanup_names:
+
+    for(uint32_t i = 0; i < importLibraries->tableCount; i++)
+    { nullAndFree((void **) & (importTables[i].addresses)); }
+
+cleanup_names_invalid:
+    nullAndFree((void **)&names);
+cleanup_tables:
+    nullAndFree((void **) & (importLibraries->importTables));
+    importLibraries->importTables = NULL;
+    return ret;
 }
 
 // STUB. TODO: Dynamically select, and/or allow user to select, flags
 void setSysFlags(uint32_t *flags)
 {
-  *flags = XEX_SYS_GAMEPAD_DISCONNECT |
-           XEX_SYS_INSECURE_SOCKETS |
-           XEX_SYS_XAM_HOOKS |
-           XEX_SYS_BACKGROUND_DL |
-           XEX_SYS_ALLOW_CONTROL_SWAP;
+    if(flags == NULL)
+    { return; }
+
+    *flags = XEX_SYS_GAMEPAD_DISCONNECT |
+             XEX_SYS_INSECURE_SOCKETS |
+             XEX_SYS_XAM_HOOKS |
+             XEX_SYS_BACKGROUND_DL |
+             XEX_SYS_ALLOW_CONTROL_SWAP;
 }
 
 int setOptHeaders(struct secInfoHeader *secInfoHeader, struct peData *peData, struct optHeaderEntries *optHeaderEntries, struct optHeaders *optHeaders)
 {
-  // TODO: Dynamically select optional headers to use, instead of hard-coding
-  optHeaderEntries->count = 4;
-  optHeaderEntries->optHeaderEntry = calloc(5, sizeof(struct optHeaderEntry));
-  if(optHeaderEntries->optHeaderEntry == NULL) {return ERR_OUT_OF_MEM;}
-  
-  // First optional header (basefile format)
-  setBasefileFormat(&(optHeaders->basefileFormat), secInfoHeader);
-  optHeaderEntries->optHeaderEntry[0].id = XEX_OPT_ID_BASEFILE_FORMAT;
+    bool importsPresent = (peData->peImportInfo.totalImportCount > 0) ? true : false;
 
-  // Second optional header (entrypoint)
-  optHeaderEntries->optHeaderEntry[1].id = XEX_OPT_ID_ENTRYPOINT;
-  optHeaderEntries->optHeaderEntry[1].dataOrOffset = secInfoHeader->baseAddr + peData->entryPoint;
+    optHeaderEntries->count = 4;
 
-  // Third optional header (import libs)
-  //optHeaderEntries->optHeaderEntry[2].id = XEX_OPT_ID_IMPORT_LIBS;
+    if(importsPresent)
+    { optHeaderEntries->count++; }
 
-  // Fourth optional header (tls info)
-  optHeaderEntries->optHeaderEntry[2].id = XEX_OPT_ID_TLS_INFO;
-  setTLSInfo(&(optHeaders->tlsInfo));
+    optHeaderEntries->optHeaderEntry = calloc(optHeaderEntries->count, sizeof(struct optHeaderEntry));
 
-  // Fifth optional header (system flags)
-  optHeaderEntries->optHeaderEntry[3].id = XEX_OPT_ID_SYS_FLAGS;
-  setSysFlags(&(optHeaderEntries->optHeaderEntry[3].dataOrOffset));
+    if(optHeaderEntries->optHeaderEntry == NULL)
+    { return ERR_OUT_OF_MEM; }
+
+    uint32_t currentHeader = 0;
+
+    // NOTE: Make sure that these headers are handled IN ORDER OF ID. The loader will reject the XEX if they are not.
+
+    // Basefile format (0x003FF)
+    setBasefileFormat(&(optHeaders->basefileFormat), secInfoHeader);
+    optHeaderEntries->optHeaderEntry[currentHeader].id = XEX_OPT_ID_BASEFILE_FORMAT;
+    currentHeader++;
+
+    // Entrypoint (0x10100)
+    optHeaderEntries->optHeaderEntry[currentHeader].id = XEX_OPT_ID_ENTRYPOINT;
+    optHeaderEntries->optHeaderEntry[currentHeader].dataOrOffset = secInfoHeader->baseAddr + peData->entryPoint;
+    currentHeader++;
+
+    // Import libraries (0x103FF)
+    if(importsPresent)
+    {
+        optHeaderEntries->optHeaderEntry[currentHeader].id = XEX_OPT_ID_IMPORT_LIBS;
+        int ret = setImportLibsInfo(&(optHeaders->importLibraries), &(peData->peImportInfo), secInfoHeader);
+
+        if(ret != SUCCESS)
+        { return ret; }
+
+        currentHeader++;
+    }
+
+    // TLS info (0x20104)
+    optHeaderEntries->optHeaderEntry[currentHeader].id = XEX_OPT_ID_TLS_INFO;
+    setTLSInfo(&(optHeaders->tlsInfo));
+    currentHeader++;
+
+    // System flags (0x30000)
+    optHeaderEntries->optHeaderEntry[currentHeader].id = XEX_OPT_ID_SYS_FLAGS;
+
+    // We're using the name of the first element of the struct for clarity,
+    // it can never be an unaligned access, so ignore that warning.
+    // Also works for Clang.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+    setSysFlags(&(optHeaderEntries->optHeaderEntry[currentHeader].dataOrOffset));
+#pragma GCC diagnostic pop
+
+    //currentHeader++;
+
+    return SUCCESS;
 }

src/setdata/optheaders.h

@@ -19,6 +19,7 @@
 #pragma once
 
 #include "../common/common.h"
+#include "../common/crypto.h"
 #include "../common/datastorage.h"
 
 int setOptHeaders(struct secInfoHeader *secInfoHeader, struct peData *peData, struct optHeaderEntries *optHeaderEntries, struct optHeaders *optHeaders);

src/setdata/pagedescriptors.c

@@ -20,61 +20,70 @@
 
 uint8_t getRwx(struct secInfoHeader *secInfoHeader, struct peData *peData, uint32_t page)
 {
-  uint32_t pageSize = secInfoHeader->peSize / secInfoHeader->pageDescCount;
-  uint32_t currentOffset = page * pageSize;
-  
-  for(int i = peData->sections.count - 1; i >= 0; i--)
-    {
-      if(currentOffset >= peData->sections.sectionPerms[i].rva)
-	{
-	  return peData->sections.sectionPerms[i].permFlag;
-	}
-    }
+    uint32_t pageSize = secInfoHeader->peSize / secInfoHeader->pageDescCount;
+    uint32_t currentOffset = page *pageSize;
 
-  return XEX_SECTION_RODATA | 0b10000; // We're in the PE header, so RODATA
+    for(int32_t i = peData->sections.count - 1; i >= 0; i--)
+        if(currentOffset >= peData->sections.section[i].rva)
+        { return peData->sections.section[i].permFlag; }
+
+    return XEX_SECTION_RODATA | 0b10000; // We're in the PE header, so RODATA
 }
 
 int setPageDescriptors(FILE *pe, struct peData *peData, struct secInfoHeader *secInfoHeader)
 {
-  uint32_t pageSize = secInfoHeader->peSize / secInfoHeader->pageDescCount;
-  secInfoHeader->descriptors = calloc(secInfoHeader->pageDescCount, sizeof(struct pageDescriptor)); // The free() for this is called after written to XEX
-  if(secInfoHeader->descriptors == NULL) {return ERR_OUT_OF_MEM;}
-  
-  // Setting size/info data and calculating hashes for page descriptors
-  for(int64_t i = secInfoHeader->pageDescCount - 1; i >= 0; i--)
-    {      
-      // Get page type (rwx)
-      secInfoHeader->descriptors[i].sizeAndInfo = getRwx(secInfoHeader, peData, i);
-      
-      // Init sha1 hash
-      struct sha1_ctx shaContext;
-      sha1_init(&shaContext);
-      
-      fseek(pe, i * pageSize, SEEK_SET);
-      uint8_t page[pageSize]; 
-      fread(page, sizeof(uint8_t), pageSize, pe);
+    uint32_t pageSize = secInfoHeader->peSize / secInfoHeader->pageDescCount;
 
-      // For little endian systems, swap into big endian for hashing, then back (to keep struct endianness consistent)
+    secInfoHeader->descriptors = calloc(secInfoHeader->pageDescCount, sizeof(struct pageDescriptor));
+
+    if(!secInfoHeader->descriptors)
+    { return ERR_OUT_OF_MEM; }
+
+    struct pageDescriptor *descriptors = secInfoHeader->descriptors; // So we don't dereference an unaligned pointer
+
+    // Setting size/info data and calculating hashes for page descriptors
+    for(int64_t i = secInfoHeader->pageDescCount - 1; i >= 0; i--)
+    {
+        // Get page type (rwx)
+        descriptors[i].sizeAndInfo = getRwx(secInfoHeader, peData, i);
+
+        // Init sha1 hash
+        struct sha1_ctx shaContext;
+        sha1_init(&shaContext);
+
+        if(fseek(pe, i *pageSize, SEEK_SET) != 0)
+        { return ERR_FILE_READ; }
+
+        uint8_t *page = malloc(pageSize);
+
+        if(!page)
+        { return ERR_OUT_OF_MEM; }
+
+        if(fread(page, 1, pageSize, pe) != pageSize)
+        {
+            nullAndFree((void **)&page);
+            return ERR_FILE_READ;
+        }
+
+        // For little endian systems, swap into big endian for hashing, then back (to keep struct endianness consistent)
 #ifdef LITTLE_ENDIAN_SYSTEM
-      secInfoHeader->descriptors[i].sizeAndInfo = htonl(secInfoHeader->descriptors[i].sizeAndInfo);
+        descriptors[i].sizeAndInfo = __builtin_bswap32(descriptors[i].sizeAndInfo);
 #endif
-      
-      sha1_update(&shaContext, pageSize, page);
-      sha1_update(&shaContext, 0x18, (uint8_t*)&secInfoHeader->descriptors[i]);
+
+        sha1_update(&shaContext, pageSize, page);
+        sha1_update(&shaContext, 0x18, (uint8_t *)&descriptors[i]);
 
 #ifdef LITTLE_ENDIAN_SYSTEM
-      secInfoHeader->descriptors[i].sizeAndInfo = ntohl(secInfoHeader->descriptors[i].sizeAndInfo);
+        descriptors[i].sizeAndInfo = __builtin_bswap32(descriptors[i].sizeAndInfo);
 #endif
-      
-      if(i != 0)
-	{
-	  sha1_digest(&shaContext, 0x14, secInfoHeader->descriptors[i - 1].sha1);
-	}
-      else
-	{
-	  sha1_digest(&shaContext, 0x14, secInfoHeader->imageSha1);
-	}
+
+        if(i != 0)
+        { sha1_digest(&shaContext, 0x14, descriptors[i - 1].sha1); }
+        else
+        { sha1_digest(&shaContext, 0x14, secInfoHeader->imageSha1); }
+
+        nullAndFree((void **)&page);
     }
 
-  free(peData->sections.sectionPerms); // Alloc'd in getdata
+    return SUCCESS;
 }

src/setdata/populateheaders.c

@@ -18,32 +18,54 @@
 
 #include "populateheaders.h"
 
-void setXEXHeader(struct xexHeader *xexHeader)
+int setXEXHeader(struct xexHeader *xexHeader, struct optHeaderEntries *optHeaderEntries, struct peData *peData)
 {
-  // Writing data into XEX header.
-  strcpy(xexHeader->magic, "XEX2"); // Magic
-  xexHeader->moduleFlags = XEX_MOD_FLAG_TITLE; // Hard-coding until more options supported
-  xexHeader->optHeaderCount = 0x4; // Hard-coding until more optional headers supported, then maybe it can be determined dynamically.
+    // Writing data into XEX header.
+    strncpy(xexHeader->magic, "XEX2", sizeof(char) * 4); // Magic
+
+    // Module flags (type of executable)
+    // Not sure if this is correct, for DLLs specifically the type overrides should probably be used instead
+    if(xexHeader->moduleFlags == 0)
+    {
+        if(peData->characteristics & PE_CHAR_FLAG_DLL)
+        {
+            xexHeader->moduleFlags |= XEX_MOD_FLAG_DLL; // The executable is a DLL
+        }
+        else
+        {
+            xexHeader->moduleFlags |= XEX_MOD_FLAG_TITLE; // The executable is a regular title
+        }
+
+        if(peData->peExportInfo.count > 0)
+        {
+            xexHeader->moduleFlags |= XEX_MOD_FLAG_EXPORTS; // The executable exports functions
+        }
+    }
+
+    xexHeader->optHeaderCount = optHeaderEntries->count;
+
+    return SUCCESS;
 }
 
-void setSecInfoHeader(struct secInfoHeader *secInfoHeader, struct peData *peData)
+int setSecInfoHeader(struct secInfoHeader *secInfoHeader, struct peData *peData)
 {
-  // Writing data into security info header (much of this is derived from info in PE)
-  secInfoHeader->peSize = peData->size;
+    // Writing data into security info header (much of this is derived from info in PE)
+    secInfoHeader->peSize = peData->size;
 
-  // Setting signature. Clearing first to ensure no memory contents are written to file, then adding identifier.
-  memset(secInfoHeader->signature, 0, sizeof(secInfoHeader->signature));
-  strcpy(secInfoHeader->signature, VERSION_STRING);
+    // Setting signature (just a SynthXEX version identifier)
+    strcpy(secInfoHeader->signature, SYNTHXEX_VERSION_STRING);
 
-  secInfoHeader->imageInfoSize = 0x174; // Image info size is always 0x174
-  secInfoHeader->imageFlags = (peData->pageSize == 0x1000 ? XEX_IMG_FLAG_4KIB_PAGES : 0) | XEX_IMG_FLAG_REGION_FREE; // If page size is 4KiB (small pages), set that flag
-  secInfoHeader->baseAddr = peData->baseAddr;
-  memset(secInfoHeader->mediaID, 0, sizeof(secInfoHeader->mediaID)); // Null media ID
-  memset(secInfoHeader->aesKey, 0, sizeof(secInfoHeader->aesKey)); // No encryption, null AES key
-  //secInfoHeader->exportTableAddr = TEMPEXPORTADDR;
-  secInfoHeader->exportTableAddr = 0;
-  secInfoHeader->gameRegion = XEX_REG_FLAG_REGION_FREE;
-  secInfoHeader->mediaTypes = 0xFFFFFFFF; // All flags set, can load from any type.
-  secInfoHeader->pageDescCount = secInfoHeader->peSize / peData->pageSize; // Number of page descriptors following security info (same number of pages)
-  secInfoHeader->headerSize = (secInfoHeader->pageDescCount * sizeof(struct pageDescriptor)) + (sizeof(struct secInfoHeader) - sizeof(void*)); // Page descriptor total size + length of rest of secinfo header (subtraction of sizeof void* is to remove pointer at end of struct from calculation)
+    secInfoHeader->imageInfoSize = 0x174; // Image info size is always 0x174
+    secInfoHeader->imageFlags = (peData->pageSize == 0x1000 ? XEX_IMG_FLAG_4KIB_PAGES : 0) | XEX_IMG_FLAG_REGION_FREE; // If page size is 4KiB (small pages), set that flag
+    secInfoHeader->baseAddr = peData->baseAddr;
+    //memset(secInfoHeader->mediaID, 0, sizeof(secInfoHeader->mediaID)); // Null media ID (no longer need to use memset, as we use calloc for these structs now)
+    //memset(secInfoHeader->aesKey, 0, sizeof(secInfoHeader->aesKey)); // No encryption, null AES key
+    //secInfoHeader->exportTableAddr = TEMPEXPORTADDR;
+    secInfoHeader->exportTableAddr = 0;
+    secInfoHeader->gameRegion = XEX_REG_FLAG_REGION_FREE;
+    secInfoHeader->mediaTypes = 0xFFFFFFFF; // All flags set, can load from any type.
+    secInfoHeader->pageDescCount = secInfoHeader->peSize / peData->pageSize; // Number of page descriptors following security info (same number of pages)
+    secInfoHeader->headerSize = (secInfoHeader->pageDescCount *sizeof(struct pageDescriptor)) + (sizeof(struct secInfoHeader) - sizeof(void *)); // Page descriptor total size + length of rest of secinfo header (subtraction of sizeof void* is to remove pointer at end of struct from calculation)
+
+    return SUCCESS;
 }

src/setdata/populateheaders.h

@@ -21,5 +21,5 @@
 #include "../common/common.h"
 #include "../common/datastorage.h"
 
-void setXEXHeader(struct xexHeader *xexHeader);
-void setSecInfoHeader(struct secInfoHeader *secInfoHeader, struct peData *peData);
+int setXEXHeader(struct xexHeader *xexHeader, struct optHeaderEntries *optHeaderEntries, struct peData *peData);
+int setSecInfoHeader(struct secInfoHeader *secInfoHeader, struct peData *peData);

src/write/headerhash.c

@@ -18,71 +18,94 @@
 
 #include "headerhash.h"
 
-// TEMPORARY, TO BE REPLACED ELSEWHERE WHEN IMPORT HEADER IS IMPLEMENTED
-void setImportsSha1(FILE *xex)
-{
-  fseek(xex, 0x0, SEEK_SET);
-  while(get32BitFromXEX(xex) != 0x103FF){}
-  fseek(xex, get32BitFromXEX(xex) + 0x4, SEEK_SET);
-  
-  uint8_t importCount[4];
-  fseek(xex, 0x4, SEEK_CUR);
-  fread(importCount, sizeof(uint8_t), 4, xex);
-  fseek(xex, -0x8, SEEK_CUR);
-  
-  fseek(xex, get32BitFromXEX(xex) + 0x4, SEEK_CUR);
-  uint32_t size = get32BitFromXEX(xex) - 0x4;
-  
-  uint8_t data[size];
-  fread(data, sizeof(uint8_t), size, xex);
-  
-  struct sha1_ctx shaContext;
-  sha1_init(&shaContext);
-  sha1_update(&shaContext, size, data);
-
-  uint8_t sha1[20];
-  sha1_digest(&shaContext, 20, sha1);
-
-  fseek(xex, 0x10, SEEK_SET);
-  fseek(xex, get32BitFromXEX(xex) + 0x128, SEEK_SET);
-  fwrite(importCount, sizeof(uint8_t), 4, xex);
-  fwrite(sha1, sizeof(uint8_t), 20, xex);
-}
-
 // So, it would probably be more sensible to endian-swap all of the data back and determine which structure is where
 // to determine the hash, but reading the file we just created is easier.
-void setHeaderSha1(FILE *xex)
+int setHeaderSha1(FILE *xex)
 {
-  fseek(xex, 0x8, SEEK_SET); // Basefile offset
-  uint32_t basefileOffset = get32BitFromXEX(xex);
-  
-  fseek(xex, 0x10, SEEK_SET); // Secinfo offset
-  uint32_t secInfoOffset = get32BitFromXEX(xex);
+    // Get basefile offset
+    if(fseek(xex, 0x8, SEEK_SET) != 0)
+    { return ERR_FILE_READ; }
 
-  uint32_t endOfImageInfo = secInfoOffset + 0x8 + 0x174; // 0x8 == image info offset in security info, 0x174 == length of that
-  uint32_t remainingSize = basefileOffset - endOfImageInfo; // How much data is between end of image info and basefile (we hash that too)
+    uint32_t basefileOffset = get32BitFromXEX(xex);
 
-  // Init sha1 hash
-  struct sha1_ctx shaContext;
-  sha1_init(&shaContext);
+    if(errno != SUCCESS)
+    { return errno; }
 
-  // Hash first part (remainder of headers is done first, then the start)
-  uint8_t remainderOfHeaders[remainingSize];
-  fseek(xex, endOfImageInfo, SEEK_SET);
-  fread(remainderOfHeaders, sizeof(uint8_t), remainingSize, xex);
-  sha1_update(&shaContext, remainingSize, remainderOfHeaders);
-  
-  uint8_t headersStart[secInfoOffset + 0x8]; // Hash from start up to image info (0x8 into security header)
-  fseek(xex, 0, SEEK_SET);
-  
-  fread(headersStart, sizeof(uint8_t), secInfoOffset + 0x8, xex);
-  sha1_update(&shaContext, secInfoOffset + 0x8, headersStart);  
-  
-  // Get final hash
-  uint8_t headerHash[20];
-  sha1_digest(&shaContext, 20, headerHash);
+    // Get secinfo offset
+    if(fseek(xex, 0x10, SEEK_SET) != 0)
+    { return ERR_FILE_READ; }
 
-  // Finally, write it out
-  fseek(xex, secInfoOffset + 0x164, SEEK_SET); // 0x164 == offset in secinfo of header hash
-  fwrite(headerHash, sizeof(uint8_t), 20, xex);
+    uint32_t secInfoOffset = get32BitFromXEX(xex);
+
+    if(errno != SUCCESS)
+    { return errno; }
+
+    uint32_t endOfImageInfo = secInfoOffset + 0x8 + 0x174; // 0x8 == image info offset in security info, 0x174 == length of that
+    uint32_t remainingSize = basefileOffset - endOfImageInfo; // How much data is between end of image info and basefile (we hash that too)
+
+    // Init sha1 hash
+    struct sha1_ctx shaContext;
+    memset(&shaContext, 0, sizeof(shaContext));
+    sha1_init(&shaContext);
+
+    // Hash first part (remainder of headers is done first, then the start)
+    uint8_t *remainderOfHeaders = malloc(remainingSize);
+
+    if(!remainderOfHeaders)
+    { return ERR_OUT_OF_MEM; }
+
+    memset(remainderOfHeaders, 0, remainingSize);
+
+    if(fseek(xex, endOfImageInfo, SEEK_SET) != 0)
+    {
+        nullAndFree((void **)&remainderOfHeaders);
+        return ERR_FILE_READ;
+    }
+
+    if(fread(remainderOfHeaders, 1, remainingSize, xex) != remainingSize)
+    {
+        nullAndFree((void **)&remainderOfHeaders);
+        return ERR_FILE_READ;
+    }
+
+    sha1_update(&shaContext, remainingSize, remainderOfHeaders);
+    nullAndFree((void **)&remainderOfHeaders);
+
+    // Hash from start up to image info (0x8 into security header)
+    uint32_t headersLen = secInfoOffset + 0x8;
+    uint8_t *headersStart = malloc(headersLen);
+
+    if(!headersStart)
+    { return ERR_OUT_OF_MEM; }
+
+    memset(headersStart, 0, headersLen);
+
+    if(fseek(xex, 0, SEEK_SET) != 0)
+    {
+        nullAndFree((void **)&headersStart);
+        return ERR_FILE_READ;
+    }
+
+    if(fread(headersStart, 1, headersLen, xex) != headersLen)
+    {
+        nullAndFree((void **)&headersStart);
+        return ERR_FILE_READ;
+    }
+
+    sha1_update(&shaContext, headersLen, headersStart);
+    nullAndFree((void **)&headersStart);
+
+    // Get final hash
+    uint8_t headerHash[20];
+    memset(headerHash, 0, sizeof(headerHash));
+    sha1_digest(&shaContext, 20, headerHash);
+
+    // Finally, write it out
+    if(fseek(xex, secInfoOffset + 0x164, SEEK_SET) != 0) // 0x164 == offset in secinfo of header hash
+    { return ERR_FILE_READ; }
+
+    if(fwrite(headerHash, 1, 20, xex) != 20)
+    { return ERR_FILE_READ; }
+
+    return SUCCESS;
 }

src/write/headerhash.h

@@ -1,7 +1,7 @@
 // This file is part of SynthXEX, one component of the
 // FreeChainXenon development toolchain
 //
-// Copyright (c) 2024 Aiden Isik
+// Copyright (c) 2024-25 Aiden Isik
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -22,5 +22,4 @@
 #include "../common/crypto.h"
 #include "../common/datastorage.h"
 
-void setImportsSha1(FILE *xex);
-void setHeaderSha1(FILE *xex);
+int setHeaderSha1(FILE *xex);

src/write/writexex.c

@@ -1,7 +1,7 @@
 // This file is part of SynthXEX, one component of the
 // FreeChainXenon development toolchain
 //
-// Copyright (c) 2024 Aiden Isik
+// Copyright (c) 2024-25 Aiden Isik
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -21,134 +21,186 @@
 // TEMPORARY WRITE TESTING
 int writeXEX(struct xexHeader *xexHeader, struct optHeaderEntries *optHeaderEntries, struct secInfoHeader *secInfoHeader, struct optHeaders *optHeaders, struct offsets *offsets, FILE *pe, FILE *xex)
 {
-  // XEX Header
+    // XEX Header
 #ifdef LITTLE_ENDIAN_SYSTEM
-  // Endian-swap XEX header before writing
-  xexHeader->moduleFlags = htonl(xexHeader->moduleFlags);
-  xexHeader->peOffset = htonl(xexHeader->peOffset);
-  xexHeader->secInfoOffset = htonl(xexHeader->secInfoOffset);
-  xexHeader->optHeaderCount = htonl(xexHeader->optHeaderCount);
-#endif
-  
-  fseek(xex, offsets->xexHeader, SEEK_SET);
-  fwrite(xexHeader, sizeof(uint8_t), sizeof(struct xexHeader), xex);
-
-  // Optional header entries
-#ifdef LITTLE_ENDIAN_SYSTEM
-  // Endian swap opt header entries
-  for(uint32_t i = 0; i < optHeaderEntries->count; i++)
-    {
-      optHeaderEntries->optHeaderEntry[i].id = htonl(optHeaderEntries->optHeaderEntry[i].id);
-      optHeaderEntries->optHeaderEntry[i].dataOrOffset = htonl(optHeaderEntries->optHeaderEntry[i].dataOrOffset);
-    }
+    // Endian-swap XEX header before writing
+    xexHeader->moduleFlags = __builtin_bswap32(xexHeader->moduleFlags);
+    xexHeader->peOffset = __builtin_bswap32(xexHeader->peOffset);
+    xexHeader->secInfoOffset = __builtin_bswap32(xexHeader->secInfoOffset);
+    xexHeader->optHeaderCount = __builtin_bswap32(xexHeader->optHeaderCount);
 #endif
 
-  fseek(xex, offsets->optHeaderEntries, SEEK_SET);
+    fseek(xex, offsets->xexHeader, SEEK_SET);
+    fwrite(xexHeader, sizeof(uint8_t), sizeof(struct xexHeader), xex);
 
-  for(int i = 0; i < optHeaderEntries->count; i++)
-    {
-      fwrite(&(optHeaderEntries->optHeaderEntry[i]), sizeof(uint8_t), sizeof(struct optHeaderEntry), xex);
-    }
-
-  free(optHeaderEntries->optHeaderEntry); // Alloc'd in setdata (optheaders). Now we're done with it.
-  
-  // Page descriptors
-  fseek(xex, offsets->secInfoHeader + sizeof(struct secInfoHeader) - sizeof(void*), SEEK_SET);
-  
-  for(int i = 0; i < secInfoHeader->pageDescCount; i++)
-    {
+    // Optional header entries
 #ifdef LITTLE_ENDIAN_SYSTEM
-      secInfoHeader->descriptors[i].sizeAndInfo = htonl(secInfoHeader->descriptors[i].sizeAndInfo);
-#endif
-      
-      // Writing out current descriptor...
-      fwrite(&(secInfoHeader->descriptors[i].sizeAndInfo), sizeof(uint32_t), 0x1, xex);
-      fwrite(secInfoHeader->descriptors[i].sha1, sizeof(uint8_t), 0x14, xex);
-    }
 
-  free(secInfoHeader->descriptors); // calloc'd elsewhere, freeing now
-
-  // Basefile
-  fseek(pe, 0x0, SEEK_SET);
-  fseek(xex, offsets->basefile, SEEK_SET);
-  
-  uint16_t readBufSize = 0x1000; // Reading in 4KiB at a time to avoid excessive memory usage
-  uint8_t *buffer = malloc(readBufSize * sizeof(uint8_t));
-  if(buffer == NULL) {return ERR_OUT_OF_MEM;}
-  
-  for(uint32_t i = 0; i < secInfoHeader->peSize; i += readBufSize)
+    // Endian swap opt header entries
+    for(uint32_t i = 0; i < optHeaderEntries->count; i++)
     {
-      fread(buffer, sizeof(uint8_t), readBufSize, pe);
-      fwrite(buffer, sizeof(uint8_t), readBufSize, xex);
+        optHeaderEntries->optHeaderEntry[i].id = __builtin_bswap32(optHeaderEntries->optHeaderEntry[i].id);
+        optHeaderEntries->optHeaderEntry[i].dataOrOffset = __builtin_bswap32(optHeaderEntries->optHeaderEntry[i].dataOrOffset);
     }
 
-  free(buffer);
-  
-  // Security Info
-#ifdef LITTLE_ENDIAN_SYSTEM
-  // Endian-swap secinfo header
-  secInfoHeader->headerSize = htonl(secInfoHeader->headerSize);
-  secInfoHeader->peSize = htonl(secInfoHeader->peSize);
-  secInfoHeader->imageInfoSize = htonl(secInfoHeader->imageInfoSize);
-  secInfoHeader->imageFlags = htonl(secInfoHeader->imageFlags);
-  secInfoHeader->baseAddr = htonl(secInfoHeader->baseAddr);
-  secInfoHeader->importTableCount = htonl(secInfoHeader->importTableCount);
-  secInfoHeader->exportTableAddr = htonl(secInfoHeader->exportTableAddr);
-  secInfoHeader->gameRegion = htonl(secInfoHeader->gameRegion);
-  secInfoHeader->mediaTypes = htonl(secInfoHeader->mediaTypes);
-  secInfoHeader->pageDescCount = htonl(secInfoHeader->pageDescCount);
 #endif
 
-  fseek(xex, offsets->secInfoHeader, SEEK_SET);
-  fwrite(secInfoHeader, sizeof(uint8_t), sizeof(struct secInfoHeader) - sizeof(void*), xex); // sizeof(void*) == size of page descriptor pointer at end
-  
-  // Optional headers
-  uint32_t currentHeader = 0;
-  
-  if(optHeaders->basefileFormat.size != 0) // If not 0, it has data. Write it.
-    {
-      fseek(xex, offsets->optHeaders[currentHeader], SEEK_SET);
+    fseek(xex, offsets->optHeaderEntries, SEEK_SET);
 
-#ifdef LITTLE_ENDIAN_SYSTEM
-      optHeaders->basefileFormat.size = htonl(optHeaders->basefileFormat.size);
-      optHeaders->basefileFormat.encType = htons(optHeaders->basefileFormat.encType);
-      optHeaders->basefileFormat.compType = htons(optHeaders->basefileFormat.compType);
-      optHeaders->basefileFormat.dataSize = htonl(optHeaders->basefileFormat.dataSize);
-      optHeaders->basefileFormat.zeroSize = htonl(optHeaders->basefileFormat.zeroSize);
-#endif
-      
-      fwrite(&(optHeaders->basefileFormat), sizeof(uint8_t), sizeof(struct basefileFormat), xex);
-      currentHeader++;
-    }
+    for(int i = 0; i < optHeaderEntries->count; i++)
+    { fwrite(&(optHeaderEntries->optHeaderEntry[i]), sizeof(uint8_t), sizeof(struct optHeaderEntry), xex); }
 
-  if(optHeaders->importLibraries.size != 0)
+    // Page descriptors
+    fseek(xex, offsets->secInfoHeader + sizeof(struct secInfoHeader) - sizeof(void *), SEEK_SET);
+
+    // So we don't try to dereference an unaligned pointer
+    struct pageDescriptor *descriptors = secInfoHeader->descriptors;
+
+    for(int i = 0; i < secInfoHeader->pageDescCount; i++)
     {
-      fseek(xex, offsets->optHeaders[currentHeader], SEEK_SET);
-      uint32_t importLibsSize = optHeaders->importLibraries.size; // Need to use this value, so save it before we endian-swap
-      
 #ifdef LITTLE_ENDIAN_SYSTEM
-      optHeaders->importLibraries.size = htonl(optHeaders->importLibraries.size);
+        descriptors[i].sizeAndInfo = __builtin_bswap32(descriptors[i].sizeAndInfo);
 #endif
 
-      fwrite(&(optHeaders->importLibraries.size), sizeof(uint8_t), 0x4, xex);
-      fwrite(optHeaders->importLibraries.data, sizeof(uint8_t), importLibsSize - 0x4, xex);
-      currentHeader++;
+        // Writing out current descriptor...
+        fwrite(&(descriptors[i].sizeAndInfo), sizeof(uint32_t), 0x1, xex);
+        fwrite(descriptors[i].sha1, sizeof(uint8_t), 0x14, xex);
     }
 
-  if(optHeaders->tlsInfo.slotCount != 0)
-    {
-      fseek(xex, offsets->optHeaders[currentHeader], SEEK_SET);
+    // Basefile
+    fseek(pe, 0x0, SEEK_SET);
+    fseek(xex, offsets->basefile, SEEK_SET);
 
+    uint16_t readBufSize = 0x1000; // Reading in 4KiB at a time to avoid excessive memory usage
+    uint8_t *buffer = malloc(readBufSize *sizeof(uint8_t));
+
+    if(buffer == NULL)
+    { return ERR_OUT_OF_MEM; }
+
+    for(uint32_t i = 0; i < secInfoHeader->peSize; i += readBufSize)
+    {
+        size_t bytesToRead = (secInfoHeader->peSize - i < readBufSize)
+                             ? secInfoHeader->peSize - i
+                             : readBufSize;
+
+        size_t readRet = fread(buffer, sizeof(uint8_t), bytesToRead, pe);
+
+        if(readRet != bytesToRead)
+        { break; }
+
+        size_t writeRet = fwrite(buffer, sizeof(uint8_t), readRet, xex);
+
+        if(writeRet != readRet)
+        { break; }
+    }
+
+    nullAndFree((void **)&buffer);
+
+    // Security Info
 #ifdef LITTLE_ENDIAN_SYSTEM
-      optHeaders->tlsInfo.slotCount = htonl(optHeaders->tlsInfo.slotCount);
-      optHeaders->tlsInfo.rawDataAddr = htonl(optHeaders->tlsInfo.rawDataAddr);
-      optHeaders->tlsInfo.dataSize = htonl(optHeaders->tlsInfo.dataSize);
-      optHeaders->tlsInfo.rawDataSize = htonl(optHeaders->tlsInfo.rawDataSize);
+    // Endian-swap secinfo header
+    secInfoHeader->headerSize = __builtin_bswap32(secInfoHeader->headerSize);
+    secInfoHeader->peSize = __builtin_bswap32(secInfoHeader->peSize);
+    secInfoHeader->imageInfoSize = __builtin_bswap32(secInfoHeader->imageInfoSize);
+    secInfoHeader->imageFlags = __builtin_bswap32(secInfoHeader->imageFlags);
+    secInfoHeader->baseAddr = __builtin_bswap32(secInfoHeader->baseAddr);
+    secInfoHeader->importTableCount = __builtin_bswap32(secInfoHeader->importTableCount);
+    secInfoHeader->exportTableAddr = __builtin_bswap32(secInfoHeader->exportTableAddr);
+    secInfoHeader->gameRegion = __builtin_bswap32(secInfoHeader->gameRegion);
+    secInfoHeader->mediaTypes = __builtin_bswap32(secInfoHeader->mediaTypes);
+    secInfoHeader->pageDescCount = __builtin_bswap32(secInfoHeader->pageDescCount);
 #endif
 
-      fwrite(&(optHeaders->tlsInfo), sizeof(uint8_t), sizeof(struct tlsInfo), xex);
+    fseek(xex, offsets->secInfoHeader, SEEK_SET);
+    fwrite(secInfoHeader, sizeof(uint8_t), sizeof(struct secInfoHeader) - sizeof(void *), xex); // sizeof(void*) == size of page descriptor pointer at end
+
+    // Optional headers
+    uint32_t currentHeader = 0;
+
+    if(optHeaders->basefileFormat.size != 0) // If not 0, it has data. Write it.
+    {
+        fseek(xex, offsets->optHeaders[currentHeader], SEEK_SET);
+
+#ifdef LITTLE_ENDIAN_SYSTEM
+        optHeaders->basefileFormat.size = __builtin_bswap32(optHeaders->basefileFormat.size);
+        optHeaders->basefileFormat.encType = __builtin_bswap16(optHeaders->basefileFormat.encType);
+        optHeaders->basefileFormat.compType = __builtin_bswap16(optHeaders->basefileFormat.compType);
+        optHeaders->basefileFormat.dataSize = __builtin_bswap32(optHeaders->basefileFormat.dataSize);
+        optHeaders->basefileFormat.zeroSize = __builtin_bswap32(optHeaders->basefileFormat.zeroSize);
+#endif
+
+        fwrite(&(optHeaders->basefileFormat), sizeof(uint8_t), sizeof(struct basefileFormat), xex);
+        currentHeader++;
     }
-  
-  free(offsets->optHeaders); // Alloc'd in placer.
-  return SUCCESS;
+
+    if(optHeaders->importLibraries.size != 0)
+    {
+        fseek(xex, offsets->optHeaders[currentHeader], SEEK_SET);
+
+        // Write the main header first
+
+        // Use these to avoid dereferencing an unaligned pointer
+        char *nameTable = optHeaders->importLibraries.nameTable;
+
+        // Save the values we need to use before byteswapping
+        uint32_t nameTableSize = optHeaders->importLibraries.nameTableSize;
+        uint32_t tableCount = optHeaders->importLibraries.tableCount;
+
+#ifdef LITTLE_ENDIAN_SYSTEM
+        optHeaders->importLibraries.size = __builtin_bswap32(optHeaders->importLibraries.size);
+        optHeaders->importLibraries.nameTableSize = __builtin_bswap32(optHeaders->importLibraries.nameTableSize);
+        optHeaders->importLibraries.tableCount = __builtin_bswap32(optHeaders->importLibraries.tableCount);
+#endif
+
+        fwrite(&(optHeaders->importLibraries), sizeof(uint8_t), sizeof(struct importLibraries) - (2 * sizeof(void *)), xex);
+        fwrite(nameTable, sizeof(uint8_t), nameTableSize, xex);
+
+#ifdef LITTLE_ENDIAN_SYSTEM
+        // Restore the table count (we require it to free the import libraries struct later)
+        optHeaders->importLibraries.tableCount = tableCount;
+#endif
+
+        // Now write each import table
+        // Use this to avoid dereferencing an unaligned pointer
+        struct importTable *importTables = optHeaders->importLibraries.importTables;
+
+        for(uint32_t i = 0; i < tableCount; i++)
+        {
+            uint32_t *addresses = importTables[i].addresses; // Use this to avoid dereferencing an unaligned pointer
+            uint16_t addressCount = importTables[i].addressCount;
+
+#ifdef LITTLE_ENDIAN_SYSTEM
+            importTables[i].size = __builtin_bswap32(importTables[i].size);
+            importTables[i].unknown = __builtin_bswap32(importTables[i].unknown);
+            importTables[i].targetVer = __builtin_bswap32(importTables[i].targetVer);
+            importTables[i].minimumVer = __builtin_bswap32(importTables[i].minimumVer);
+            importTables[i].addressCount = __builtin_bswap16(importTables[i].addressCount);
+
+            for(uint16_t j = 0; j < addressCount; j++)
+            { addresses[j] = __builtin_bswap32(addresses[j]); }
+
+#endif
+
+            fwrite(&(importTables[i]), sizeof(uint8_t), sizeof(struct importTable) - sizeof(void *), xex);
+            fwrite(addresses, sizeof(uint32_t), addressCount, xex);
+        }
+
+        currentHeader++;
+    }
+
+    if(optHeaders->tlsInfo.slotCount != 0)
+    {
+        fseek(xex, offsets->optHeaders[currentHeader], SEEK_SET);
+
+#ifdef LITTLE_ENDIAN_SYSTEM
+        optHeaders->tlsInfo.slotCount = __builtin_bswap32(optHeaders->tlsInfo.slotCount);
+        optHeaders->tlsInfo.rawDataAddr = __builtin_bswap32(optHeaders->tlsInfo.rawDataAddr);
+        optHeaders->tlsInfo.dataSize = __builtin_bswap32(optHeaders->tlsInfo.dataSize);
+        optHeaders->tlsInfo.rawDataSize = __builtin_bswap32(optHeaders->tlsInfo.rawDataSize);
+#endif
+
+        fwrite(&(optHeaders->tlsInfo), sizeof(uint8_t), sizeof(struct tlsInfo), xex);
+    }
+
+    return SUCCESS;
 }

synthxex.nix

@@ -0,0 +1,22 @@
+{ stdenv
+, cmake
+, lib
+, ninja
+, pkg-config
+}:
+
+stdenv.mkDerivation {
+  name = "synthxex";
+  allowSubstitutes = false;
+  src = ./.;
+  nativeBuildInputs = [ cmake pkg-config ninja ];
+
+  postUnpack = ''
+    chmod -R +w $sourceRoot
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -v synthxex $out/bin/synthxex
+  '';
+}

synthxex.scm

@@ -0,0 +1,104 @@
+;;; This file is the git repo bundled package definition of SynthXEX for GNU Guix.
+;;; To build natively (reproducibly), run "guix time-machine -C channels.scm -- build -f synthxex.scm" in the project root.
+;;; To cross compile (reproducibly), run "guix time-machine -C channels.scm -- build -f synthxex.scm --target=<target triplet>" in the project root.
+;;; To install, swap "build" for "package" in the above commands
+;;;
+;;; Copyright (c) 2025 Aiden Isik
+;;;
+;;; This program is free software: you can redistribute it and/or modify
+;;; it under the terms of the GNU Affero General Public License as published by
+;;; the Free Software Foundation, either version 3 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU Affero General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Affero General Public License
+;;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+
+;;; Specify the modules we need for this package definition
+(define-module (synthxex)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module (guix licenses)
+  #:use-module (guix build-system cmake)
+  #:use-module (git)
+  #:use-module (gnu packages version-control)
+  #:use-module (ice-9 regex))
+
+
+;;; Hardcoded fallback version in case we can't rely on git
+(define synthxex-fallback-version "v0.0.5")
+
+
+;;; Determine the version of SynthXEX we are building
+;;; Returns: version string of SynthXEX being built
+(define (get-synthxex-version)
+  (cond
+   ((< (libgit2-init!) 0)
+    (display "Warning: failed to initialise libgit2. Using fallback version number.\n")
+    synthxex-fallback-version)
+
+   (else
+    (let ((synthxex-dir (dirname (current-filename))))
+      (cond
+       ((eq? (openable-repository? synthxex-dir) #f)
+	(display "Note: not a git repository. Using fallback version number.\n")
+	(libgit2-shutdown!)
+	synthxex-fallback-version)
+
+       (else
+	(let ((synthxex-repo (repository-open synthxex-dir)))
+	  (cond
+	   ((repository-empty? synthxex-repo)
+	    (display "Warning: git repository is empty. Using fallback version number.\n")
+	    (libgit2-shutdown!)
+	    synthxex-fallback-version)
+
+	   ((repository-shallow? synthxex-repo)
+	    (display "Warning: git repository is shalllow. Using fallback version number.\n")
+	    (libgit2-shutdown!)
+	    synthxex-fallback-version)
+
+	   ((repository-bare? synthxex-repo)
+	    (display "Warning: git repository is bare. Using fallback version number.\n")
+	    (libgit2-shutdown!)
+	    synthxex-fallback-version)
+
+	   (else
+	    (let* ((synthxex-desc-opts (make-describe-options #:strategy 'tags)) ; Equivalent to git describe --tags
+		   (synthxex-description (describe-workdir synthxex-repo synthxex-desc-opts))
+		   (synthxex-format-opts (make-describe-format-options #:dirty-suffix "-dirty")) ; Equivalent to git describe --dirty
+		   (synthxex-version-str (describe-format synthxex-description synthxex-format-opts)))
+	      (libgit2-shutdown!) ; Whatever the result of the regex comparison, we're done with git. Clean up here.
+
+	      (cond ; Check if the version string returned is valid. If it isn't, use the fallback.
+	       ((eq? (string-match "^v[0-9]+\\.[0-9]+\\.[0-9]+(-[0-9]+-g[0-9a-f]+(-dirty)?)?$" synthxex-version-str) #f)
+		(display "Warning: version string is invalid. Using fallback version number.\n")
+		synthxex-fallback-version)
+
+	       (else
+		synthxex-version-str))))))))))))
+
+
+;;; Define the SynthXEX package
+(define-public synthxex
+  (package
+   (name "synthxex")
+   (version (get-synthxex-version))
+   (source (local-file (dirname (current-filename)) #:recursive? #t))
+   (build-system cmake-build-system)
+   (arguments
+    '(#:build-type "Debug" ; This is the version of the package definition bundled in the git repo, so we should build a debug version
+      #:tests? #f)) ; We don't have a test suite
+   (native-inputs
+    (list git)) ; Needed for version number generation by cmake
+   (synopsis "XEX2 generator for the Xbox 360 games console")
+   (description "SynthXEX is an XEX2 generator, the final component of development toolchains for the Xbox 360 games console.")
+   (home-page "https://git.aidenisik.scot/FreeChainXenon/SynthXEX")
+   (license agpl3+)))
+
+synthxex