From 42fa3955d88a6fe76e542f73d4d6d8f0a67f96a2 Mon Sep 17 00:00:00 2001
From: Martin Michelsen <fuzziqersoftware+g@gmail.com>
Date: Sun, 23 Apr 2023 22:31:48 -0700
Subject: [PATCH] fix .nsk file size mismatches

---
 src/PSOEncryption.hh                |   7 ++++++-
 system/blueburst/keys/default.nsk   | Bin 4169 -> 4176 bytes
 system/blueburst/keys/jsd1.nsk      | Bin 4169 -> 4176 bytes
 system/blueburst/keys/mocb1.nsk     | Bin 4169 -> 4176 bytes
 system/blueburst/keys/tethealla.nsk | Bin 4169 -> 4176 bytes
 system/blueburst/keys/tfs1.nsk      | Bin 4169 -> 4176 bytes
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/PSOEncryption.hh b/src/PSOEncryption.hh
index 4cc7d1ba..e324dba5 100644
--- a/src/PSOEncryption.hh
+++ b/src/PSOEncryption.hh
@@ -114,7 +114,12 @@ public:
     } __attribute__((packed));
     InitialKeys initial_keys;
     PrivateKeys private_keys;
-    Subtype subtype;
+    // This field only really needs to be one byte, but annoyingly, some
+    // compilers pad this structure to a longer alignment, presumably because
+    // the unions above contain structures with 32-bit alignment. To prevent
+    // this structure's size from not matching the .nsk files' sizes, we use
+    // an unnecessarily large size for this field.
+    le_uint64_t subtype;
   } __attribute__((packed));
 
   PSOBBEncryption(const KeyFile& key, const void* seed, size_t seed_size);
diff --git a/system/blueburst/keys/default.nsk b/system/blueburst/keys/default.nsk
index 24b675c8248486e726b9512ef64982dc50e01e5c..ea840287aaca5d4ffae35e449cecbdd420ff56c1 100644
GIT binary patch
delta 15
ScmX@9a6w^%rvN(x1ONae*aGSR

delta 7
Ocmcbha8hA|rvLyAmIC7d

diff --git a/system/blueburst/keys/jsd1.nsk b/system/blueburst/keys/jsd1.nsk
index 4053a87142323c613262a0fd4b146e409e8c97b9..558f4af4642a109794bcd72034f3f8ed3649caa1 100644
GIT binary patch
delta 15
ScmX@9a6w^%rvN(x1ONae*aGSR

delta 7
Ocmcbha8hA|rvLyAmIC7d

diff --git a/system/blueburst/keys/mocb1.nsk b/system/blueburst/keys/mocb1.nsk
index e77a6ba3c9241e5b09ca54bfa95ecaab6017e82b..8052884d47eddefadea73c5ae63452bb2ff17831 100644
GIT binary patch
delta 15
ScmX@9a6w^%rvN(x1ONae*aGSR

delta 7
Ocmcbha8hA|rvLyAmIC7d

diff --git a/system/blueburst/keys/tethealla.nsk b/system/blueburst/keys/tethealla.nsk
index e5e1b5843098efd52ebe0e1f12d2f33ec2a90639..5477fee81b219e3cb0c645465cea9f8df4d843a7 100644
GIT binary patch
delta 15
ScmX@9a6w^%rvN(x1ONae*aGSR

delta 7
Ocmcbha8hA|rvLyAmIC7d

diff --git a/system/blueburst/keys/tfs1.nsk b/system/blueburst/keys/tfs1.nsk
index de83d6ee3b0b434ce84b8538c90a1482aa43ed04..265aa12ff5772e1392563f1fd9e23d29f49d4922 100755
GIT binary patch
delta 15
ScmX@9a6w^%rvN(x1ONae*aGSR

delta 7
Ocmcbha8hA|rvLyAmIC7d