diff --git a/CHOVY-JUAN/CHOVY-JUAN.csproj b/CHOVY-JUAN/CHOVY-JUAN.csproj
deleted file mode 100644
index 6edb603..0000000
--- a/CHOVY-JUAN/CHOVY-JUAN.csproj
+++ /dev/null
@@ -1,309 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {78933B2F-C754-4904-804E-D3932536471C}
- Library
- Properties
- CHOVY_JUAN
- CHOVY-JUAN
- v4.5
- 512
- true
-
-
-
- true
- bin\x86\Debug\
- DEBUG;TRACE
- full
- x86
- 7.3
- prompt
- MinimumRecommendedRules.ruleset
-
-
- bin\x86\Release\
- TRACE
- true
- pdbonly
- x86
- 7.3
- prompt
- MinimumRecommendedRules.ruleset
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CHOVY-JUAN/Properties/AssemblyInfo.cs b/CHOVY-JUAN/Properties/AssemblyInfo.cs
deleted file mode 100644
index 23503a0..0000000
--- a/CHOVY-JUAN/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DiscUtils.Streams")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("cf8c37c3-69f4-40ef-a3a1-4d1dcc332058")]
\ No newline at end of file
diff --git a/CHOVY-KIRK/aes.c b/CHOVY-KIRK/aes.c
new file mode 100644
index 0000000..e1b50c6
--- /dev/null
+++ b/CHOVY-KIRK/aes.c
@@ -0,0 +1,1463 @@
+/* $OpenBSD: rijndael.c,v 1.19 2008/06/09 07:49:45 djm Exp $ */
+
+/**
+ * rijndael-alg-fst.c
+ *
+ * @version 3.0 (December 2000)
+ *
+ * Optimised ANSI C code for the Rijndael cipher (now AES)
+ *
+ * @author Vincent Rijmen
+ * @author Antoon Bosselaers
+ * @author Paulo Barreto
+ *
+ * This code is hereby placed in the public domain.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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.
+ */
+
+#include
+#include
+#include
+
+#include "aes.h"
+
+#undef FULL_UNROLL
+
+//CMAC GLOBS
+#define AES_128 0
+unsigned char const_Rb[16] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87
+};
+unsigned char const_Zero[16] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+//END
+
+/*
+Te0[x] = S [x].[02, 01, 01, 03];
+Te1[x] = S [x].[03, 02, 01, 01];
+Te2[x] = S [x].[01, 03, 02, 01];
+Te3[x] = S [x].[01, 01, 03, 02];
+Te4[x] = S [x].[01, 01, 01, 01];
+
+Td0[x] = Si[x].[0e, 09, 0d, 0b];
+Td1[x] = Si[x].[0b, 0e, 09, 0d];
+Td2[x] = Si[x].[0d, 0b, 0e, 09];
+Td3[x] = Si[x].[09, 0d, 0b, 0e];
+Td4[x] = Si[x].[01, 01, 01, 01];
+*/
+
+static const u32 Te0[256] = {
+ 0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
+ 0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
+ 0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
+ 0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
+ 0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
+ 0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
+ 0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
+ 0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
+ 0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
+ 0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
+ 0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
+ 0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
+ 0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
+ 0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
+ 0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
+ 0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
+ 0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
+ 0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
+ 0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
+ 0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
+ 0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
+ 0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
+ 0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
+ 0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
+ 0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
+ 0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
+ 0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
+ 0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
+ 0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
+ 0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
+ 0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
+ 0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
+ 0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
+ 0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
+ 0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
+ 0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
+ 0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
+ 0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
+ 0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
+ 0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
+ 0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
+ 0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
+ 0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
+ 0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
+ 0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
+ 0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
+ 0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
+ 0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
+ 0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
+ 0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
+ 0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
+ 0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
+ 0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
+ 0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
+ 0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
+ 0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
+ 0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
+ 0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
+ 0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
+ 0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
+ 0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
+ 0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
+ 0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
+ 0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
+};
+
+static const u32 Te1[256] = {
+ 0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
+ 0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
+ 0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
+ 0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
+ 0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
+ 0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
+ 0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
+ 0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
+ 0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
+ 0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
+ 0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
+ 0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
+ 0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
+ 0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
+ 0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
+ 0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
+ 0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
+ 0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
+ 0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
+ 0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
+ 0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
+ 0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
+ 0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
+ 0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
+ 0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
+ 0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
+ 0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
+ 0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
+ 0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
+ 0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
+ 0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
+ 0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
+ 0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
+ 0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
+ 0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
+ 0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
+ 0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
+ 0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
+ 0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
+ 0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
+ 0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
+ 0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
+ 0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
+ 0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
+ 0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
+ 0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
+ 0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
+ 0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
+ 0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
+ 0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
+ 0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
+ 0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
+ 0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
+ 0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
+ 0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
+ 0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
+ 0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
+ 0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
+ 0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
+ 0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
+ 0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
+ 0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
+ 0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
+ 0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
+};
+
+static const u32 Te2[256] = {
+ 0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
+ 0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
+ 0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
+ 0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
+ 0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
+ 0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
+ 0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
+ 0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
+ 0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
+ 0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
+ 0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
+ 0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
+ 0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
+ 0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
+ 0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
+ 0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
+ 0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
+ 0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
+ 0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
+ 0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
+ 0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
+ 0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
+ 0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
+ 0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
+ 0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
+ 0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
+ 0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
+ 0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
+ 0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
+ 0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
+ 0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
+ 0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
+ 0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
+ 0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
+ 0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
+ 0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
+ 0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
+ 0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
+ 0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
+ 0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
+ 0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
+ 0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
+ 0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
+ 0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
+ 0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
+ 0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
+ 0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
+ 0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
+ 0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
+ 0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
+ 0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
+ 0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
+ 0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
+ 0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
+ 0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
+ 0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
+ 0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
+ 0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
+ 0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
+ 0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
+ 0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
+ 0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
+ 0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
+ 0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
+};
+
+static const u32 Te3[256] = {
+ 0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
+ 0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
+ 0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
+ 0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
+ 0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
+ 0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
+ 0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
+ 0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
+ 0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
+ 0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
+ 0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
+ 0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
+ 0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
+ 0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
+ 0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
+ 0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
+ 0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
+ 0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
+ 0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
+ 0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
+ 0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
+ 0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
+ 0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
+ 0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
+ 0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
+ 0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
+ 0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
+ 0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
+ 0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
+ 0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
+ 0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
+ 0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
+ 0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
+ 0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
+ 0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
+ 0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
+ 0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
+ 0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
+ 0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
+ 0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
+ 0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
+ 0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
+ 0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
+ 0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
+ 0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
+ 0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
+ 0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
+ 0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
+ 0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
+ 0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
+ 0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
+ 0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
+ 0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
+ 0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
+ 0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
+ 0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
+ 0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
+ 0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
+ 0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
+ 0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
+ 0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
+ 0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
+ 0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
+ 0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
+};
+
+static const u32 Te4[256] = {
+ 0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU,
+ 0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U,
+ 0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU,
+ 0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U,
+ 0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU,
+ 0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U,
+ 0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU,
+ 0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U,
+ 0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U,
+ 0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU,
+ 0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U,
+ 0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U,
+ 0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U,
+ 0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU,
+ 0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U,
+ 0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U,
+ 0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU,
+ 0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U,
+ 0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U,
+ 0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U,
+ 0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU,
+ 0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU,
+ 0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U,
+ 0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU,
+ 0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU,
+ 0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U,
+ 0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU,
+ 0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U,
+ 0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU,
+ 0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U,
+ 0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U,
+ 0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U,
+ 0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU,
+ 0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U,
+ 0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU,
+ 0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U,
+ 0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU,
+ 0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U,
+ 0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U,
+ 0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU,
+ 0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU,
+ 0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU,
+ 0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U,
+ 0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U,
+ 0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU,
+ 0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U,
+ 0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU,
+ 0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U,
+ 0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU,
+ 0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U,
+ 0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU,
+ 0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU,
+ 0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U,
+ 0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU,
+ 0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U,
+ 0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU,
+ 0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U,
+ 0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U,
+ 0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U,
+ 0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU,
+ 0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU,
+ 0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U,
+ 0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU,
+ 0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U,
+};
+
+static const u32 Td0[256] = {
+ 0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
+ 0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
+ 0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
+ 0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
+ 0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
+ 0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
+ 0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
+ 0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
+ 0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
+ 0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
+ 0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
+ 0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
+ 0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
+ 0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
+ 0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
+ 0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
+ 0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
+ 0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
+ 0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
+ 0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
+ 0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
+ 0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
+ 0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
+ 0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
+ 0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
+ 0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
+ 0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
+ 0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
+ 0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
+ 0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
+ 0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
+ 0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
+ 0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
+ 0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
+ 0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
+ 0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
+ 0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
+ 0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
+ 0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
+ 0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
+ 0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
+ 0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
+ 0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
+ 0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
+ 0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
+ 0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
+ 0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
+ 0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
+ 0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
+ 0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
+ 0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
+ 0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
+ 0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
+ 0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
+ 0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
+ 0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
+ 0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
+ 0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
+ 0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
+ 0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
+ 0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
+ 0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
+ 0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
+ 0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
+};
+
+static const u32 Td1[256] = {
+ 0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
+ 0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
+ 0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
+ 0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
+ 0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
+ 0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
+ 0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
+ 0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
+ 0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
+ 0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
+ 0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
+ 0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
+ 0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
+ 0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
+ 0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
+ 0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
+ 0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
+ 0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
+ 0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
+ 0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
+ 0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
+ 0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
+ 0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
+ 0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
+ 0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
+ 0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
+ 0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
+ 0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
+ 0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
+ 0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
+ 0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
+ 0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
+ 0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
+ 0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
+ 0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
+ 0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
+ 0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
+ 0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
+ 0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
+ 0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
+ 0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
+ 0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
+ 0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
+ 0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
+ 0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
+ 0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
+ 0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
+ 0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
+ 0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
+ 0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
+ 0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
+ 0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
+ 0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
+ 0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
+ 0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
+ 0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
+ 0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
+ 0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
+ 0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
+ 0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
+ 0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
+ 0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
+ 0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
+ 0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
+};
+
+static const u32 Td2[256] = {
+ 0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
+ 0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
+ 0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
+ 0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
+ 0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
+ 0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
+ 0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
+ 0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
+ 0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
+ 0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
+ 0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
+ 0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
+ 0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
+ 0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
+ 0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
+ 0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
+ 0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
+ 0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
+ 0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
+ 0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
+ 0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
+ 0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
+ 0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
+ 0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
+ 0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
+ 0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
+ 0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
+ 0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
+ 0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
+ 0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
+ 0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
+ 0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
+ 0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
+ 0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
+ 0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
+ 0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
+ 0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
+ 0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
+ 0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
+ 0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
+ 0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
+ 0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
+ 0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
+ 0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
+ 0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
+ 0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
+ 0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
+ 0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
+ 0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
+ 0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
+ 0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
+ 0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
+ 0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
+ 0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
+ 0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
+ 0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
+ 0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
+ 0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
+ 0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
+ 0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
+ 0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
+ 0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
+ 0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
+ 0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
+};
+
+static const u32 Td3[256] = {
+ 0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
+ 0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
+ 0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
+ 0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
+ 0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
+ 0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
+ 0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
+ 0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
+ 0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
+ 0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
+ 0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
+ 0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
+ 0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
+ 0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
+ 0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
+ 0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
+ 0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
+ 0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
+ 0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
+ 0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
+ 0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
+ 0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
+ 0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
+ 0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
+ 0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
+ 0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
+ 0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
+ 0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
+ 0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
+ 0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
+ 0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
+ 0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
+ 0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
+ 0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
+ 0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
+ 0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
+ 0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
+ 0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
+ 0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
+ 0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
+ 0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
+ 0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
+ 0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
+ 0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
+ 0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
+ 0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
+ 0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
+ 0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
+ 0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
+ 0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
+ 0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
+ 0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
+ 0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
+ 0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
+ 0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
+ 0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
+ 0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
+ 0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
+ 0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
+ 0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
+ 0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
+ 0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
+ 0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
+ 0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
+};
+
+static const u32 Td4[256] = {
+ 0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U,
+ 0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U,
+ 0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU,
+ 0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU,
+ 0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U,
+ 0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U,
+ 0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U,
+ 0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU,
+ 0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U,
+ 0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU,
+ 0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU,
+ 0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU,
+ 0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U,
+ 0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U,
+ 0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U,
+ 0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U,
+ 0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U,
+ 0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U,
+ 0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU,
+ 0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U,
+ 0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U,
+ 0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU,
+ 0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U,
+ 0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U,
+ 0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U,
+ 0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU,
+ 0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U,
+ 0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U,
+ 0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU,
+ 0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U,
+ 0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U,
+ 0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU,
+ 0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U,
+ 0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU,
+ 0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU,
+ 0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U,
+ 0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U,
+ 0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U,
+ 0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U,
+ 0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU,
+ 0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U,
+ 0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U,
+ 0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU,
+ 0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU,
+ 0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU,
+ 0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U,
+ 0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU,
+ 0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U,
+ 0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U,
+ 0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U,
+ 0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U,
+ 0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU,
+ 0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U,
+ 0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU,
+ 0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU,
+ 0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU,
+ 0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU,
+ 0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U,
+ 0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU,
+ 0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U,
+ 0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU,
+ 0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U,
+ 0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U,
+ 0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU,
+};
+
+static const u32 rcon[] = {
+ 0x01000000, 0x02000000, 0x04000000, 0x08000000,
+ 0x10000000, 0x20000000, 0x40000000, 0x80000000,
+ 0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+};
+
+#define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3]))
+#define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >> 8); (ct)[3] = (u8)(st); }
+
+/**
+ * Expand the cipher key into the encryption key schedule.
+ *
+ * @return the number of rounds for the given cipher key size.
+ */
+int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits)
+{
+ int i = 0;
+ u32 temp;
+
+ rk[0] = GETU32(cipherKey );
+ rk[1] = GETU32(cipherKey + 4);
+ rk[2] = GETU32(cipherKey + 8);
+ rk[3] = GETU32(cipherKey + 12);
+ if (keyBits == 128) {
+ for (;;) {
+ temp = rk[3];
+ rk[4] = rk[0] ^
+ (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
+ (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^
+ (Te4[(temp ) & 0xff] & 0x0000ff00) ^
+ (Te4[(temp >> 24) ] & 0x000000ff) ^
+ rcon[i];
+ rk[5] = rk[1] ^ rk[4];
+ rk[6] = rk[2] ^ rk[5];
+ rk[7] = rk[3] ^ rk[6];
+ if (++i == 10) {
+ return 10;
+ }
+ rk += 4;
+ }
+ }
+ rk[4] = GETU32(cipherKey + 16);
+ rk[5] = GETU32(cipherKey + 20);
+ if (keyBits == 192) {
+ for (;;) {
+ temp = rk[ 5];
+ rk[ 6] = rk[ 0] ^
+ (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
+ (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^
+ (Te4[(temp ) & 0xff] & 0x0000ff00) ^
+ (Te4[(temp >> 24) ] & 0x000000ff) ^
+ rcon[i];
+ rk[ 7] = rk[ 1] ^ rk[ 6];
+ rk[ 8] = rk[ 2] ^ rk[ 7];
+ rk[ 9] = rk[ 3] ^ rk[ 8];
+ if (++i == 8) {
+ return 12;
+ }
+ rk[10] = rk[ 4] ^ rk[ 9];
+ rk[11] = rk[ 5] ^ rk[10];
+ rk += 6;
+ }
+ }
+ rk[6] = GETU32(cipherKey + 24);
+ rk[7] = GETU32(cipherKey + 28);
+ if (keyBits == 256) {
+ for (;;) {
+ temp = rk[ 7];
+ rk[ 8] = rk[ 0] ^
+ (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
+ (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^
+ (Te4[(temp ) & 0xff] & 0x0000ff00) ^
+ (Te4[(temp >> 24) ] & 0x000000ff) ^
+ rcon[i];
+ rk[ 9] = rk[ 1] ^ rk[ 8];
+ rk[10] = rk[ 2] ^ rk[ 9];
+ rk[11] = rk[ 3] ^ rk[10];
+ if (++i == 7) {
+ return 14;
+ }
+ temp = rk[11];
+ rk[12] = rk[ 4] ^
+ (Te4[(temp >> 24) ] & 0xff000000) ^
+ (Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^
+ (Te4[(temp >> 8) & 0xff] & 0x0000ff00) ^
+ (Te4[(temp ) & 0xff] & 0x000000ff);
+ rk[13] = rk[ 5] ^ rk[12];
+ rk[14] = rk[ 6] ^ rk[13];
+ rk[15] = rk[ 7] ^ rk[14];
+ rk += 8;
+ }
+ }
+ return 0;
+}
+
+/**
+ * Expand the cipher key into the decryption key schedule.
+ *
+ * @return the number of rounds for the given cipher key size.
+ */
+int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits)
+{
+ int Nr, i, j;
+ u32 temp;
+
+ /* expand the cipher key: */
+ Nr = rijndaelKeySetupEnc(rk, cipherKey, keyBits);
+
+ /* invert the order of the round keys: */
+ for (i = 0, j = 4*Nr; i < j; i += 4, j -= 4) {
+ temp = rk[i ]; rk[i ] = rk[j ]; rk[j ] = temp;
+ temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
+ temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
+ temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+ }
+ /* apply the inverse MixColumn transform to all round keys but the first and the last: */
+ for (i = 1; i < Nr; i++) {
+ rk += 4;
+ rk[0] =
+ Td0[Te4[(rk[0] >> 24) ] & 0xff] ^
+ Td1[Te4[(rk[0] >> 16) & 0xff] & 0xff] ^
+ Td2[Te4[(rk[0] >> 8) & 0xff] & 0xff] ^
+ Td3[Te4[(rk[0] ) & 0xff] & 0xff];
+ rk[1] =
+ Td0[Te4[(rk[1] >> 24) ] & 0xff] ^
+ Td1[Te4[(rk[1] >> 16) & 0xff] & 0xff] ^
+ Td2[Te4[(rk[1] >> 8) & 0xff] & 0xff] ^
+ Td3[Te4[(rk[1] ) & 0xff] & 0xff];
+ rk[2] =
+ Td0[Te4[(rk[2] >> 24) ] & 0xff] ^
+ Td1[Te4[(rk[2] >> 16) & 0xff] & 0xff] ^
+ Td2[Te4[(rk[2] >> 8) & 0xff] & 0xff] ^
+ Td3[Te4[(rk[2] ) & 0xff] & 0xff];
+ rk[3] =
+ Td0[Te4[(rk[3] >> 24) ] & 0xff] ^
+ Td1[Te4[(rk[3] >> 16) & 0xff] & 0xff] ^
+ Td2[Te4[(rk[3] >> 8) & 0xff] & 0xff] ^
+ Td3[Te4[(rk[3] ) & 0xff] & 0xff];
+ }
+ return Nr;
+}
+
+void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16],
+ u8 ct[16])
+{
+ u32 s0, s1, s2, s3, t0, t1, t2, t3;
+#ifndef FULL_UNROLL
+ int r;
+#endif /* ?FULL_UNROLL */
+
+ /*
+ * map byte array block to cipher state
+ * and add initial round key:
+ */
+ s0 = GETU32(pt ) ^ rk[0];
+ s1 = GETU32(pt + 4) ^ rk[1];
+ s2 = GETU32(pt + 8) ^ rk[2];
+ s3 = GETU32(pt + 12) ^ rk[3];
+#ifdef FULL_UNROLL
+ /* round 1: */
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
+ /* round 2: */
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
+ /* round 3: */
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
+ /* round 4: */
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
+ /* round 5: */
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
+ /* round 6: */
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
+ /* round 7: */
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
+ /* round 8: */
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
+ /* round 9: */
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
+ if (Nr > 10) {
+ /* round 10: */
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
+ /* round 11: */
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
+ if (Nr > 12) {
+ /* round 12: */
+ s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
+ s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
+ s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
+ s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
+ /* round 13: */
+ t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
+ t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
+ t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
+ t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
+ }
+ }
+ rk += Nr << 2;
+#else /* !FULL_UNROLL */
+ /*
+ * Nr - 1 full rounds:
+ */
+ r = Nr >> 1;
+ for (;;) {
+ t0 =
+ Te0[(s0 >> 24) ] ^
+ Te1[(s1 >> 16) & 0xff] ^
+ Te2[(s2 >> 8) & 0xff] ^
+ Te3[(s3 ) & 0xff] ^
+ rk[4];
+ t1 =
+ Te0[(s1 >> 24) ] ^
+ Te1[(s2 >> 16) & 0xff] ^
+ Te2[(s3 >> 8) & 0xff] ^
+ Te3[(s0 ) & 0xff] ^
+ rk[5];
+ t2 =
+ Te0[(s2 >> 24) ] ^
+ Te1[(s3 >> 16) & 0xff] ^
+ Te2[(s0 >> 8) & 0xff] ^
+ Te3[(s1 ) & 0xff] ^
+ rk[6];
+ t3 =
+ Te0[(s3 >> 24) ] ^
+ Te1[(s0 >> 16) & 0xff] ^
+ Te2[(s1 >> 8) & 0xff] ^
+ Te3[(s2 ) & 0xff] ^
+ rk[7];
+
+ rk += 8;
+ if (--r == 0) {
+ break;
+ }
+
+ s0 =
+ Te0[(t0 >> 24) ] ^
+ Te1[(t1 >> 16) & 0xff] ^
+ Te2[(t2 >> 8) & 0xff] ^
+ Te3[(t3 ) & 0xff] ^
+ rk[0];
+ s1 =
+ Te0[(t1 >> 24) ] ^
+ Te1[(t2 >> 16) & 0xff] ^
+ Te2[(t3 >> 8) & 0xff] ^
+ Te3[(t0 ) & 0xff] ^
+ rk[1];
+ s2 =
+ Te0[(t2 >> 24) ] ^
+ Te1[(t3 >> 16) & 0xff] ^
+ Te2[(t0 >> 8) & 0xff] ^
+ Te3[(t1 ) & 0xff] ^
+ rk[2];
+ s3 =
+ Te0[(t3 >> 24) ] ^
+ Te1[(t0 >> 16) & 0xff] ^
+ Te2[(t1 >> 8) & 0xff] ^
+ Te3[(t2 ) & 0xff] ^
+ rk[3];
+ }
+#endif /* ?FULL_UNROLL */
+ /*
+ * apply last round and
+ * map cipher state to byte array block:
+ */
+ s0 =
+ (Te4[(t0 >> 24) ] & 0xff000000) ^
+ (Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
+ (Te4[(t2 >> 8) & 0xff] & 0x0000ff00) ^
+ (Te4[(t3 ) & 0xff] & 0x000000ff) ^
+ rk[0];
+ PUTU32(ct , s0);
+ s1 =
+ (Te4[(t1 >> 24) ] & 0xff000000) ^
+ (Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
+ (Te4[(t3 >> 8) & 0xff] & 0x0000ff00) ^
+ (Te4[(t0 ) & 0xff] & 0x000000ff) ^
+ rk[1];
+ PUTU32(ct + 4, s1);
+ s2 =
+ (Te4[(t2 >> 24) ] & 0xff000000) ^
+ (Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
+ (Te4[(t0 >> 8) & 0xff] & 0x0000ff00) ^
+ (Te4[(t1 ) & 0xff] & 0x000000ff) ^
+ rk[2];
+ PUTU32(ct + 8, s2);
+ s3 =
+ (Te4[(t3 >> 24) ] & 0xff000000) ^
+ (Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
+ (Te4[(t1 >> 8) & 0xff] & 0x0000ff00) ^
+ (Te4[(t2 ) & 0xff] & 0x000000ff) ^
+ rk[3];
+ PUTU32(ct + 12, s3);
+}
+
+static void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16],
+ u8 pt[16])
+{
+ u32 s0, s1, s2, s3, t0, t1, t2, t3;
+#ifndef FULL_UNROLL
+ int r;
+#endif /* ?FULL_UNROLL */
+
+ /*
+ * map byte array block to cipher state
+ * and add initial round key:
+ */
+ s0 = GETU32(ct ) ^ rk[0];
+ s1 = GETU32(ct + 4) ^ rk[1];
+ s2 = GETU32(ct + 8) ^ rk[2];
+ s3 = GETU32(ct + 12) ^ rk[3];
+#ifdef FULL_UNROLL
+ /* round 1: */
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7];
+ /* round 2: */
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
+ /* round 3: */
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
+ /* round 4: */
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
+ /* round 5: */
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
+ /* round 6: */
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
+ /* round 7: */
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
+ /* round 8: */
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
+ /* round 9: */
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
+ if (Nr > 10) {
+ /* round 10: */
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
+ /* round 11: */
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
+ if (Nr > 12) {
+ /* round 12: */
+ s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
+ s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
+ s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
+ s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
+ /* round 13: */
+ t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
+ t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
+ t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
+ t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
+ }
+ }
+ rk += Nr << 2;
+#else /* !FULL_UNROLL */
+ /*
+ * Nr - 1 full rounds:
+ */
+ r = Nr >> 1;
+ for (;;) {
+ t0 =
+ Td0[(s0 >> 24) ] ^
+ Td1[(s3 >> 16) & 0xff] ^
+ Td2[(s2 >> 8) & 0xff] ^
+ Td3[(s1 ) & 0xff] ^
+ rk[4];
+ t1 =
+ Td0[(s1 >> 24) ] ^
+ Td1[(s0 >> 16) & 0xff] ^
+ Td2[(s3 >> 8) & 0xff] ^
+ Td3[(s2 ) & 0xff] ^
+ rk[5];
+ t2 =
+ Td0[(s2 >> 24) ] ^
+ Td1[(s1 >> 16) & 0xff] ^
+ Td2[(s0 >> 8) & 0xff] ^
+ Td3[(s3 ) & 0xff] ^
+ rk[6];
+ t3 =
+ Td0[(s3 >> 24) ] ^
+ Td1[(s2 >> 16) & 0xff] ^
+ Td2[(s1 >> 8) & 0xff] ^
+ Td3[(s0 ) & 0xff] ^
+ rk[7];
+
+ rk += 8;
+ if (--r == 0) {
+ break;
+ }
+
+ s0 =
+ Td0[(t0 >> 24) ] ^
+ Td1[(t3 >> 16) & 0xff] ^
+ Td2[(t2 >> 8) & 0xff] ^
+ Td3[(t1 ) & 0xff] ^
+ rk[0];
+ s1 =
+ Td0[(t1 >> 24) ] ^
+ Td1[(t0 >> 16) & 0xff] ^
+ Td2[(t3 >> 8) & 0xff] ^
+ Td3[(t2 ) & 0xff] ^
+ rk[1];
+ s2 =
+ Td0[(t2 >> 24) ] ^
+ Td1[(t1 >> 16) & 0xff] ^
+ Td2[(t0 >> 8) & 0xff] ^
+ Td3[(t3 ) & 0xff] ^
+ rk[2];
+ s3 =
+ Td0[(t3 >> 24) ] ^
+ Td1[(t2 >> 16) & 0xff] ^
+ Td2[(t1 >> 8) & 0xff] ^
+ Td3[(t0 ) & 0xff] ^
+ rk[3];
+ }
+#endif /* ?FULL_UNROLL */
+ /*
+ * apply last round and
+ * map cipher state to byte array block:
+ */
+ s0 =
+ (Td4[(t0 >> 24) ] & 0xff000000) ^
+ (Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
+ (Td4[(t2 >> 8) & 0xff] & 0x0000ff00) ^
+ (Td4[(t1 ) & 0xff] & 0x000000ff) ^
+ rk[0];
+ PUTU32(pt , s0);
+ s1 =
+ (Td4[(t1 >> 24) ] & 0xff000000) ^
+ (Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
+ (Td4[(t3 >> 8) & 0xff] & 0x0000ff00) ^
+ (Td4[(t2 ) & 0xff] & 0x000000ff) ^
+ rk[1];
+ PUTU32(pt + 4, s1);
+ s2 =
+ (Td4[(t2 >> 24) ] & 0xff000000) ^
+ (Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
+ (Td4[(t0 >> 8) & 0xff] & 0x0000ff00) ^
+ (Td4[(t3 ) & 0xff] & 0x000000ff) ^
+ rk[2];
+ PUTU32(pt + 8, s2);
+ s3 =
+ (Td4[(t3 >> 24) ] & 0xff000000) ^
+ (Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
+ (Td4[(t1 >> 8) & 0xff] & 0x0000ff00) ^
+ (Td4[(t0 ) & 0xff] & 0x000000ff) ^
+ rk[3];
+ PUTU32(pt + 12, s3);
+}
+
+/* setup key context for encryption only */
+int rijndael_set_key_enc_only(rijndael_ctx *ctx, const u8 *key, int bits)
+{
+ int rounds;
+
+ rounds = rijndaelKeySetupEnc(ctx->ek, key, bits);
+ if (rounds == 0)
+ return -1;
+
+ ctx->Nr = rounds;
+ ctx->enc_only = 1;
+
+ return 0;
+}
+
+/* setup key context for both encryption and decryption */
+int rijndael_set_key(rijndael_ctx *ctx, const u8 *key, int bits)
+{
+ int rounds;
+
+ rounds = rijndaelKeySetupEnc(ctx->ek, key, bits);
+ if (rounds == 0)
+ return -1;
+ if (rijndaelKeySetupDec(ctx->dk, key, bits) != rounds)
+ return -1;
+
+ ctx->Nr = rounds;
+ ctx->enc_only = 0;
+
+ return 0;
+}
+
+void rijndael_decrypt(rijndael_ctx *ctx, const u8 *src, u8 *dst)
+{
+ rijndaelDecrypt(ctx->dk, ctx->Nr, src, dst);
+}
+
+void rijndael_encrypt(rijndael_ctx *ctx, const u8 *src, u8 *dst)
+{
+ rijndaelEncrypt(ctx->ek, ctx->Nr, src, dst);
+}
+
+int AES_set_key(AES_ctx *ctx, const u8 *key, int bits)
+{
+ return rijndael_set_key((rijndael_ctx *)ctx, key, bits);
+}
+
+void AES_decrypt(AES_ctx *ctx, const u8 *src, u8 *dst)
+{
+ rijndaelDecrypt(ctx->dk, ctx->Nr, src, dst);
+}
+
+void AES_encrypt(AES_ctx *ctx, const u8 *src, u8 *dst)
+{
+ rijndaelEncrypt(ctx->ek, ctx->Nr, src, dst);
+}
+
+void xor_128(unsigned char *a, unsigned char *b, unsigned char *out)
+{
+ int i;
+ for (i=0;i<16; i++)
+ {
+ out[i] = a[i] ^ b[i];
+ }
+}
+
+//No IV support!
+void AES_cbc_encrypt(AES_ctx *ctx, u8 *src, u8 *dst, int size)
+{
+ u8 block_buff[16];
+
+ int i;
+ for(i = 0; i < size; i+=16)
+ {
+ //step 1: copy block to dst
+ memcpy(dst, src, 16);
+ //step 2: XOR with previous block
+ if(i) xor_128(dst, block_buff, dst);
+ //step 3: encrypt the block -> it land in block buffer
+ AES_encrypt(ctx, dst, block_buff);
+ //step 4: copy back the encrypted block to destination
+ memcpy(dst, block_buff, 16);
+
+ dst += 16;
+ src += 16;
+ }
+}
+
+void AES_cbc_decrypt(AES_ctx *ctx, u8 *src, u8 *dst, int size)
+{
+ u8 block_buff[16];
+ u8 block_buff_previous[16];
+ int i;
+
+ memcpy(block_buff, src, 16);
+ memcpy(block_buff_previous, src, 16);
+ AES_decrypt(ctx, src, dst);
+
+ dst += 16;
+ src += 16;
+
+ for(i = 16; i < size; i+=16)
+ {
+ //step1: backup current block for next block decrypt
+ memcpy(block_buff, src, 16);
+ //step2: copy current block to destination
+ memcpy(dst, src, 16);
+ //step3: decrypt current buffer in place
+ AES_decrypt(ctx, dst, dst);
+ //step4: XOR current buffer with previous buffer
+ xor_128(dst, block_buff_previous, dst);
+ //step5: swap buffers
+ memcpy(block_buff_previous, block_buff, 16);
+
+ dst += 16;
+ src += 16;
+ }
+}
+
+/* AES-CMAC Generation Function */
+void leftshift_onebit(unsigned char *input,unsigned char *output)
+{
+ int i;
+ unsigned char overflow = 0;
+
+ for ( i=15; i>=0; i-- )
+ {
+ output[i] = input[i] << 1;
+ output[i] |= overflow;
+ overflow = (input[i] & 0x80)?1:0;
+ }
+}
+
+void generate_subkey(AES_ctx *ctx, unsigned char *K1, unsigned char *K2)
+{
+ unsigned char L[16];
+ unsigned char Z[16];
+ unsigned char tmp[16];
+ int i;
+
+ for ( i=0; i<16; i++ ) Z[i] = 0;
+
+
+ AES_encrypt(ctx, Z, L);
+
+ if ( (L[0] & 0x80) == 0 ) /* If MSB(L) = 0, then K1 = L << 1 */
+ {
+ leftshift_onebit(L,K1);
+ } else { /* Else K1 = ( L << 1 ) (+) Rb */
+ leftshift_onebit(L,tmp);
+ xor_128(tmp,const_Rb,K1);
+ }
+
+ if ( (K1[0] & 0x80) == 0 )
+ {
+ leftshift_onebit(K1,K2);
+ } else {
+ leftshift_onebit(K1,tmp);
+ xor_128(tmp,const_Rb,K2);
+ }
+}
+
+void padding (unsigned char *lastb, unsigned char *pad, int length)
+{
+ int j;
+
+ /* original last block */
+ for ( j=0; j<16; j++ )
+ {
+ if ( j < length )
+ {
+ pad[j] = lastb[j];
+ } else if ( j == length ) {
+ pad[j] = 0x80;
+ } else {
+ pad[j] = 0x00;
+ }
+ }
+}
+
+void AES_CMAC (AES_ctx *ctx, unsigned char *input, int length, unsigned char *mac)
+{
+ unsigned char X[16],Y[16], M_last[16], padded[16];
+ unsigned char K1[16], K2[16];
+ int n, i, flag;
+ generate_subkey(ctx,K1,K2);
+
+ n = (length+15) / 16; /* n is number of rounds */
+
+ if (n == 0)
+ {
+ n = 1;
+ flag = 0;
+ } else {
+ if ((length%16) == 0) { /* last block is a complete block */
+ flag = 1;
+ } else { /* last block is not complete block */
+ flag = 0;
+ }
+
+ }
+
+ if (flag) { /* last block is complete block */
+ xor_128(&input[16*(n-1)],K1,M_last);
+ } else {
+ padding(&input[16*(n-1)],padded,length%16);
+ xor_128(padded,K2,M_last);
+ }
+
+ for (i=0; i<16; i++) X[i] = 0;
+ for (i=0; iek, ctx->Nr, src, dst);
+}
+
+void rijndael_decrypt(AES_ctx* ctx, const u8* src, u8* dst)
+{
+ rijndaelDecrypt(ctx->dk, ctx->Nr, src, dst);
+}
+
+
void AES_decrypt(AES_ctx *ctx, const u8 *src, u8 *dst)
{
return rijndaelDecrypt(ctx->dk, ctx->Nr, src, dst);
diff --git a/CHOVY-KIRK/crypto.h b/CHOVY-KIRK/crypto.h
index b6be8c8..45c83bf 100644
--- a/CHOVY-KIRK/crypto.h
+++ b/CHOVY-KIRK/crypto.h
@@ -23,12 +23,16 @@ typedef struct
u32 dk[4*(AES_MAXROUNDS + 1)]; /* decrypt key schedule */
} AES_ctx;
+
int AES_set_key(AES_ctx *ctx, const u8 *key, int bits);
void AES_encrypt(AES_ctx *ctx, const u8 *src, u8 *dst);
void AES_decrypt(AES_ctx *ctx, const u8 *src, u8 *dst);
void AES_cbc_encrypt(AES_ctx *ctx, u8 *src, u8 *dst, int size);
void AES_cbc_decrypt(AES_ctx *ctx, u8 *src, u8 *dst, int size);
void AES_CMAC(AES_ctx *ctx, unsigned char *input, int length, unsigned char *mac);
+void rijndael_encrypt(AES_ctx* ctx, const u8* src, u8* dst);
+void rijndael_decrypt(AES_ctx* ctx, const u8* src, u8* dst);
+int rijndael_set_key(AES_ctx* ctx, const u8* key, int bits);
typedef struct SHA1Context
{
diff --git a/CHOVY-KIRK/ec.c b/CHOVY-KIRK/ec.c
index 8e51338..39fdf82 100644
--- a/CHOVY-KIRK/ec.c
+++ b/CHOVY-KIRK/ec.c
@@ -196,6 +196,46 @@ static void point_mul(struct point *d, u8 *a, struct point *b)
}
}
+static void generate_ecdsa_norandom(u8* outR, u8* outS, u8* k, u8* hash)
+{
+ u8 e[21];
+ u8 kk[21];
+ u8 m[21];
+ u8 R[21];
+ u8 S[21];
+ u8 minv[21];
+ struct point mG;
+
+ e[0] = 0; R[0] = 0; S[0] = 0;
+ memcpy(e + 1, hash, 20);
+ bn_reduce(e, ec_N, 21);
+
+ kirk_CMD14(m + 1, 20);
+ m[0] = 0;
+
+ point_mul(&mG, m, &ec_G);
+ point_from_mon(&mG);
+ R[0] = 0;
+ elt_copy(R + 1, mG.x);
+
+ bn_copy(kk, k, 21);
+ bn_reduce(kk, ec_N, 21);
+ bn_to_mon(m, ec_N, 21);
+ bn_to_mon(e, ec_N, 21);
+ bn_to_mon(R, ec_N, 21);
+ bn_to_mon(kk, ec_N, 21);
+
+ bn_mon_mul(S, R, kk, ec_N, 21);
+ bn_add(kk, S, e, ec_N, 21);
+ bn_mon_inv(minv, m, ec_N, 21);
+ bn_mon_mul(S, minv, kk, ec_N, 21);
+
+ bn_from_mon(R, ec_N, 21);
+ bn_from_mon(S, ec_N, 21);
+ memcpy(outR, R + 1, 0x20);
+ memcpy(outS, S + 1, 0x20);
+}
+
static void generate_ecdsa(u8 *R, u8 *S, u8 *k, u8 *hash, u8 *random)
{
u8 e[20];
@@ -337,12 +377,25 @@ int ecdsa_verify(u8 *hash, u8 *R, u8 *S)
{
return check_ecdsa(&ec_Q, R, S, hash);
}
+void ecdsa_sign_norandom(u8* hash, u8* R, u8* S)
+{
+ generate_ecdsa_norandom(R, S, ec_k, hash);
+}
void ecdsa_sign(u8 *hash, u8 *R, u8 *S, u8 *random)
{
generate_ecdsa(R, S, ec_k, hash, random);
}
+void ec_pub_mult(u8* k, u8* Q)
+{
+ struct point ec_temp;
+ point_mul(&ec_temp, k, &ec_Q);
+ point_from_mon(&ec_temp);
+ memcpy(Q, ec_temp.x, 20);
+ memcpy(Q + 20, ec_temp.y, 20);
+}
+
/*************************************************************/
// calculate the random and private key from signs with same r value
diff --git a/CHOVY-KIRK/ecdsa.h b/CHOVY-KIRK/ecdsa.h
index a424f03..9662fef 100644
--- a/CHOVY-KIRK/ecdsa.h
+++ b/CHOVY-KIRK/ecdsa.h
@@ -21,6 +21,7 @@ void ecdsa_set_pub(u8 *Qx, u8 *Qy);
void ecdsa_set_priv(u8 *k);
int ecdsa_verify(u8 *hash, u8 *R, u8 *S);
void ecdsa_sign(u8 *hash, u8 *R, u8 *S, u8 *random);
+void ecdsa_sign_norandom(u8* hash, u8* R, u8* S);
void ecdsa_sign_fixed(u8 *hash, u8 *fixed_m, u8 *fixed_r, u8 *S);
void ecdsa_find_m_k(u8 *sig_r, u8 *sig_s1, u8 *hash1, u8 *sig_s2, u8 *hash2, u8 *N, u8 *ret_m, u8 *ret_k);
diff --git a/CHOVY-KIRK/kirk_engine.c b/CHOVY-KIRK/kirk_engine.c
index 5da6b79..0a032fb 100644
--- a/CHOVY-KIRK/kirk_engine.c
+++ b/CHOVY-KIRK/kirk_engine.c
@@ -56,9 +56,11 @@ u8 priv_key_edata[20] = {0xe5,0xc4,0xd0,0xa8,0x24,0x9a,0x6f,0x27,0xe5,0xe0,0xc9,
u8 kirk1_key[16] = {0x98, 0xC9, 0x40, 0x97, 0x5C, 0x1D, 0x10, 0xE8, 0x7F, 0xE6, 0x0E, 0xA3, 0xFD, 0x03, 0xA8, 0xBA};
// AES key for kirk4/7
+u8 kirk7_key02[] = {0xB8, 0x13, 0xC3, 0x5E, 0xC6, 0x44, 0x41, 0xE3, 0xDC, 0x3C, 0x16, 0xF5, 0xB4, 0x5E, 0x64, 0x84};
u8 kirk7_key03[] = {0x98, 0x02, 0xC4, 0xE6, 0xEC, 0x9E, 0x9E, 0x2F, 0xFC, 0x63, 0x4C, 0xE4, 0x2F, 0xBB, 0x46, 0x68};
u8 kirk7_key04[] = {0x99, 0x24, 0x4C, 0xD2, 0x58, 0xF5, 0x1B, 0xCB, 0xB0, 0x61, 0x9C, 0xA7, 0x38, 0x30, 0x07, 0x5F};
u8 kirk7_key05[] = {0x02, 0x25, 0xD7, 0xBA, 0x63, 0xEC, 0xB9, 0x4A, 0x9D, 0x23, 0x76, 0x01, 0xB3, 0xF6, 0xAC, 0x17};
+u8 kirk7_key07[] = {0x76, 0x36, 0x8B, 0x43, 0x8F, 0x77, 0xD8, 0x7E, 0xFE, 0x5F, 0xB6, 0x11, 0x59, 0x39, 0x88, 0x5C};
u8 kirk7_key0C[] = {0x84, 0x85, 0xC8, 0x48, 0x75, 0x08, 0x43, 0xBC, 0x9B, 0x9A, 0xEC, 0xA7, 0x9C, 0x7F, 0x60, 0x18};
u8 kirk7_key0D[] = {0xB5, 0xB1, 0x6E, 0xDE, 0x23, 0xA9, 0x7B, 0x0E, 0xA1, 0x7C, 0xDB, 0xA2, 0xDC, 0xDE, 0xC4, 0x6E};
u8 kirk7_key0E[] = {0xC8, 0x71, 0xFD, 0xB3, 0xBC, 0xC5, 0xD2, 0xF2, 0xE2, 0xD7, 0x72, 0x9D, 0xDF, 0x82, 0x68, 0x82};
@@ -69,6 +71,7 @@ u8 kirk7_key12[] = {0x5D, 0xC7, 0x11, 0x39, 0xD0, 0x19, 0x38, 0xBC, 0x02, 0x7F,
u8 kirk7_key38[] = {0x12, 0x46, 0x8D, 0x7E, 0x1C, 0x42, 0x20, 0x9B, 0xBA, 0x54, 0x26, 0x83, 0x5E, 0xB0, 0x33, 0x03};
u8 kirk7_key39[] = {0xC4, 0x3B, 0xB6, 0xD6, 0x53, 0xEE, 0x67, 0x49, 0x3E, 0xA9, 0x5F, 0xBC, 0x0C, 0xED, 0x6F, 0x8A};
u8 kirk7_key3A[] = {0x2C, 0xC3, 0xCF, 0x8C, 0x28, 0x78, 0xA5, 0xA6, 0x63, 0xE2, 0xAF, 0x2D, 0x71, 0x5E, 0x86, 0xBA};
+u8 kirk7_key44[] = {0x7D, 0xF4, 0x92, 0x65, 0xE3, 0xFA, 0xD6, 0x78, 0xD6, 0xFE, 0x78, 0xAD, 0xBB, 0x3D, 0xFB, 0x63};
u8 kirk7_key4B[] = {0x0C, 0xFD, 0x67, 0x9A, 0xF9, 0xB4, 0x72, 0x4F, 0xD7, 0x8D, 0xD6, 0xE9, 0x96, 0x42, 0x28, 0x8B}; //1.xx game eboot.bin
u8 kirk7_key53[] = {0xAF, 0xFE, 0x8E, 0xB1, 0x3D, 0xD1, 0x7E, 0xD8, 0x0A, 0x61, 0x24, 0x1C, 0x95, 0x92, 0x56, 0xB6};
u8 kirk7_key57[] = {0x1C, 0x9B, 0xC4, 0x90, 0xE3, 0x06, 0x64, 0x81, 0xFA, 0x59, 0xFD, 0xB6, 0x00, 0xBB, 0x28, 0x70};
@@ -76,6 +79,8 @@ u8 kirk7_key5D[] = {0x11, 0x5A, 0x5D, 0x20, 0xD5, 0x3A, 0x8D, 0xD3, 0x9C, 0xC5,
u8 kirk7_key63[] = {0x9C, 0x9B, 0x13, 0x72, 0xF8, 0xC6, 0x40, 0xCF, 0x1C, 0x62, 0xF5, 0xD5, 0x92, 0xDD, 0xB5, 0x82};
u8 kirk7_key64[] = {0x03, 0xB3, 0x02, 0xE8, 0x5F, 0xF3, 0x81, 0xB1, 0x3B, 0x8D, 0xAA, 0x2A, 0x90, 0xFF, 0x5E, 0x61};
+// AES Key for kirk16
+u8 kirk16_key[0x10] = { 0x47, 0x5E, 0x09, 0xF4, 0xA2, 0x37, 0xDA, 0x9B, 0xEF, 0xFF, 0x3B, 0xC0, 0x77, 0x14, 0x3D, 0x8A };
/* ------------------------- INTERNAL STUFF ------------------------- */
@@ -97,6 +102,186 @@ int is_kirk_initialized = 0;
/* KIRK initial */
/*****************************************************************************/
+// Internal variables
+typedef struct kirk16_data
+{
+ u8 fuseid[8];
+ u8 mesh[0x40];
+} kirk16_data;
+
+u32 g_fuse90;
+u32 g_fuse94;
+
+AES_ctx aes_kirk1;
+u8 PRNG_DATA[0x14];
+
+
+// Internal functions
+u8* kirk_4_7_get_key(int key_type)
+{
+ switch (key_type)
+ {
+ case(0x02): return kirk7_key02; break;
+ case(0x03): return kirk7_key03; break;
+ case(0x04): return kirk7_key04; break;
+ case(0x05): return kirk7_key05; break;
+ case(0x07): return kirk7_key07; break;
+ case(0x0C): return kirk7_key0C; break;
+ case(0x0D): return kirk7_key0D; break;
+ case(0x0E): return kirk7_key0E; break;
+ case(0x0F): return kirk7_key0F; break;
+ case(0x10): return kirk7_key10; break;
+ case(0x11): return kirk7_key11; break;
+ case(0x12): return kirk7_key12; break;
+ case(0x38): return kirk7_key38; break;
+ case(0x39): return kirk7_key39; break;
+ case(0x3A): return kirk7_key3A; break;
+ case(0x44): return kirk7_key44; break;
+ case(0x4B): return kirk7_key4B; break;
+ case(0x53): return kirk7_key53; break;
+ case(0x57): return kirk7_key57; break;
+ case(0x5D): return kirk7_key5D; break;
+ case(0x63): return kirk7_key63; break;
+ case(0x64): return kirk7_key64; break;
+ default: return (u8*)KIRK_INVALID_SIZE; break;
+ }
+}
+
+__declspec(dllexport) void decrypt_kirk16_private(u8* dA_out, u8* dA_enc)
+{
+ int i, k;
+ kirk16_data keydata;
+ u8 subkey_1[0x10], subkey_2[0x10];
+ AES_ctx aes_ctx;
+
+ keydata.fuseid[7] = g_fuse90 & 0xFF;
+ keydata.fuseid[6] = (g_fuse90 >> 8) & 0xFF;
+ keydata.fuseid[5] = (g_fuse90 >> 16) & 0xFF;
+ keydata.fuseid[4] = (g_fuse90 >> 24) & 0xFF;
+ keydata.fuseid[3] = g_fuse94 & 0xFF;
+ keydata.fuseid[2] = (g_fuse94 >> 8) & 0xFF;
+ keydata.fuseid[1] = (g_fuse94 >> 16) & 0xFF;
+ keydata.fuseid[0] = (g_fuse94 >> 24) & 0xFF;
+
+ /* set encryption key */
+ rijndael_set_key(&aes_ctx, kirk16_key, 128);
+
+ /* set the subkeys */
+ for (i = 0; i < 0x10; i++)
+ {
+ /* set to the fuseid */
+ subkey_2[i] = subkey_1[i] = keydata.fuseid[i % 8];
+ }
+
+ /* do aes crypto */
+ for (i = 0; i < 3; i++)
+ {
+ /* encrypt + decrypt */
+ rijndael_encrypt(&aes_ctx, subkey_1, subkey_1);
+ rijndael_decrypt(&aes_ctx, subkey_2, subkey_2);
+ }
+
+ /* set new key */
+ rijndael_set_key(&aes_ctx, subkey_1, 128);
+
+ /* now lets make the key mesh */
+ for (i = 0; i < 3; i++)
+ {
+ /* do encryption in group of 3 */
+ for (k = 0; k < 3; k++)
+ {
+ /* crypto */
+ rijndael_encrypt(&aes_ctx, subkey_2, subkey_2);
+ }
+
+ /* copy to out block */
+ memcpy(&keydata.mesh[i * 0x10], subkey_2, 0x10);
+ }
+
+ /* set the key to the mesh */
+ rijndael_set_key(&aes_ctx, &keydata.mesh[0x20], 128);
+
+ /* do the encryption routines for the aes key */
+ for (i = 0; i < 2; i++)
+ {
+ /* encrypt the data */
+ rijndael_encrypt(&aes_ctx, &keydata.mesh[0x10], &keydata.mesh[0x10]);
+ }
+
+ /* set the key to that mesh shit */
+ rijndael_set_key(&aes_ctx, &keydata.mesh[0x10], 128);
+
+ /* cbc decrypt the dA */
+ AES_cbc_decrypt((AES_ctx*)&aes_ctx, dA_enc, dA_out, 0x20);
+}
+
+__declspec(dllexport) void encrypt_kirk16_private(u8* dA_out, u8* dA_dec)
+{
+ int i, k;
+ kirk16_data keydata;
+ u8 subkey_1[0x10], subkey_2[0x10];
+ AES_ctx aes_ctx;
+
+ keydata.fuseid[7] = g_fuse90 & 0xFF;
+ keydata.fuseid[6] = (g_fuse90 >> 8) & 0xFF;
+ keydata.fuseid[5] = (g_fuse90 >> 16) & 0xFF;
+ keydata.fuseid[4] = (g_fuse90 >> 24) & 0xFF;
+ keydata.fuseid[3] = g_fuse94 & 0xFF;
+ keydata.fuseid[2] = (g_fuse94 >> 8) & 0xFF;
+ keydata.fuseid[1] = (g_fuse94 >> 16) & 0xFF;
+ keydata.fuseid[0] = (g_fuse94 >> 24) & 0xFF;
+ /* set encryption key */
+ rijndael_set_key(&aes_ctx, kirk16_key, 128);
+
+ /* set the subkeys */
+ for (i = 0; i < 0x10; i++)
+ {
+ /* set to the fuseid */
+ subkey_2[i] = subkey_1[i] = keydata.fuseid[i % 8];
+ }
+
+ /* do aes crypto */
+ for (i = 0; i < 3; i++)
+ {
+ /* encrypt + decrypt */
+ rijndael_encrypt(&aes_ctx, subkey_1, subkey_1);
+ rijndael_decrypt(&aes_ctx, subkey_2, subkey_2);
+ }
+
+ /* set new key */
+ rijndael_set_key(&aes_ctx, subkey_1, 128);
+
+ /* now lets make the key mesh */
+ for (i = 0; i < 3; i++)
+ {
+ /* do encryption in group of 3 */
+ for (k = 0; k < 3; k++)
+ {
+ /* crypto */
+ rijndael_encrypt(&aes_ctx, subkey_2, subkey_2);
+ }
+
+ /* copy to out block */
+ memcpy(&keydata.mesh[i * 0x10], subkey_2, 0x10);
+ }
+
+ /* set the key to the mesh */
+ rijndael_set_key(&aes_ctx, &keydata.mesh[0x20], 128);
+
+ /* do the encryption routines for the aes key */
+ for (i = 0; i < 2; i++)
+ {
+ /* encrypt the data */
+ rijndael_encrypt(&aes_ctx, &keydata.mesh[0x10], &keydata.mesh[0x10]);
+ }
+
+ /* set the key to that mesh shit */
+ rijndael_set_key(&aes_ctx, &keydata.mesh[0x10], 128);
+
+ /* cbc encrypt the dA */
+ AES_cbc_encrypt((AES_ctx*)&aes_ctx, dA_dec, dA_out, 0x20);
+}
+
__declspec(dllexport) int kirk_init()
{
@@ -106,6 +291,53 @@ __declspec(dllexport) int kirk_init()
return KIRK_OPERATION_SUCCESS;
}
+int kirk_init2(u8* rnd_seed, u32 seed_size, u32 fuseid_90, u32 fuseid_94)
+{
+ u8 temp[0x104];
+
+ KIRK_SHA1_HEADER* header = (KIRK_SHA1_HEADER*)temp;
+
+ // Another randomly selected data for a "key" to add to each randomization
+ u8 key[0x10] = { 0x07, 0xAB, 0xEF, 0xF8, 0x96, 0x8C, 0xF3, 0xD6, 0x14, 0xE0, 0xEB, 0xB2, 0x9D, 0x8B, 0x4E, 0x74 };
+ u32 curtime;
+
+ //Set PRNG_DATA initially, otherwise use what ever uninitialized data is in the buffer
+ if (seed_size > 0) {
+ u8* seedbuf;
+ KIRK_SHA1_HEADER* seedheader;;
+ seedbuf = (u8*)malloc(seed_size + 4);
+ seedheader = (KIRK_SHA1_HEADER*)seedbuf;
+ seedheader->data_size = seed_size;
+ kirk_CMD11(PRNG_DATA, seedbuf, seed_size + 4);
+ free(seedbuf);
+ }
+
+ memcpy(temp + 4, PRNG_DATA, 0x14);
+
+ // This uses the standard C time function for portability.
+ curtime = (u32)time(0);
+ temp[0x18] = curtime & 0xFF;
+ temp[0x19] = (curtime >> 8) & 0xFF;
+ temp[0x1A] = (curtime >> 16) & 0xFF;
+ temp[0x1B] = (curtime >> 24) & 0xFF;
+ memcpy(&temp[0x1C], key, 0x10);
+
+ // This leaves the remainder of the 0x100 bytes in temp to whatever remains on the stack
+ // in an uninitialized state. This should add unpredicableness to the results as well
+ header->data_size = 0x100;
+ kirk_CMD11(PRNG_DATA, temp, 0x104);
+
+ //Set Fuse ID
+ g_fuse90 = fuseid_90;
+ g_fuse94 = fuseid_94;
+
+ // Set KIRK1 main key
+ AES_set_key(&aes_kirk1, kirk1_key, 128);
+
+ is_kirk_initialized = 1;
+ return 0;
+}
+
/*****************************************************************************/
/* KIRK 0x01 */
/*****************************************************************************/
@@ -239,36 +471,6 @@ int kirk_CMD1(void* outbuff, void* inbuff, int size)
/* KIRK 0x04 0x05 0x06 0x07 0x08 0x09 */
/*****************************************************************************/
-
-u8* kirk_4_7_get_key(int key_type)
-{
- switch(key_type)
- {
- case(0x03): return kirk7_key03; break;
- case(0x04): return kirk7_key04; break;
- case(0x05): return kirk7_key05; break;
- case(0x0C): return kirk7_key0C; break;
- case(0x0D): return kirk7_key0D; break;
- case(0x0E): return kirk7_key0E; break;
- case(0x0F): return kirk7_key0F; break;
- case(0x10): return kirk7_key10; break;
- case(0x11): return kirk7_key11; break;
- case(0x12): return kirk7_key12; break;
- case(0x38): return kirk7_key38; break;
- case(0x39): return kirk7_key39; break;
- case(0x3A): return kirk7_key3A; break;
- case(0x4B): return kirk7_key4B; break;
- case(0x53): return kirk7_key53; break;
- case(0x57): return kirk7_key57; break;
- case(0x5D): return kirk7_key5D; break;
- case(0x63): return kirk7_key63; break;
- case(0x64): return kirk7_key64; break;
- default:
- return NULL;
- //need to get the real error code for that, placeholder now :)
- }
-}
-
int kirk_CMD4(void* outbuff, void* inbuff, int size)
{
KIRK_AES128CBC_HEADER *header;
@@ -433,6 +635,24 @@ int kirk_CMD12(void *outbuff, int size)
/* KIRK 0x0E */
/*****************************************************************************/
+int kirk_CMD13(u8* outbuff, int outsize, u8* inbuff, int insize)
+{
+ u8 k[0x15];
+ KIRK_CMD13_BUFFER* pointmult = (KIRK_CMD13_BUFFER*)inbuff;
+ k[0] = 0;
+
+ if (outsize != 0x28) return KIRK_INVALID_SIZE;
+ if (insize != 0x3C) return KIRK_INVALID_SIZE;
+
+ ecdsa_set_curve(&ecdsa_app);
+ ecdsa_set_pub((u8*)pointmult->public_key.x, (u8*)pointmult->public_key.y);
+ memcpy(k + 1, pointmult->multiplier, 0x14);
+ ec_pub_mult(k, outbuff);
+
+ return KIRK_OPERATION_SUCCESS;
+}
+
+
int kirk_CMD14(void* outbuff, int size)
{
int i;
@@ -448,25 +668,65 @@ int kirk_CMD14(void* outbuff, int size)
return KIRK_OPERATION_SUCCESS;
}
+
+int kirk_CMD16(u8* outbuff, int outsize, u8* inbuff, int insize)
+{
+ u8 dec_private[0x20];
+ KIRK_CMD16_BUFFER* signbuf = (KIRK_CMD16_BUFFER*)inbuff;
+ ECDSA_SIG* sig = (ECDSA_SIG*)outbuff;
+
+ if (insize != 0x34) return KIRK_INVALID_SIZE;
+ if (outsize != 0x28) return KIRK_INVALID_SIZE;
+
+ decrypt_kirk16_private(dec_private, signbuf->enc_private);
+
+ // Clear out the padding for safety
+ memset(&dec_private[0x14], 0, 0xC);
+
+ ecdsa_set_curve(&ecdsa_app);
+ ecdsa_set_priv(dec_private);
+ ecdsa_sign_norandom(signbuf->message_hash, sig->r, sig->s);
+
+ return KIRK_OPERATION_SUCCESS;
+}
+
+int kirk_CMD17(u8* inbuff, int insize)
+{
+ KIRK_CMD17_BUFFER* sig = (KIRK_CMD17_BUFFER*)inbuff;
+
+ if (insize != 0x64) return KIRK_INVALID_SIZE;
+
+ ecdsa_set_curve(&ecdsa_app);
+ ecdsa_set_pub(sig->public_key.x, sig->public_key.y);
+
+ if (ecdsa_verify(sig->message_hash, sig->signature.r, sig->signature.s)) {
+ return KIRK_OPERATION_SUCCESS;
+ }
+ else {
+ return KIRK_SIG_CHECK_INVALID;
+ }
+}
+
+
/*****************************************************************************/
/* sceUtilsBufferCopyWithRange */
/*****************************************************************************/
-int sceUtilsBufferCopyWithRange(void* outbuff, int outsize, void* inbuff, int insize, int cmd)
+__declspec(dllexport) int sceUtilsBufferCopyWithRange(u8* outbuff, int outsize, u8* inbuff, int insize, int cmd)
{
- switch(cmd)
- {
- case KIRK_CMD_DECRYPT_PRIVATE:
- if(insize % 16) return SUBCWR_NOT_16_ALGINED;
- int ret = kirk_CMD1(outbuff, inbuff, insize);
- if(ret == KIRK_HEADER_HASH_INVALID) return SUBCWR_HEADER_HASH_INVALID;
- return ret;
- break;
- case KIRK_CMD_ENCRYPT_IV_0: return kirk_CMD4(outbuff, inbuff, insize); break;
- case KIRK_CMD_DECRYPT_IV_0: return kirk_CMD7(outbuff, inbuff, insize); break;
- case KIRK_CMD_PRIV_SIGN_CHECK: return kirk_CMD10(inbuff, insize); break;
- case KIRK_CMD_SHA1_HASH: return kirk_CMD11(outbuff, inbuff, insize); break;
+ switch(cmd)
+ {
+ case KIRK_CMD_DECRYPT_PRIVATE: return kirk_CMD1(outbuff, inbuff, insize); break;
+ case KIRK_CMD_ENCRYPT_IV_0: return kirk_CMD4(outbuff, inbuff, insize); break;
+ case KIRK_CMD_DECRYPT_IV_0: return kirk_CMD7(outbuff, inbuff, insize); break;
+ case KIRK_CMD_PRIV_SIGN_CHECK: return kirk_CMD10(inbuff, insize); break;
+ case KIRK_CMD_SHA1_HASH: return kirk_CMD11(outbuff, inbuff, insize); break;
+ case KIRK_CMD_ECDSA_GEN_KEYS: return kirk_CMD12(outbuff,outsize); break;
+ case KIRK_CMD_ECDSA_MULTIPLY_POINT: return kirk_CMD13(outbuff,outsize, inbuff, insize); break;
+ case KIRK_CMD_PRNG: return kirk_CMD14(outbuff,outsize); break;
+ case KIRK_CMD_ECDSA_SIGN: return kirk_CMD16(outbuff, outsize, inbuff, insize); break;
+ case KIRK_CMD_ECDSA_VERIFY: return kirk_CMD17(inbuff, insize); break;
}
return -1;
}
diff --git a/CHOVY-KIRK/kirk_engine.h b/CHOVY-KIRK/kirk_engine.h
index 74a86a4..bcc7939 100644
--- a/CHOVY-KIRK/kirk_engine.h
+++ b/CHOVY-KIRK/kirk_engine.h
@@ -49,11 +49,50 @@ typedef struct
u8 unk5[16]; //80
} KIRK_CMD1_HEADER; //0x90
+typedef struct
+{
+ u8 r[0x14];
+ u8 s[0x14];
+} ECDSA_SIG;
+
+typedef struct
+{
+ u8 x[0x14];
+ u8 y[0x14];
+} ECDSA_POINT;
+
+
typedef struct
{
u32 data_size; //0
} KIRK_SHA1_HEADER; //4
+typedef struct
+{
+ u8 private_key[0x14];
+ ECDSA_POINT public_key;
+} KIRK_CMD12_BUFFER;
+
+typedef struct
+{
+ u8 multiplier[0x14];
+ ECDSA_POINT public_key;
+} KIRK_CMD13_BUFFER;
+
+typedef struct
+{
+ u8 enc_private[0x20];
+ u8 message_hash[0x14];
+} KIRK_CMD16_BUFFER;
+
+typedef struct
+{
+ ECDSA_POINT public_key;
+ u8 message_hash[0x14];
+ ECDSA_SIG signature;
+} KIRK_CMD17_BUFFER;
+
+
// sceUtilsBufferCopyWithRange modes
#define KIRK_CMD_DECRYPT_PRIVATE 1
#define KIRK_CMD_2 2
@@ -130,6 +169,6 @@ int kirk_CMD1_ex(void* outbuff, void* inbuff, int size, KIRK_CMD1_HEADER* header
//sce-like funcs
int sceUtilsSetFuseID(void*fuse);
-int sceUtilsBufferCopyWithRange(void* outbuff, int outsize, void* inbuff, int insize, int cmd);
+__declspec(dllexport) int sceUtilsBufferCopyWithRange(void* outbuff, int outsize, void* inbuff, int insize, int cmd);
#endif
diff --git a/CHOVY-SIGN.sln b/CHOVY-SIGN.sln
index e9dd178..058d152 100644
--- a/CHOVY-SIGN.sln
+++ b/CHOVY-SIGN.sln
@@ -9,8 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CHOVY-KIRK", "CHOVY-KIRK\CH
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CHOVY-GEN", "CHOVY-GEN\CHOVY-GEN.vcxproj", "{DCDBF747-DFB6-450E-A403-1C592D20EAEB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CHOVY-JUAN", "CHOVY-JUAN\CHOVY-JUAN.csproj", "{78933B2F-C754-4904-804E-D3932536471C}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
@@ -29,10 +27,6 @@ Global
{DCDBF747-DFB6-450E-A403-1C592D20EAEB}.Debug|x86.Build.0 = Debug|Win32
{DCDBF747-DFB6-450E-A403-1C592D20EAEB}.Release|x86.ActiveCfg = Release|Win32
{DCDBF747-DFB6-450E-A403-1C592D20EAEB}.Release|x86.Build.0 = Release|Win32
- {78933B2F-C754-4904-804E-D3932536471C}.Debug|x86.ActiveCfg = Debug|x86
- {78933B2F-C754-4904-804E-D3932536471C}.Debug|x86.Build.0 = Debug|x86
- {78933B2F-C754-4904-804E-D3932536471C}.Release|x86.ActiveCfg = Release|x86
- {78933B2F-C754-4904-804E-D3932536471C}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/CHOVY-SIGN/CHOVY-SIGN.csproj b/CHOVY-SIGN/CHOVY-SIGN.csproj
index b03cb0a..709fb62 100644
--- a/CHOVY-SIGN/CHOVY-SIGN.csproj
+++ b/CHOVY-SIGN/CHOVY-SIGN.csproj
@@ -6,7 +6,7 @@
AnyCPU
{D46AA2C2-2BDC-45C7-ACA5-D7A2295564E8}
WinExe
- CHOVY
+ CHOVY_SIGN
CHOVY-SIGN
v4.5
512
@@ -64,11 +64,11 @@
-
+
Form
-
- CHOVY.cs
+
+ CHOVYPspBuilder.cs
Form
@@ -82,9 +82,316 @@
CHOVYPopsBuilder.cs
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -120,13 +427,15 @@
-
-
-
-
-
-
- CHOVY.cs
+
+
+
+
+
+
+
+
+ CHOVYPspBuilder.cs
CHOVYCmaSelector.cs
@@ -180,11 +489,5 @@
-
-
- {78933b2f-c754-4904-804e-d3932536471c}
- CHOVY-JUAN
-
-
\ No newline at end of file
diff --git a/CHOVY-SIGN/CHOVYCmaSelector.cs b/CHOVY-SIGN/CHOVYCmaSelector.cs
index 8107ae5..36affe6 100644
--- a/CHOVY-SIGN/CHOVYCmaSelector.cs
+++ b/CHOVY-SIGN/CHOVYCmaSelector.cs
@@ -1,9 +1,10 @@
-using Param_SFO;
+using ParamSfo;
using System;
+using System.Collections.Generic;
using System.IO;
using System.Windows.Forms;
-namespace CHOVY
+namespace CHOVY_SIGN
{
public partial class CHOVYCmaSelector : Form
{
@@ -75,8 +76,8 @@ namespace CHOVY
{
string SfoPath = Path.Combine(BackupPath, Dir, "sce_sys", "param.sfo");
FileStream SfoStream = File.OpenRead(SfoPath);
- PARAM_SFO sfo = new PARAM_SFO(SfoStream);
- string Title = sfo.Title;
+ Dictionary SfoKeys = Sfo.ReadSfo(SfoStream);
+ string Title = (string)SfoKeys["Title"];
SfoStream.Close();
string BackupName = (Path.GetFileName(Dir) + " - " + Title);
BackupList.Items.Add(BackupName);
diff --git a/CHOVY-SIGN/CHOVYPopsBuilder.Designer.cs b/CHOVY-SIGN/CHOVYPopsBuilder.Designer.cs
index 9269fa3..1a4d573 100644
--- a/CHOVY-SIGN/CHOVYPopsBuilder.Designer.cs
+++ b/CHOVY-SIGN/CHOVYPopsBuilder.Designer.cs
@@ -1,4 +1,4 @@
-namespace CHOVY
+namespace CHOVY_SIGN
{
partial class CHOVYPopsBuilder
{
@@ -547,7 +547,7 @@
//
// BubbleIcon
//
- this.BubbleIcon.BackgroundImage = global::CHOVY.Properties.Resources.PopsDefaultIcon;
+ this.BubbleIcon.BackgroundImage = global::CHOVY_SIGN.Properties.Resources.PopsDefaultIcon;
this.BubbleIcon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.BubbleIcon.Location = new System.Drawing.Point(18, 37);
this.BubbleIcon.Name = "BubbleIcon";
@@ -566,7 +566,7 @@
//
// pictureBox1
//
- this.pictureBox1.BackgroundImage = global::CHOVY.Properties.Resources.does_not_protect_from_illegal_copies;
+ this.pictureBox1.BackgroundImage = global::CHOVY_SIGN.Properties.Resources.does_not_protect_from_illegal_copies;
this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.pictureBox1.Location = new System.Drawing.Point(7, 79);
this.pictureBox1.Name = "pictureBox1";
diff --git a/CHOVY-SIGN/CHOVYPopsBuilder.cs b/CHOVY-SIGN/CHOVYPopsBuilder.cs
index dc82365..4eb7639 100644
--- a/CHOVY-SIGN/CHOVYPopsBuilder.cs
+++ b/CHOVY-SIGN/CHOVYPopsBuilder.cs
@@ -13,7 +13,7 @@ using System.Net;
using System.Threading;
using System.Windows.Forms;
-namespace CHOVY
+namespace CHOVY_SIGN
{
public partial class CHOVYPopsBuilder : Form
{
diff --git a/CHOVY-SIGN/Chovy.Designer.cs b/CHOVY-SIGN/CHOVYPspBuilder.Designer.cs
similarity index 97%
rename from CHOVY-SIGN/Chovy.Designer.cs
rename to CHOVY-SIGN/CHOVYPspBuilder.Designer.cs
index 00ecc0e..0b0def9 100644
--- a/CHOVY-SIGN/Chovy.Designer.cs
+++ b/CHOVY-SIGN/CHOVYPspBuilder.Designer.cs
@@ -1,6 +1,6 @@
-namespace CHOVY
+namespace CHOVY_SIGN
{
- partial class CHOVY
+ partial class CHOVYPspBuilder
{
///
/// Required designer variable.
@@ -28,7 +28,7 @@
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CHOVY));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CHOVYPspBuilder));
this.label1 = new System.Windows.Forms.Label();
this.RifPath = new System.Windows.Forms.TextBox();
this.Versionkey = new System.Windows.Forms.TextBox();
@@ -239,7 +239,7 @@
//
// pictureBox2
//
- this.pictureBox2.BackgroundImage = global::CHOVY.Properties.Resources.UMD;
+ this.pictureBox2.BackgroundImage = global::CHOVY_SIGN.Properties.Resources.UMD;
this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.pictureBox2.Location = new System.Drawing.Point(15, 31);
this.pictureBox2.Name = "pictureBox2";
@@ -259,7 +259,7 @@
//
// Ps1Menu
//
- this.Ps1Menu.BackgroundImage = global::CHOVY.Properties.Resources.ps1;
+ this.Ps1Menu.BackgroundImage = global::CHOVY_SIGN.Properties.Resources.ps1;
this.Ps1Menu.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.Ps1Menu.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.Ps1Menu.ForeColor = System.Drawing.Color.Lime;
@@ -283,7 +283,7 @@
//
// PsmChan
//
- this.PsmChan.BackgroundImage = global::CHOVY.Properties.Resources.idkbackground;
+ this.PsmChan.BackgroundImage = global::CHOVY_SIGN.Properties.Resources.idkbackground;
this.PsmChan.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.PsmChan.Location = new System.Drawing.Point(3, 3);
this.PsmChan.Name = "PsmChan";
diff --git a/CHOVY-SIGN/CHOVY.cs b/CHOVY-SIGN/CHOVYPspBuilder.cs
similarity index 96%
rename from CHOVY-SIGN/CHOVY.cs
rename to CHOVY-SIGN/CHOVYPspBuilder.cs
index 89d08e6..2bf61b2 100644
--- a/CHOVY-SIGN/CHOVY.cs
+++ b/CHOVY-SIGN/CHOVYPspBuilder.cs
@@ -1,10 +1,10 @@
-using CHOVY.Properties;
-using DiscUtils.Iso9660;
+using CHOVY_SIGN.Properties;
using Ionic.Zlib;
using Microsoft.Win32;
-using Param_SFO;
+using ParamSfo;
using PSVIMGTOOLS;
using System;
+using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.IO;
@@ -13,16 +13,16 @@ using System.Text;
using System.Threading;
using System.Windows.Forms;
-namespace CHOVY
+namespace CHOVY_SIGN
{
- public partial class CHOVY : Form
+ public partial class CHOVYPspBuilder : Form
{
bool MutedAudio = false;
public byte[] GetSfo(string ISOFile)
{
FileStream ISO = File.OpenRead(ISOFile);
-
- CDReader cdr = new CDReader(ISO, false);
+
+ DiscUtils.Iso9660.CDReader cdr = new DiscUtils.Iso9660.CDReader(ISO, false);
Stream ParamSfo = cdr.OpenFile(@"PSP_GAME\PARAM.SFO", FileMode.Open,FileAccess.Read);
byte[] Sfo = new byte[ParamSfo.Length];
@@ -35,7 +35,7 @@ namespace CHOVY
public byte[] GetIcon(string ISOFile)
{
FileStream ISO = File.OpenRead(ISOFile);
- CDReader cdr = new CDReader(ISO, false);
+ DiscUtils.Iso9660.CDReader cdr = new DiscUtils.Iso9660.CDReader(ISO, false);
Stream ParamSfo = cdr.OpenFile(@"PSP_GAME\ICON0.PNG", FileMode.Open, FileAccess.Read);
byte[] Icon0 = new byte[ParamSfo.Length];
@@ -48,12 +48,12 @@ namespace CHOVY
public static string GetTitleID(string ISOFile)
{
FileStream ISO = File.OpenRead(ISOFile);
- CDReader cdr = new CDReader(ISO, false);
+ DiscUtils.Iso9660.CDReader cdr = new DiscUtils.Iso9660.CDReader(ISO, false);
Stream ParamSfo = cdr.OpenFile(@"PSP_GAME\PARAM.SFO", FileMode.Open, FileAccess.Read);
- PARAM_SFO sfo = new PARAM_SFO(ParamSfo);
+ Dictionary SfoKeys = Sfo.ReadSfo(ParamSfo);
- string TitleID = sfo.GetValue("DISC_ID");
+ string TitleID = (string)SfoKeys["DISC_ID"];
ISO.Close();
return TitleID;
}
@@ -61,7 +61,7 @@ namespace CHOVY
public static bool isMini(string ISOFile)
{
FileStream ISO = File.OpenRead(ISOFile);
- CDReader cdr = new CDReader(ISO, false);
+ DiscUtils.Iso9660.CDReader cdr = new DiscUtils.Iso9660.CDReader(ISO, false);
Stream Icon0 = cdr.OpenFile(@"PSP_GAME\ICON0.PNG", FileMode.Open, FileAccess.Read);
Bitmap bmp = new Bitmap(Icon0);
@@ -115,7 +115,7 @@ namespace CHOVY
}
}
- public CHOVY()
+ public CHOVYPspBuilder()
{
InitializeComponent();
}
diff --git a/CHOVY-SIGN/Chovy.resx b/CHOVY-SIGN/CHOVYPspBuilder.resx
similarity index 100%
rename from CHOVY-SIGN/Chovy.resx
rename to CHOVY-SIGN/CHOVYPspBuilder.resx
diff --git a/CHOVY-SIGN/ChovyCmaSelector.Designer.cs b/CHOVY-SIGN/ChovyCmaSelector.Designer.cs
index 2c5738f..d005543 100644
--- a/CHOVY-SIGN/ChovyCmaSelector.Designer.cs
+++ b/CHOVY-SIGN/ChovyCmaSelector.Designer.cs
@@ -1,4 +1,4 @@
-namespace CHOVY
+namespace CHOVY_SIGN
{
partial class CHOVYCmaSelector
{
diff --git a/CHOVY-SIGN/DataUtils.cs b/CHOVY-SIGN/DataUtils.cs
new file mode 100644
index 0000000..248d3a2
--- /dev/null
+++ b/CHOVY-SIGN/DataUtils.cs
@@ -0,0 +1,168 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace BasicDataTypes
+{
+ class DataUtils
+ {
+ public static void CopyString(byte[] str, String Text, int Index)
+ {
+ byte[] TextBytes = Encoding.UTF8.GetBytes(Text);
+ Array.ConstrainedCopy(TextBytes, 0, str, Index, TextBytes.Length);
+ }
+
+ public static void CopyInt32(byte[] str, Int32 Value, int Index)
+ {
+ byte[] ValueBytes = BitConverter.GetBytes(Value);
+ Array.ConstrainedCopy(ValueBytes, 0, str, Index, ValueBytes.Length);
+ }
+ public static void CopyInt32BE(byte[] str, Int32 Value, int Index)
+ {
+ byte[] ValueBytes = BitConverter.GetBytes(Value);
+ byte[] ValueBytesBE = ValueBytes.Reverse().ToArray();
+ Array.ConstrainedCopy(ValueBytesBE, 0, str, Index, ValueBytesBE.Length);
+ }
+
+ // Read From Streams
+ public static UInt32 ReadUInt32(Stream Str)
+ {
+ byte[] IntBytes = new byte[0x4];
+ Str.Read(IntBytes, 0x00, IntBytes.Length);
+ return BitConverter.ToUInt32(IntBytes, 0x00);
+ }
+ public static UInt32 ReadInt32(Stream Str)
+ {
+ byte[] IntBytes = new byte[0x4];
+ Str.Read(IntBytes, 0x00, IntBytes.Length);
+ return BitConverter.ToUInt32(IntBytes, 0x00);
+ }
+ public static UInt64 ReadUInt64(Stream Str)
+ {
+ byte[] IntBytes = new byte[0x8];
+ Str.Read(IntBytes, 0x00, IntBytes.Length);
+ return BitConverter.ToUInt64(IntBytes, 0x00);
+ }
+ public static Int64 ReadInt64(Stream Str)
+ {
+ byte[] IntBytes = new byte[0x8];
+ Str.Read(IntBytes, 0x00, IntBytes.Length);
+ return BitConverter.ToInt64(IntBytes, 0x00);
+ }
+ public static UInt16 ReadUInt16(Stream Str)
+ {
+ byte[] IntBytes = new byte[0x2];
+ Str.Read(IntBytes, 0x00, IntBytes.Length);
+ return BitConverter.ToUInt16(IntBytes, 0x00);
+ }
+ public static Int16 ReadInt16(Stream Str)
+ {
+ byte[] IntBytes = new byte[0x2];
+ Str.Read(IntBytes, 0x00, IntBytes.Length);
+ return BitConverter.ToInt16(IntBytes, 0x00);
+ }
+
+ public static UInt32 ReadUint32At(Stream Str, int location)
+ {
+ long oldPos = Str.Position;
+ Str.Seek(location, SeekOrigin.Begin);
+ UInt32 outp = ReadUInt32(Str);
+ Str.Seek(oldPos, SeekOrigin.Begin);
+ return outp;
+ }
+
+ public static byte[] ReadBytesAt(Stream Str, int location, int length)
+ {
+ long oldPos = Str.Position;
+ Str.Seek(location, SeekOrigin.Begin);
+ byte[] work_buf = new byte[length];
+ Str.Read(work_buf, 0x0, work_buf.Length);
+ Str.Seek(oldPos, SeekOrigin.Begin);
+ return work_buf;
+ }
+
+ public static string ReadStringAt(Stream Str,int location)
+ {
+ long oldPos = Str.Position;
+ Str.Seek(location, SeekOrigin.Begin);
+ string outp = ReadString(Str);
+ Str.Seek(oldPos,SeekOrigin.Begin);
+ return outp;
+ }
+ public static string ReadString(Stream Str)
+ {
+ MemoryStream ms = new MemoryStream();
+
+ while (true)
+ {
+ byte c = (byte)Str.ReadByte();
+ if (c == 0)
+ break;
+ ms.WriteByte(c);
+ }
+ ms.Seek(0x00, SeekOrigin.Begin);
+ string outp = Encoding.UTF8.GetString(ms.ToArray());
+ ms.Dispose();
+ return outp;
+ }
+
+ // Write To Streams
+
+ public static void WriteUInt32(Stream Str, UInt32 Numb)
+ {
+ byte[] IntBytes = BitConverter.GetBytes(Numb);
+ Str.Write(IntBytes, 0x00, IntBytes.Length);
+ }
+ public static void WriteInt32(Stream Str, Int32 Numb)
+ {
+ byte[] IntBytes = BitConverter.GetBytes(Numb);
+ Str.Write(IntBytes, 0x00, IntBytes.Length);
+ }
+ public static void WriteUInt64(Stream dst, UInt64 value)
+ {
+ byte[] ValueBytes = BitConverter.GetBytes(value);
+ dst.Write(ValueBytes, 0x00, 0x8);
+ }
+ public static void WriteInt64(Stream dst, Int64 value)
+ {
+ byte[] ValueBytes = BitConverter.GetBytes(value);
+ dst.Write(ValueBytes, 0x00, 0x8);
+ }
+ public static void WriteUInt16(Stream dst, UInt16 value)
+ {
+ byte[] ValueBytes = BitConverter.GetBytes(value);
+ dst.Write(ValueBytes, 0x00, 0x2);
+ }
+ public static void WriteInt16(Stream dst, Int16 value)
+ {
+ byte[] ValueBytes = BitConverter.GetBytes(value);
+ dst.Write(ValueBytes, 0x00, 0x2);
+ }
+
+ public static void WriteInt32BE(Stream Str, Int32 Numb)
+ {
+ byte[] IntBytes = BitConverter.GetBytes(Numb);
+ byte[] IntBytesBE = IntBytes.Reverse().ToArray();
+ Str.Write(IntBytesBE, 0x00, IntBytesBE.Length);
+ }
+ public static void WriteStringAt(Stream Str, string Text, int location)
+ {
+ long oldPos = Str.Position;
+ Str.Seek(location, SeekOrigin.Begin);
+ WriteString(Str,Text);
+ Str.Seek(oldPos, SeekOrigin.Begin);
+ }
+ public static void WriteString(Stream Str, String Text, int len = -1)
+ {
+ if (len < 0)
+ {
+ len = Text.Length;
+ }
+
+ byte[] TextBytes = Encoding.UTF8.GetBytes(Text);
+ Str.Write(TextBytes, 0x00, len);
+ }
+
+ }
+}
diff --git a/CHOVY-JUAN/ApplePartitionMap/BlockZero.cs b/CHOVY-SIGN/DiscUtils/ApplePartitionMap/BlockZero.cs
similarity index 100%
rename from CHOVY-JUAN/ApplePartitionMap/BlockZero.cs
rename to CHOVY-SIGN/DiscUtils/ApplePartitionMap/BlockZero.cs
diff --git a/CHOVY-JUAN/ApplePartitionMap/PartitionMap.cs b/CHOVY-SIGN/DiscUtils/ApplePartitionMap/PartitionMap.cs
similarity index 100%
rename from CHOVY-JUAN/ApplePartitionMap/PartitionMap.cs
rename to CHOVY-SIGN/DiscUtils/ApplePartitionMap/PartitionMap.cs
diff --git a/CHOVY-JUAN/ApplePartitionMap/PartitionMapEntry.cs b/CHOVY-SIGN/DiscUtils/ApplePartitionMap/PartitionMapEntry.cs
similarity index 100%
rename from CHOVY-JUAN/ApplePartitionMap/PartitionMapEntry.cs
rename to CHOVY-SIGN/DiscUtils/ApplePartitionMap/PartitionMapEntry.cs
diff --git a/CHOVY-JUAN/ApplePartitionMap/PartitionMapFactory.cs b/CHOVY-SIGN/DiscUtils/ApplePartitionMap/PartitionMapFactory.cs
similarity index 100%
rename from CHOVY-JUAN/ApplePartitionMap/PartitionMapFactory.cs
rename to CHOVY-SIGN/DiscUtils/ApplePartitionMap/PartitionMapFactory.cs
diff --git a/CHOVY-JUAN/Archives/FileRecord.cs b/CHOVY-SIGN/DiscUtils/Archives/FileRecord.cs
similarity index 100%
rename from CHOVY-JUAN/Archives/FileRecord.cs
rename to CHOVY-SIGN/DiscUtils/Archives/FileRecord.cs
diff --git a/CHOVY-JUAN/Archives/TarFile.cs b/CHOVY-SIGN/DiscUtils/Archives/TarFile.cs
similarity index 100%
rename from CHOVY-JUAN/Archives/TarFile.cs
rename to CHOVY-SIGN/DiscUtils/Archives/TarFile.cs
diff --git a/CHOVY-JUAN/Archives/TarFileBuilder.cs b/CHOVY-SIGN/DiscUtils/Archives/TarFileBuilder.cs
similarity index 100%
rename from CHOVY-JUAN/Archives/TarFileBuilder.cs
rename to CHOVY-SIGN/DiscUtils/Archives/TarFileBuilder.cs
diff --git a/CHOVY-JUAN/Archives/TarHeader.cs b/CHOVY-SIGN/DiscUtils/Archives/TarHeader.cs
similarity index 100%
rename from CHOVY-JUAN/Archives/TarHeader.cs
rename to CHOVY-SIGN/DiscUtils/Archives/TarHeader.cs
diff --git a/CHOVY-JUAN/Archives/TarHeaderExtent.cs b/CHOVY-SIGN/DiscUtils/Archives/TarHeaderExtent.cs
similarity index 100%
rename from CHOVY-JUAN/Archives/TarHeaderExtent.cs
rename to CHOVY-SIGN/DiscUtils/Archives/TarHeaderExtent.cs
diff --git a/CHOVY-JUAN/Archives/UnixBuildFileRecord.cs b/CHOVY-SIGN/DiscUtils/Archives/UnixBuildFileRecord.cs
similarity index 100%
rename from CHOVY-JUAN/Archives/UnixBuildFileRecord.cs
rename to CHOVY-SIGN/DiscUtils/Archives/UnixBuildFileRecord.cs
diff --git a/CHOVY-JUAN/ChsAddress.cs b/CHOVY-SIGN/DiscUtils/ChsAddress.cs
similarity index 100%
rename from CHOVY-JUAN/ChsAddress.cs
rename to CHOVY-SIGN/DiscUtils/ChsAddress.cs
diff --git a/CHOVY-JUAN/ClusterMap.cs b/CHOVY-SIGN/DiscUtils/ClusterMap.cs
similarity index 100%
rename from CHOVY-JUAN/ClusterMap.cs
rename to CHOVY-SIGN/DiscUtils/ClusterMap.cs
diff --git a/CHOVY-JUAN/ClusterRoles.cs b/CHOVY-SIGN/DiscUtils/ClusterRoles.cs
similarity index 100%
rename from CHOVY-JUAN/ClusterRoles.cs
rename to CHOVY-SIGN/DiscUtils/ClusterRoles.cs
diff --git a/CHOVY-JUAN/Compression/Adler32.cs b/CHOVY-SIGN/DiscUtils/Compression/Adler32.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/Adler32.cs
rename to CHOVY-SIGN/DiscUtils/Compression/Adler32.cs
diff --git a/CHOVY-JUAN/Compression/BZip2BlockDecoder.cs b/CHOVY-SIGN/DiscUtils/Compression/BZip2BlockDecoder.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/BZip2BlockDecoder.cs
rename to CHOVY-SIGN/DiscUtils/Compression/BZip2BlockDecoder.cs
diff --git a/CHOVY-JUAN/Compression/BZip2CombinedHuffmanTrees.cs b/CHOVY-SIGN/DiscUtils/Compression/BZip2CombinedHuffmanTrees.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/BZip2CombinedHuffmanTrees.cs
rename to CHOVY-SIGN/DiscUtils/Compression/BZip2CombinedHuffmanTrees.cs
diff --git a/CHOVY-JUAN/Compression/BZip2DecoderStream.cs b/CHOVY-SIGN/DiscUtils/Compression/BZip2DecoderStream.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/BZip2DecoderStream.cs
rename to CHOVY-SIGN/DiscUtils/Compression/BZip2DecoderStream.cs
diff --git a/CHOVY-JUAN/Compression/BZip2Randomizer.cs b/CHOVY-SIGN/DiscUtils/Compression/BZip2Randomizer.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/BZip2Randomizer.cs
rename to CHOVY-SIGN/DiscUtils/Compression/BZip2Randomizer.cs
diff --git a/CHOVY-JUAN/Compression/BZip2RleStream.cs b/CHOVY-SIGN/DiscUtils/Compression/BZip2RleStream.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/BZip2RleStream.cs
rename to CHOVY-SIGN/DiscUtils/Compression/BZip2RleStream.cs
diff --git a/CHOVY-JUAN/Compression/BigEndianBitStream.cs b/CHOVY-SIGN/DiscUtils/Compression/BigEndianBitStream.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/BigEndianBitStream.cs
rename to CHOVY-SIGN/DiscUtils/Compression/BigEndianBitStream.cs
diff --git a/CHOVY-JUAN/Compression/BitStream.cs b/CHOVY-SIGN/DiscUtils/Compression/BitStream.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/BitStream.cs
rename to CHOVY-SIGN/DiscUtils/Compression/BitStream.cs
diff --git a/CHOVY-JUAN/Compression/BlockCompressor.cs b/CHOVY-SIGN/DiscUtils/Compression/BlockCompressor.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/BlockCompressor.cs
rename to CHOVY-SIGN/DiscUtils/Compression/BlockCompressor.cs
diff --git a/CHOVY-JUAN/Compression/CompressionResult.cs b/CHOVY-SIGN/DiscUtils/Compression/CompressionResult.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/CompressionResult.cs
rename to CHOVY-SIGN/DiscUtils/Compression/CompressionResult.cs
diff --git a/CHOVY-JUAN/Compression/DataBlockTransform.cs b/CHOVY-SIGN/DiscUtils/Compression/DataBlockTransform.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/DataBlockTransform.cs
rename to CHOVY-SIGN/DiscUtils/Compression/DataBlockTransform.cs
diff --git a/CHOVY-JUAN/Compression/HuffmanTree.cs b/CHOVY-SIGN/DiscUtils/Compression/HuffmanTree.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/HuffmanTree.cs
rename to CHOVY-SIGN/DiscUtils/Compression/HuffmanTree.cs
diff --git a/CHOVY-JUAN/Compression/InverseBurrowsWheeler.cs b/CHOVY-SIGN/DiscUtils/Compression/InverseBurrowsWheeler.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/InverseBurrowsWheeler.cs
rename to CHOVY-SIGN/DiscUtils/Compression/InverseBurrowsWheeler.cs
diff --git a/CHOVY-JUAN/Compression/MoveToFront.cs b/CHOVY-SIGN/DiscUtils/Compression/MoveToFront.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/MoveToFront.cs
rename to CHOVY-SIGN/DiscUtils/Compression/MoveToFront.cs
diff --git a/CHOVY-JUAN/Compression/SizedDeflateStream.cs b/CHOVY-SIGN/DiscUtils/Compression/SizedDeflateStream.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/SizedDeflateStream.cs
rename to CHOVY-SIGN/DiscUtils/Compression/SizedDeflateStream.cs
diff --git a/CHOVY-JUAN/Compression/ZlibBuffer.cs b/CHOVY-SIGN/DiscUtils/Compression/ZlibBuffer.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/ZlibBuffer.cs
rename to CHOVY-SIGN/DiscUtils/Compression/ZlibBuffer.cs
diff --git a/CHOVY-JUAN/Compression/ZlibStream.cs b/CHOVY-SIGN/DiscUtils/Compression/ZlibStream.cs
similarity index 100%
rename from CHOVY-JUAN/Compression/ZlibStream.cs
rename to CHOVY-SIGN/DiscUtils/Compression/ZlibStream.cs
diff --git a/CHOVY-JUAN/CoreCompat/EncodingHelper.cs b/CHOVY-SIGN/DiscUtils/CoreCompat/EncodingHelper.cs
similarity index 100%
rename from CHOVY-JUAN/CoreCompat/EncodingHelper.cs
rename to CHOVY-SIGN/DiscUtils/CoreCompat/EncodingHelper.cs
diff --git a/CHOVY-JUAN/CoreCompat/ReflectionHelper.cs b/CHOVY-SIGN/DiscUtils/CoreCompat/ReflectionHelper.cs
similarity index 100%
rename from CHOVY-JUAN/CoreCompat/ReflectionHelper.cs
rename to CHOVY-SIGN/DiscUtils/CoreCompat/ReflectionHelper.cs
diff --git a/CHOVY-JUAN/CoreCompat/StringExtensions.cs b/CHOVY-SIGN/DiscUtils/CoreCompat/StringExtensions.cs
similarity index 100%
rename from CHOVY-JUAN/CoreCompat/StringExtensions.cs
rename to CHOVY-SIGN/DiscUtils/CoreCompat/StringExtensions.cs
diff --git a/CHOVY-JUAN/DiscDirectoryInfo.cs b/CHOVY-SIGN/DiscUtils/DiscDirectoryInfo.cs
similarity index 100%
rename from CHOVY-JUAN/DiscDirectoryInfo.cs
rename to CHOVY-SIGN/DiscUtils/DiscDirectoryInfo.cs
diff --git a/CHOVY-JUAN/DiscFileInfo.cs b/CHOVY-SIGN/DiscUtils/DiscFileInfo.cs
similarity index 100%
rename from CHOVY-JUAN/DiscFileInfo.cs
rename to CHOVY-SIGN/DiscUtils/DiscFileInfo.cs
diff --git a/CHOVY-JUAN/DiscFileLocator.cs b/CHOVY-SIGN/DiscUtils/DiscFileLocator.cs
similarity index 100%
rename from CHOVY-JUAN/DiscFileLocator.cs
rename to CHOVY-SIGN/DiscUtils/DiscFileLocator.cs
diff --git a/CHOVY-JUAN/DiscFileSystem.cs b/CHOVY-SIGN/DiscUtils/DiscFileSystem.cs
similarity index 100%
rename from CHOVY-JUAN/DiscFileSystem.cs
rename to CHOVY-SIGN/DiscUtils/DiscFileSystem.cs
diff --git a/CHOVY-JUAN/DiscFileSystemChecker.cs b/CHOVY-SIGN/DiscUtils/DiscFileSystemChecker.cs
similarity index 100%
rename from CHOVY-JUAN/DiscFileSystemChecker.cs
rename to CHOVY-SIGN/DiscUtils/DiscFileSystemChecker.cs
diff --git a/CHOVY-JUAN/DiscFileSystemInfo.cs b/CHOVY-SIGN/DiscUtils/DiscFileSystemInfo.cs
similarity index 100%
rename from CHOVY-JUAN/DiscFileSystemInfo.cs
rename to CHOVY-SIGN/DiscUtils/DiscFileSystemInfo.cs
diff --git a/CHOVY-JUAN/DiscFileSystemOptions.cs b/CHOVY-SIGN/DiscUtils/DiscFileSystemOptions.cs
similarity index 100%
rename from CHOVY-JUAN/DiscFileSystemOptions.cs
rename to CHOVY-SIGN/DiscUtils/DiscFileSystemOptions.cs
diff --git a/CHOVY-JUAN/DiskImageBuilder.cs b/CHOVY-SIGN/DiscUtils/DiskImageBuilder.cs
similarity index 100%
rename from CHOVY-JUAN/DiskImageBuilder.cs
rename to CHOVY-SIGN/DiscUtils/DiskImageBuilder.cs
diff --git a/CHOVY-JUAN/DiskImageFileSpecification.cs b/CHOVY-SIGN/DiscUtils/DiskImageFileSpecification.cs
similarity index 100%
rename from CHOVY-JUAN/DiskImageFileSpecification.cs
rename to CHOVY-SIGN/DiscUtils/DiskImageFileSpecification.cs
diff --git a/CHOVY-JUAN/FileLocator.cs b/CHOVY-SIGN/DiscUtils/FileLocator.cs
similarity index 100%
rename from CHOVY-JUAN/FileLocator.cs
rename to CHOVY-SIGN/DiscUtils/FileLocator.cs
diff --git a/CHOVY-JUAN/FileSystemInfo.cs b/CHOVY-SIGN/DiscUtils/FileSystemInfo.cs
similarity index 100%
rename from CHOVY-JUAN/FileSystemInfo.cs
rename to CHOVY-SIGN/DiscUtils/FileSystemInfo.cs
diff --git a/CHOVY-JUAN/FileSystemManager.cs b/CHOVY-SIGN/DiscUtils/FileSystemManager.cs
similarity index 100%
rename from CHOVY-JUAN/FileSystemManager.cs
rename to CHOVY-SIGN/DiscUtils/FileSystemManager.cs
diff --git a/CHOVY-JUAN/FileSystemParameters.cs b/CHOVY-SIGN/DiscUtils/FileSystemParameters.cs
similarity index 100%
rename from CHOVY-JUAN/FileSystemParameters.cs
rename to CHOVY-SIGN/DiscUtils/FileSystemParameters.cs
diff --git a/CHOVY-JUAN/FileTransport.cs b/CHOVY-SIGN/DiscUtils/FileTransport.cs
similarity index 100%
rename from CHOVY-JUAN/FileTransport.cs
rename to CHOVY-SIGN/DiscUtils/FileTransport.cs
diff --git a/CHOVY-JUAN/FloppyDiskType.cs b/CHOVY-SIGN/DiscUtils/FloppyDiskType.cs
similarity index 100%
rename from CHOVY-JUAN/FloppyDiskType.cs
rename to CHOVY-SIGN/DiscUtils/FloppyDiskType.cs
diff --git a/CHOVY-JUAN/GenericDiskAdapterType.cs b/CHOVY-SIGN/DiscUtils/GenericDiskAdapterType.cs
similarity index 100%
rename from CHOVY-JUAN/GenericDiskAdapterType.cs
rename to CHOVY-SIGN/DiscUtils/GenericDiskAdapterType.cs
diff --git a/CHOVY-JUAN/Geometry.cs b/CHOVY-SIGN/DiscUtils/Geometry.cs
similarity index 100%
rename from CHOVY-JUAN/Geometry.cs
rename to CHOVY-SIGN/DiscUtils/Geometry.cs
diff --git a/CHOVY-JUAN/GeometryCalculation.cs b/CHOVY-SIGN/DiscUtils/GeometryCalculation.cs
similarity index 100%
rename from CHOVY-JUAN/GeometryCalculation.cs
rename to CHOVY-SIGN/DiscUtils/GeometryCalculation.cs
diff --git a/CHOVY-JUAN/GeometryTranslation.cs b/CHOVY-SIGN/DiscUtils/GeometryTranslation.cs
similarity index 100%
rename from CHOVY-JUAN/GeometryTranslation.cs
rename to CHOVY-SIGN/DiscUtils/GeometryTranslation.cs
diff --git a/CHOVY-JUAN/IClusterBasedFileSystem.cs b/CHOVY-SIGN/DiscUtils/IClusterBasedFileSystem.cs
similarity index 100%
rename from CHOVY-JUAN/IClusterBasedFileSystem.cs
rename to CHOVY-SIGN/DiscUtils/IClusterBasedFileSystem.cs
diff --git a/CHOVY-JUAN/IDiagnosticTraceable.cs b/CHOVY-SIGN/DiscUtils/IDiagnosticTraceable.cs
similarity index 100%
rename from CHOVY-JUAN/IDiagnosticTraceable.cs
rename to CHOVY-SIGN/DiscUtils/IDiagnosticTraceable.cs
diff --git a/CHOVY-JUAN/IFileSystem.cs b/CHOVY-SIGN/DiscUtils/IFileSystem.cs
similarity index 100%
rename from CHOVY-JUAN/IFileSystem.cs
rename to CHOVY-SIGN/DiscUtils/IFileSystem.cs
diff --git a/CHOVY-JUAN/IUnixFileSystem.cs b/CHOVY-SIGN/DiscUtils/IUnixFileSystem.cs
similarity index 100%
rename from CHOVY-JUAN/IUnixFileSystem.cs
rename to CHOVY-SIGN/DiscUtils/IUnixFileSystem.cs
diff --git a/CHOVY-JUAN/IWindowsFileSystem.cs b/CHOVY-SIGN/DiscUtils/IWindowsFileSystem.cs
similarity index 100%
rename from CHOVY-JUAN/IWindowsFileSystem.cs
rename to CHOVY-SIGN/DiscUtils/IWindowsFileSystem.cs
diff --git a/CHOVY-JUAN/Internal/Crc32.cs b/CHOVY-SIGN/DiscUtils/Internal/Crc32.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/Crc32.cs
rename to CHOVY-SIGN/DiscUtils/Internal/Crc32.cs
diff --git a/CHOVY-JUAN/Internal/Crc32Algorithm.cs b/CHOVY-SIGN/DiscUtils/Internal/Crc32Algorithm.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/Crc32Algorithm.cs
rename to CHOVY-SIGN/DiscUtils/Internal/Crc32Algorithm.cs
diff --git a/CHOVY-JUAN/Internal/Crc32BigEndian.cs b/CHOVY-SIGN/DiscUtils/Internal/Crc32BigEndian.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/Crc32BigEndian.cs
rename to CHOVY-SIGN/DiscUtils/Internal/Crc32BigEndian.cs
diff --git a/CHOVY-JUAN/Internal/Crc32LittleEndian.cs b/CHOVY-SIGN/DiscUtils/Internal/Crc32LittleEndian.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/Crc32LittleEndian.cs
rename to CHOVY-SIGN/DiscUtils/Internal/Crc32LittleEndian.cs
diff --git a/CHOVY-JUAN/Internal/LocalFileLocator.cs b/CHOVY-SIGN/DiscUtils/Internal/LocalFileLocator.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/LocalFileLocator.cs
rename to CHOVY-SIGN/DiscUtils/Internal/LocalFileLocator.cs
diff --git a/CHOVY-JUAN/Internal/LogicalVolumeFactory.cs b/CHOVY-SIGN/DiscUtils/Internal/LogicalVolumeFactory.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/LogicalVolumeFactory.cs
rename to CHOVY-SIGN/DiscUtils/Internal/LogicalVolumeFactory.cs
diff --git a/CHOVY-JUAN/Internal/LogicalVolumeFactoryAttribute.cs b/CHOVY-SIGN/DiscUtils/Internal/LogicalVolumeFactoryAttribute.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/LogicalVolumeFactoryAttribute.cs
rename to CHOVY-SIGN/DiscUtils/Internal/LogicalVolumeFactoryAttribute.cs
diff --git a/CHOVY-JUAN/Internal/ObjectCache.cs b/CHOVY-SIGN/DiscUtils/Internal/ObjectCache.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/ObjectCache.cs
rename to CHOVY-SIGN/DiscUtils/Internal/ObjectCache.cs
diff --git a/CHOVY-JUAN/Internal/Utilities.cs b/CHOVY-SIGN/DiscUtils/Internal/Utilities.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/Utilities.cs
rename to CHOVY-SIGN/DiscUtils/Internal/Utilities.cs
diff --git a/CHOVY-JUAN/Internal/VirtualDiskFactory.cs b/CHOVY-SIGN/DiscUtils/Internal/VirtualDiskFactory.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/VirtualDiskFactory.cs
rename to CHOVY-SIGN/DiscUtils/Internal/VirtualDiskFactory.cs
diff --git a/CHOVY-JUAN/Internal/VirtualDiskFactoryAttribute.cs b/CHOVY-SIGN/DiscUtils/Internal/VirtualDiskFactoryAttribute.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/VirtualDiskFactoryAttribute.cs
rename to CHOVY-SIGN/DiscUtils/Internal/VirtualDiskFactoryAttribute.cs
diff --git a/CHOVY-JUAN/Internal/VirtualDiskTransport.cs b/CHOVY-SIGN/DiscUtils/Internal/VirtualDiskTransport.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/VirtualDiskTransport.cs
rename to CHOVY-SIGN/DiscUtils/Internal/VirtualDiskTransport.cs
diff --git a/CHOVY-JUAN/Internal/VirtualDiskTransportAttribute.cs b/CHOVY-SIGN/DiscUtils/Internal/VirtualDiskTransportAttribute.cs
similarity index 100%
rename from CHOVY-JUAN/Internal/VirtualDiskTransportAttribute.cs
rename to CHOVY-SIGN/DiscUtils/Internal/VirtualDiskTransportAttribute.cs
diff --git a/CHOVY-JUAN/InvalidFileSystemException.cs b/CHOVY-SIGN/DiscUtils/InvalidFileSystemException.cs
similarity index 100%
rename from CHOVY-JUAN/InvalidFileSystemException.cs
rename to CHOVY-SIGN/DiscUtils/InvalidFileSystemException.cs
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/BaseVolumeDescriptor.cs b/CHOVY-SIGN/DiscUtils/Iso9660/BaseVolumeDescriptor.cs
new file mode 100644
index 0000000..bab65d6
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/BaseVolumeDescriptor.cs
@@ -0,0 +1,58 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+
+namespace DiscUtils.Iso9660
+{
+ internal class BaseVolumeDescriptor
+ {
+ public const string Iso9660StandardIdentifier = "CD001";
+
+ public readonly string StandardIdentifier;
+ public readonly VolumeDescriptorType VolumeDescriptorType;
+ public readonly byte VolumeDescriptorVersion;
+
+ public BaseVolumeDescriptor(VolumeDescriptorType type, byte version)
+ {
+ VolumeDescriptorType = type;
+ StandardIdentifier = "CD001";
+ VolumeDescriptorVersion = version;
+ }
+
+ public BaseVolumeDescriptor(byte[] src, int offset)
+ {
+ VolumeDescriptorType = (VolumeDescriptorType)src[offset + 0];
+ StandardIdentifier = Encoding.ASCII.GetString(src, offset + 1, 5);
+ VolumeDescriptorVersion = src[offset + 6];
+ }
+
+ internal virtual void WriteTo(byte[] buffer, int offset)
+ {
+ Array.Clear(buffer, offset, IsoUtilities.SectorSize);
+ buffer[offset] = (byte)VolumeDescriptorType;
+ IsoUtilities.WriteAChars(buffer, offset + 1, 5, StandardIdentifier);
+ buffer[offset + 6] = VolumeDescriptorVersion;
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-JUAN/BootDeviceEmulation.cs b/CHOVY-SIGN/DiscUtils/Iso9660/BootDeviceEmulation.cs
similarity index 100%
rename from CHOVY-JUAN/BootDeviceEmulation.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/BootDeviceEmulation.cs
diff --git a/CHOVY-JUAN/BootInitialEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/BootInitialEntry.cs
similarity index 100%
rename from CHOVY-JUAN/BootInitialEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/BootInitialEntry.cs
diff --git a/CHOVY-JUAN/BootValidationEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/BootValidationEntry.cs
similarity index 100%
rename from CHOVY-JUAN/BootValidationEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/BootValidationEntry.cs
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/BootVolumeDescriptor.cs b/CHOVY-SIGN/DiscUtils/Iso9660/BootVolumeDescriptor.cs
new file mode 100644
index 0000000..335711b
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/BootVolumeDescriptor.cs
@@ -0,0 +1,56 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using DiscUtils.Streams;
+
+namespace DiscUtils.Iso9660
+{
+ internal class BootVolumeDescriptor : BaseVolumeDescriptor
+ {
+ public const string ElToritoSystemIdentifier = "EL TORITO SPECIFICATION";
+
+ public BootVolumeDescriptor(uint catalogSector)
+ : base(VolumeDescriptorType.Boot, 1)
+ {
+ CatalogSector = catalogSector;
+ }
+
+ public BootVolumeDescriptor(byte[] src, int offset)
+ : base(src, offset)
+ {
+ SystemId = EndianUtilities.BytesToString(src, offset + 0x7, 0x20).TrimEnd('\0');
+ CatalogSector = EndianUtilities.ToUInt32LittleEndian(src, offset + 0x47);
+ }
+
+ public uint CatalogSector { get; }
+
+ public string SystemId { get; }
+
+ internal override void WriteTo(byte[] buffer, int offset)
+ {
+ base.WriteTo(buffer, offset);
+
+ EndianUtilities.StringToBytes(ElToritoSystemIdentifier, buffer, offset + 7, 0x20);
+ EndianUtilities.WriteBytesLittleEndian(CatalogSector, buffer, offset + 0x47);
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/BootVolumeDescriptorRegion.cs b/CHOVY-SIGN/DiscUtils/Iso9660/BootVolumeDescriptorRegion.cs
new file mode 100644
index 0000000..f98d1b7
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/BootVolumeDescriptorRegion.cs
@@ -0,0 +1,42 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+namespace DiscUtils.Iso9660
+{
+ internal class BootVolumeDescriptorRegion : VolumeDescriptorDiskRegion
+ {
+ private readonly BootVolumeDescriptor _descriptor;
+
+ public BootVolumeDescriptorRegion(BootVolumeDescriptor descriptor, long start)
+ : base(start)
+ {
+ _descriptor = descriptor;
+ }
+
+ protected override byte[] GetBlockData()
+ {
+ byte[] buffer = new byte[IsoUtilities.SectorSize];
+ _descriptor.WriteTo(buffer, 0);
+ return buffer;
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/BuildDirectoryInfo.cs b/CHOVY-SIGN/DiscUtils/Iso9660/BuildDirectoryInfo.cs
new file mode 100644
index 0000000..2fdc382
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/BuildDirectoryInfo.cs
@@ -0,0 +1,217 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using DiscUtils.CoreCompat;
+using DiscUtils.Streams;
+
+namespace DiscUtils.Iso9660
+{
+ ///
+ /// Represents a directory that will be built into the ISO image.
+ ///
+ public sealed class BuildDirectoryInfo : BuildDirectoryMember
+ {
+ internal static readonly Comparer PathTableSortComparison = new PathTableComparison();
+ private readonly Dictionary _members;
+
+ private readonly BuildDirectoryInfo _parent;
+ private List _sortedMembers;
+
+ internal BuildDirectoryInfo(string name, BuildDirectoryInfo parent)
+ : base(name, MakeShortDirName(name, parent))
+ {
+ _parent = parent == null ? this : parent;
+ HierarchyDepth = parent == null ? 0 : parent.HierarchyDepth + 1;
+ _members = new Dictionary();
+ }
+
+ internal int HierarchyDepth { get; }
+
+ ///
+ /// The parent directory, or null if none.
+ ///
+ public override BuildDirectoryInfo Parent
+ {
+ get { return _parent; }
+ }
+
+ ///
+ /// Gets the specified child directory or file.
+ ///
+ /// The name of the file or directory to get.
+ /// The member found (or null).
+ /// true if the specified member was found.
+ internal bool TryGetMember(string name, out BuildDirectoryMember member)
+ {
+ return _members.TryGetValue(name, out member);
+ }
+
+ internal void Add(BuildDirectoryMember member)
+ {
+ _members.Add(member.Name, member);
+ _sortedMembers = null;
+ }
+
+ internal override long GetDataSize(Encoding enc)
+ {
+ List sorted = GetSortedMembers();
+
+ long total = 34 * 2; // Two pseudo entries (self & parent)
+
+ foreach (BuildDirectoryMember m in sorted)
+ {
+ uint recordSize = m.GetDirectoryRecordSize(enc);
+
+ // If this record would span a sector boundary, then the current sector is
+ // zero-padded, and the record goes at the start of the next sector.
+ if (total % IsoUtilities.SectorSize + recordSize > IsoUtilities.SectorSize)
+ {
+ long padLength = IsoUtilities.SectorSize - total % IsoUtilities.SectorSize;
+ total += padLength;
+ }
+
+ total += recordSize;
+ }
+
+ return MathUtilities.RoundUp(total, IsoUtilities.SectorSize);
+ }
+
+ internal uint GetPathTableEntrySize(Encoding enc)
+ {
+ int nameBytes = enc.GetByteCount(PickName(null, enc));
+
+ return (uint)(8 + nameBytes + ((nameBytes & 0x1) == 1 ? 1 : 0));
+ }
+
+ internal int Write(byte[] buffer, int offset, Dictionary locationTable, Encoding enc)
+ {
+ int pos = 0;
+
+ List sorted = GetSortedMembers();
+
+ // Two pseudo entries, effectively '.' and '..'
+ pos += WriteMember(this, "\0", Encoding.ASCII, buffer, offset + pos, locationTable, enc);
+ pos += WriteMember(_parent, "\x01", Encoding.ASCII, buffer, offset + pos, locationTable, enc);
+
+ foreach (BuildDirectoryMember m in sorted)
+ {
+ uint recordSize = m.GetDirectoryRecordSize(enc);
+
+ if (pos % IsoUtilities.SectorSize + recordSize > IsoUtilities.SectorSize)
+ {
+ int padLength = IsoUtilities.SectorSize - pos % IsoUtilities.SectorSize;
+ Array.Clear(buffer, offset + pos, padLength);
+ pos += padLength;
+ }
+
+ pos += WriteMember(m, null, enc, buffer, offset + pos, locationTable, enc);
+ }
+
+ // Ensure final padding data is zero'd
+ int finalPadLength = MathUtilities.RoundUp(pos, IsoUtilities.SectorSize) - pos;
+ Array.Clear(buffer, offset + pos, finalPadLength);
+
+ return pos + finalPadLength;
+ }
+
+ private static int WriteMember(BuildDirectoryMember m, string nameOverride, Encoding nameEnc, byte[] buffer, int offset, Dictionary locationTable, Encoding dataEnc)
+ {
+ DirectoryRecord dr = new DirectoryRecord();
+ dr.FileIdentifier = m.PickName(nameOverride, nameEnc);
+ dr.LocationOfExtent = locationTable[m];
+ dr.DataLength = (uint)m.GetDataSize(dataEnc);
+ dr.RecordingDateAndTime = m.CreationTime;
+ dr.Flags = m is BuildDirectoryInfo ? FileFlags.Directory : FileFlags.None;
+ return dr.WriteTo(buffer, offset, nameEnc);
+ }
+
+ private static string MakeShortDirName(string longName, BuildDirectoryInfo dir)
+ {
+ if (IsoUtilities.IsValidDirectoryName(longName))
+ {
+ return longName;
+ }
+
+ char[] shortNameChars = longName.ToUpper(CultureInfo.InvariantCulture).ToCharArray();
+ for (int i = 0; i < shortNameChars.Length; ++i)
+ {
+ if (!IsoUtilities.IsValidDChar(shortNameChars[i]) && shortNameChars[i] != '.' && shortNameChars[i] != ';')
+ {
+ shortNameChars[i] = '_';
+ }
+ }
+
+ return new string(shortNameChars);
+ }
+
+ private List GetSortedMembers()
+ {
+ if (_sortedMembers == null)
+ {
+ List sorted = new List(_members.Values);
+ sorted.Sort(SortedComparison);
+ _sortedMembers = sorted;
+ }
+
+ return _sortedMembers;
+ }
+
+ private class PathTableComparison : Comparer
+ {
+ public override int Compare(BuildDirectoryInfo x, BuildDirectoryInfo y)
+ {
+ if (x.HierarchyDepth != y.HierarchyDepth)
+ {
+ return x.HierarchyDepth - y.HierarchyDepth;
+ }
+
+ if (x.Parent != y.Parent)
+ {
+ return Compare(x.Parent, y.Parent);
+ }
+
+ return CompareNames(x.Name, y.Name, ' ');
+ }
+
+ private static int CompareNames(string x, string y, char padChar)
+ {
+ int max = Math.Max(x.Length, y.Length);
+ for (int i = 0; i < max; ++i)
+ {
+ char xChar = i < x.Length ? x[i] : padChar;
+ char yChar = i < y.Length ? y[i] : padChar;
+
+ if (xChar != yChar)
+ {
+ return xChar - yChar;
+ }
+ }
+
+ return 0;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-JUAN/BuildDirectoryMember.cs b/CHOVY-SIGN/DiscUtils/Iso9660/BuildDirectoryMember.cs
similarity index 100%
rename from CHOVY-JUAN/BuildDirectoryMember.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/BuildDirectoryMember.cs
diff --git a/CHOVY-JUAN/BuildFileInfo.cs b/CHOVY-SIGN/DiscUtils/Iso9660/BuildFileInfo.cs
similarity index 100%
rename from CHOVY-JUAN/BuildFileInfo.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/BuildFileInfo.cs
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/BuildParameters.cs b/CHOVY-SIGN/DiscUtils/Iso9660/BuildParameters.cs
new file mode 100644
index 0000000..1ac3892
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/BuildParameters.cs
@@ -0,0 +1,37 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+namespace DiscUtils.Iso9660
+{
+ internal class BuildParameters
+ {
+ public BuildParameters()
+ {
+ VolumeIdentifier = string.Empty;
+ UseJoliet = true;
+ }
+
+ public bool UseJoliet { get; set; }
+
+ public string VolumeIdentifier { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/CDBuilder.cs b/CHOVY-SIGN/DiscUtils/Iso9660/CDBuilder.cs
new file mode 100644
index 0000000..7042d1e
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/CDBuilder.cs
@@ -0,0 +1,498 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using DiscUtils.Streams;
+
+namespace DiscUtils.Iso9660
+{
+ ///
+ /// Class that creates ISO images.
+ ///
+ ///
+ ///
+ /// CDBuilder builder = new CDBuilder();
+ /// builder.VolumeIdentifier = "MYISO";
+ /// builder.UseJoliet = true;
+ /// builder.AddFile("Hello.txt", Encoding.ASCII.GetBytes("hello world!"));
+ /// builder.Build(@"C:\TEMP\myiso.iso");
+ ///
+ ///
+ public sealed class CDBuilder : StreamBuilder
+ {
+ private const long DiskStart = 0x8000;
+ private BootInitialEntry _bootEntry;
+ private Stream _bootImage;
+
+ private readonly BuildParameters _buildParams;
+ private readonly List _dirs;
+
+ private readonly List _files;
+ private readonly BuildDirectoryInfo _rootDirectory;
+
+ ///
+ /// Initializes a new instance of the CDBuilder class.
+ ///
+ public CDBuilder()
+ {
+ _files = new List();
+ _dirs = new List();
+ _rootDirectory = new BuildDirectoryInfo("\0", null);
+ _dirs.Add(_rootDirectory);
+
+ _buildParams = new BuildParameters();
+ _buildParams.UseJoliet = true;
+ }
+
+ ///
+ /// Gets or sets a value indicating whether to update the ISOLINUX info table at the
+ /// start of the boot image. Use with ISOLINUX only.
+ ///
+ ///
+ /// ISOLINUX has an 'information table' at the start of the boot loader that verifies
+ /// the CD has been loaded correctly by the BIOS. This table needs to be updated
+ /// to match the actual ISO.
+ ///
+ public bool UpdateIsolinuxBootTable { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether Joliet file-system extensions should be used.
+ ///
+ public bool UseJoliet
+ {
+ get { return _buildParams.UseJoliet; }
+ set { _buildParams.UseJoliet = value; }
+ }
+
+ ///
+ /// Gets or sets the Volume Identifier for the ISO file.
+ ///
+ ///
+ /// Must be a valid identifier, i.e. max 32 characters in the range A-Z, 0-9 or _.
+ /// Lower-case characters are not permitted.
+ ///
+ public string VolumeIdentifier
+ {
+ get { return _buildParams.VolumeIdentifier; }
+
+ set
+ {
+ if (value.Length > 32)
+ {
+ throw new ArgumentException("Not a valid volume identifier");
+ }
+ _buildParams.VolumeIdentifier = value;
+ }
+ }
+
+ ///
+ /// Sets the boot image for the ISO image.
+ ///
+ /// Stream containing the boot image.
+ /// The type of emulation requested of the BIOS.
+ /// The memory segment to load the image to (0 for default).
+ public void SetBootImage(Stream image, BootDeviceEmulation emulation, int loadSegment)
+ {
+ if (_bootEntry != null)
+ {
+ throw new InvalidOperationException("Boot image already set");
+ }
+
+ _bootEntry = new BootInitialEntry();
+ _bootEntry.BootIndicator = 0x88;
+ _bootEntry.BootMediaType = emulation;
+ _bootEntry.LoadSegment = (ushort)loadSegment;
+ _bootEntry.SystemType = 0;
+ _bootImage = image;
+ }
+
+ ///
+ /// Adds a directory to the ISO image.
+ ///
+ /// The name of the directory on the ISO image.
+ /// The object representing this directory.
+ ///
+ /// The name is the full path to the directory, for example:
+ ///
+ /// builder.AddDirectory(@"DIRA\DIRB\DIRC");
+ ///
+ ///
+ public BuildDirectoryInfo AddDirectory(string name)
+ {
+ string[] nameElements = name.Split(new[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
+ return GetDirectory(nameElements, nameElements.Length, true);
+ }
+
+ ///
+ /// Adds a byte array to the ISO image as a file.
+ ///
+ /// The name of the file on the ISO image.
+ /// The contents of the file.
+ /// The object representing this file.
+ ///
+ /// The name is the full path to the file, for example:
+ ///
+ /// builder.AddFile(@"DIRA\DIRB\FILE.TXT;1", new byte[]{0,1,2});
+ ///
+ /// Note the version number at the end of the file name is optional, if not
+ /// specified the default of 1 will be used.
+ ///
+ public BuildFileInfo AddFile(string name, byte[] content)
+ {
+ string[] nameElements = name.Split(new[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
+ BuildDirectoryInfo dir = GetDirectory(nameElements, nameElements.Length - 1, true);
+
+ BuildDirectoryMember existing;
+ if (dir.TryGetMember(nameElements[nameElements.Length - 1], out existing))
+ {
+ throw new IOException("File already exists");
+ }
+ BuildFileInfo fi = new BuildFileInfo(nameElements[nameElements.Length - 1], dir, content);
+ _files.Add(fi);
+ dir.Add(fi);
+ return fi;
+ }
+
+ ///
+ /// Adds a disk file to the ISO image as a file.
+ ///
+ /// The name of the file on the ISO image.
+ /// The name of the file on disk.
+ /// The object representing this file.
+ ///
+ /// The name is the full path to the file, for example:
+ ///
+ /// builder.AddFile(@"DIRA\DIRB\FILE.TXT;1", @"C:\temp\tempfile.bin");
+ ///
+ /// Note the version number at the end of the file name is optional, if not
+ /// specified the default of 1 will be used.
+ ///
+ public BuildFileInfo AddFile(string name, string sourcePath)
+ {
+ string[] nameElements = name.Split(new[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
+ BuildDirectoryInfo dir = GetDirectory(nameElements, nameElements.Length - 1, true);
+
+ BuildDirectoryMember existing;
+ if (dir.TryGetMember(nameElements[nameElements.Length - 1], out existing))
+ {
+ throw new IOException("File already exists");
+ }
+ BuildFileInfo fi = new BuildFileInfo(nameElements[nameElements.Length - 1], dir, sourcePath);
+ _files.Add(fi);
+ dir.Add(fi);
+ return fi;
+ }
+
+ ///
+ /// Adds a stream to the ISO image as a file.
+ ///
+ /// The name of the file on the ISO image.
+ /// The contents of the file.
+ /// The object representing this file.
+ ///
+ /// The name is the full path to the file, for example:
+ ///
+ /// builder.AddFile(@"DIRA\DIRB\FILE.TXT;1", stream);
+ ///
+ /// Note the version number at the end of the file name is optional, if not
+ /// specified the default of 1 will be used.
+ ///
+ public BuildFileInfo AddFile(string name, Stream source)
+ {
+ if (!source.CanSeek)
+ {
+ throw new ArgumentException("source doesn't support seeking", nameof(source));
+ }
+
+ string[] nameElements = name.Split(new[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
+ BuildDirectoryInfo dir = GetDirectory(nameElements, nameElements.Length - 1, true);
+
+ BuildDirectoryMember existing;
+ if (dir.TryGetMember(nameElements[nameElements.Length - 1], out existing))
+ {
+ throw new IOException("File already exists");
+ }
+ BuildFileInfo fi = new BuildFileInfo(nameElements[nameElements.Length - 1], dir, source);
+ _files.Add(fi);
+ dir.Add(fi);
+ return fi;
+ }
+
+ protected override List FixExtents(out long totalLength)
+ {
+ List fixedRegions = new List();
+
+ DateTime buildTime = DateTime.UtcNow;
+
+ Encoding suppEncoding = _buildParams.UseJoliet ? Encoding.BigEndianUnicode : Encoding.ASCII;
+
+ Dictionary primaryLocationTable = new Dictionary();
+ Dictionary supplementaryLocationTable =
+ new Dictionary();
+
+ long focus = DiskStart + 3 * IsoUtilities.SectorSize; // Primary, Supplementary, End (fixed at end...)
+ if (_bootEntry != null)
+ {
+ focus += IsoUtilities.SectorSize;
+ }
+
+ // ####################################################################
+ // # 0. Fix boot image location
+ // ####################################################################
+ long bootCatalogPos = 0;
+ if (_bootEntry != null)
+ {
+ long bootImagePos = focus;
+ Stream realBootImage = PatchBootImage(_bootImage, (uint)(DiskStart / IsoUtilities.SectorSize),
+ (uint)(bootImagePos / IsoUtilities.SectorSize));
+ BuilderStreamExtent bootImageExtent = new BuilderStreamExtent(focus, realBootImage);
+ fixedRegions.Add(bootImageExtent);
+ focus += MathUtilities.RoundUp(bootImageExtent.Length, IsoUtilities.SectorSize);
+
+ bootCatalogPos = focus;
+ byte[] bootCatalog = new byte[IsoUtilities.SectorSize];
+ BootValidationEntry bve = new BootValidationEntry();
+ bve.WriteTo(bootCatalog, 0x00);
+ _bootEntry.ImageStart = (uint)MathUtilities.Ceil(bootImagePos, IsoUtilities.SectorSize);
+ _bootEntry.SectorCount = (ushort)MathUtilities.Ceil(_bootImage.Length, Sizes.Sector);
+ _bootEntry.WriteTo(bootCatalog, 0x20);
+ fixedRegions.Add(new BuilderBufferExtent(bootCatalogPos, bootCatalog));
+ focus += IsoUtilities.SectorSize;
+ }
+
+ // ####################################################################
+ // # 1. Fix file locations
+ // ####################################################################
+
+ // Find end of the file data, fixing the files in place as we go
+ foreach (BuildFileInfo fi in _files)
+ {
+ primaryLocationTable.Add(fi, (uint)(focus / IsoUtilities.SectorSize));
+ supplementaryLocationTable.Add(fi, (uint)(focus / IsoUtilities.SectorSize));
+ FileExtent extent = new FileExtent(fi, focus);
+
+ // Only remember files of non-zero length (otherwise we'll stomp on a valid file)
+ if (extent.Length != 0)
+ {
+ fixedRegions.Add(extent);
+ }
+
+ focus += MathUtilities.RoundUp(extent.Length, IsoUtilities.SectorSize);
+ }
+
+ // ####################################################################
+ // # 2. Fix directory locations
+ // ####################################################################
+
+ // There are two directory tables
+ // 1. Primary (std ISO9660)
+ // 2. Supplementary (Joliet)
+
+ // Find start of the second set of directory data, fixing ASCII directories in place.
+ long startOfFirstDirData = focus;
+ foreach (BuildDirectoryInfo di in _dirs)
+ {
+ primaryLocationTable.Add(di, (uint)(focus / IsoUtilities.SectorSize));
+ DirectoryExtent extent = new DirectoryExtent(di, primaryLocationTable, Encoding.ASCII, focus);
+ fixedRegions.Add(extent);
+ focus += MathUtilities.RoundUp(extent.Length, IsoUtilities.SectorSize);
+ }
+
+ // Find end of the second directory table, fixing supplementary directories in place.
+ long startOfSecondDirData = focus;
+ foreach (BuildDirectoryInfo di in _dirs)
+ {
+ supplementaryLocationTable.Add(di, (uint)(focus / IsoUtilities.SectorSize));
+ DirectoryExtent extent = new DirectoryExtent(di, supplementaryLocationTable, suppEncoding, focus);
+ fixedRegions.Add(extent);
+ focus += MathUtilities.RoundUp(extent.Length, IsoUtilities.SectorSize);
+ }
+
+ // ####################################################################
+ // # 3. Fix path tables
+ // ####################################################################
+
+ // There are four path tables:
+ // 1. LE, ASCII
+ // 2. BE, ASCII
+ // 3. LE, Supp Encoding (Joliet)
+ // 4. BE, Supp Encoding (Joliet)
+
+ // Find end of the path table
+ long startOfFirstPathTable = focus;
+ PathTable pathTable = new PathTable(false, Encoding.ASCII, _dirs, primaryLocationTable, focus);
+ fixedRegions.Add(pathTable);
+ focus += MathUtilities.RoundUp(pathTable.Length, IsoUtilities.SectorSize);
+ long primaryPathTableLength = pathTable.Length;
+
+ long startOfSecondPathTable = focus;
+ pathTable = new PathTable(true, Encoding.ASCII, _dirs, primaryLocationTable, focus);
+ fixedRegions.Add(pathTable);
+ focus += MathUtilities.RoundUp(pathTable.Length, IsoUtilities.SectorSize);
+
+ long startOfThirdPathTable = focus;
+ pathTable = new PathTable(false, suppEncoding, _dirs, supplementaryLocationTable, focus);
+ fixedRegions.Add(pathTable);
+ focus += MathUtilities.RoundUp(pathTable.Length, IsoUtilities.SectorSize);
+ long supplementaryPathTableLength = pathTable.Length;
+
+ long startOfFourthPathTable = focus;
+ pathTable = new PathTable(true, suppEncoding, _dirs, supplementaryLocationTable, focus);
+ fixedRegions.Add(pathTable);
+ focus += MathUtilities.RoundUp(pathTable.Length, IsoUtilities.SectorSize);
+
+ // Find the end of the disk
+ totalLength = focus;
+
+ // ####################################################################
+ // # 4. Prepare volume descriptors now other structures are fixed
+ // ####################################################################
+ int regionIdx = 0;
+ focus = DiskStart;
+ PrimaryVolumeDescriptor pvDesc = new PrimaryVolumeDescriptor(
+ (uint)(totalLength / IsoUtilities.SectorSize), // VolumeSpaceSize
+ (uint)primaryPathTableLength, // PathTableSize
+ (uint)(startOfFirstPathTable / IsoUtilities.SectorSize), // TypeLPathTableLocation
+ (uint)(startOfSecondPathTable / IsoUtilities.SectorSize), // TypeMPathTableLocation
+ (uint)(startOfFirstDirData / IsoUtilities.SectorSize), // RootDirectory.LocationOfExtent
+ (uint)_rootDirectory.GetDataSize(Encoding.ASCII), // RootDirectory.DataLength
+ buildTime);
+ pvDesc.VolumeIdentifier = _buildParams.VolumeIdentifier;
+ PrimaryVolumeDescriptorRegion pvdr = new PrimaryVolumeDescriptorRegion(pvDesc, focus);
+ fixedRegions.Insert(regionIdx++, pvdr);
+ focus += IsoUtilities.SectorSize;
+
+ if (_bootEntry != null)
+ {
+ BootVolumeDescriptor bvDesc = new BootVolumeDescriptor(
+ (uint)(bootCatalogPos / IsoUtilities.SectorSize));
+ BootVolumeDescriptorRegion bvdr = new BootVolumeDescriptorRegion(bvDesc, focus);
+ fixedRegions.Insert(regionIdx++, bvdr);
+ focus += IsoUtilities.SectorSize;
+ }
+
+ SupplementaryVolumeDescriptor svDesc = new SupplementaryVolumeDescriptor(
+ (uint)(totalLength / IsoUtilities.SectorSize), // VolumeSpaceSize
+ (uint)supplementaryPathTableLength, // PathTableSize
+ (uint)(startOfThirdPathTable / IsoUtilities.SectorSize), // TypeLPathTableLocation
+ (uint)(startOfFourthPathTable / IsoUtilities.SectorSize), // TypeMPathTableLocation
+ (uint)(startOfSecondDirData / IsoUtilities.SectorSize), // RootDirectory.LocationOfExtent
+ (uint)_rootDirectory.GetDataSize(suppEncoding), // RootDirectory.DataLength
+ buildTime,
+ suppEncoding);
+ svDesc.VolumeIdentifier = _buildParams.VolumeIdentifier;
+ SupplementaryVolumeDescriptorRegion svdr = new SupplementaryVolumeDescriptorRegion(svDesc, focus);
+ fixedRegions.Insert(regionIdx++, svdr);
+ focus += IsoUtilities.SectorSize;
+
+ VolumeDescriptorSetTerminator evDesc = new VolumeDescriptorSetTerminator();
+ VolumeDescriptorSetTerminatorRegion evdr = new VolumeDescriptorSetTerminatorRegion(evDesc, focus);
+ fixedRegions.Insert(regionIdx++, evdr);
+
+ return fixedRegions;
+ }
+
+ ///
+ /// Patches a boot image (esp. for ISOLINUX) before it is written to the disk.
+ ///
+ /// The original (master) boot image.
+ /// The logical block address of the primary volume descriptor.
+ /// The logical block address of the boot image itself.
+ /// A stream containing the patched boot image - does not need to be disposed.
+ private Stream PatchBootImage(Stream bootImage, uint pvdLba, uint bootImageLba)
+ {
+ // Early-exit if no patching to do...
+ if (!UpdateIsolinuxBootTable)
+ {
+ return bootImage;
+ }
+
+ byte[] bootData = StreamUtilities.ReadExact(bootImage, (int)bootImage.Length);
+
+ Array.Clear(bootData, 8, 56);
+
+ uint checkSum = 0;
+ for (int i = 64; i < bootData.Length; i += 4)
+ {
+ checkSum += EndianUtilities.ToUInt32LittleEndian(bootData, i);
+ }
+
+ EndianUtilities.WriteBytesLittleEndian(pvdLba, bootData, 8);
+ EndianUtilities.WriteBytesLittleEndian(bootImageLba, bootData, 12);
+ EndianUtilities.WriteBytesLittleEndian(bootData.Length, bootData, 16);
+ EndianUtilities.WriteBytesLittleEndian(checkSum, bootData, 20);
+
+ return new MemoryStream(bootData, false);
+ }
+
+ private BuildDirectoryInfo GetDirectory(string[] path, int pathLength, bool createMissing)
+ {
+ BuildDirectoryInfo di = TryGetDirectory(path, pathLength, createMissing);
+
+ if (di == null)
+ {
+ throw new DirectoryNotFoundException("Directory not found");
+ }
+
+ return di;
+ }
+
+ private BuildDirectoryInfo TryGetDirectory(string[] path, int pathLength, bool createMissing)
+ {
+ BuildDirectoryInfo focus = _rootDirectory;
+
+ for (int i = 0; i < pathLength; ++i)
+ {
+ BuildDirectoryMember next;
+ if (!focus.TryGetMember(path[i], out next))
+ {
+ if (createMissing)
+ {
+ // This directory doesn't exist, create it...
+ BuildDirectoryInfo di = new BuildDirectoryInfo(path[i], focus);
+ focus.Add(di);
+ _dirs.Add(di);
+ focus = di;
+ }
+ else
+ {
+ return null;
+ }
+ }
+ else
+ {
+ BuildDirectoryInfo nextAsBuildDirectoryInfo = next as BuildDirectoryInfo;
+ if (nextAsBuildDirectoryInfo == null)
+ {
+ throw new IOException("File with conflicting name exists");
+ }
+ focus = nextAsBuildDirectoryInfo;
+ }
+ }
+
+ return focus;
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/CDReader.cs b/CHOVY-SIGN/DiscUtils/Iso9660/CDReader.cs
new file mode 100644
index 0000000..8a544ca
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/CDReader.cs
@@ -0,0 +1,207 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System.IO;
+using DiscUtils.Streams;
+using DiscUtils.Vfs;
+
+namespace DiscUtils.Iso9660
+{
+ ///
+ /// Class for reading existing ISO images.
+ ///
+ public class CDReader : VfsFileSystemFacade, IClusterBasedFileSystem, IUnixFileSystem
+ {
+ ///
+ /// Initializes a new instance of the CDReader class.
+ ///
+ /// The stream to read the ISO image from.
+ /// Whether to read Joliet extensions.
+ public CDReader(Stream data, bool joliet)
+ : base(new VfsCDReader(data, joliet, false)) {}
+
+ ///
+ /// Initializes a new instance of the CDReader class.
+ ///
+ /// The stream to read the ISO image from.
+ /// Whether to read Joliet extensions.
+ /// Hides version numbers (e.g. ";1") from the end of files.
+ public CDReader(Stream data, bool joliet, bool hideVersions)
+ : base(new VfsCDReader(data, joliet, hideVersions)) {}
+
+ ///
+ /// Gets which of the Iso9660 variants is being used.
+ ///
+ public Iso9660Variant ActiveVariant
+ {
+ get { return GetRealFileSystem().ActiveVariant; }
+ }
+
+ ///
+ /// Gets the emulation requested of BIOS when the image is loaded.
+ ///
+ public BootDeviceEmulation BootEmulation
+ {
+ get { return GetRealFileSystem().BootEmulation; }
+ }
+
+ ///
+ /// Gets the absolute start position (in bytes) of the boot image, or zero if not found.
+ ///
+ public long BootImageStart
+ {
+ get { return GetRealFileSystem().BootImageStart; }
+ }
+
+ ///
+ /// Gets the memory segment the image should be loaded into (0 for default).
+ ///
+ public int BootLoadSegment
+ {
+ get { return GetRealFileSystem().BootLoadSegment; }
+ }
+
+ ///
+ /// Gets a value indicating whether a boot image is present.
+ ///
+ public bool HasBootImage
+ {
+ get { return GetRealFileSystem().HasBootImage; }
+ }
+
+ ///
+ /// Gets the size (in bytes) of each cluster.
+ ///
+ public long ClusterSize
+ {
+ get { return GetRealFileSystem().ClusterSize; }
+ }
+
+ ///
+ /// Gets the total number of clusters managed by the file system.
+ ///
+ public long TotalClusters
+ {
+ get { return GetRealFileSystem().TotalClusters; }
+ }
+
+ ///
+ /// Converts a cluster (index) into an absolute byte position in the underlying stream.
+ ///
+ /// The cluster to convert.
+ /// The corresponding absolute byte position.
+ public long ClusterToOffset(long cluster)
+ {
+ return GetRealFileSystem().ClusterToOffset(cluster);
+ }
+
+ ///
+ /// Converts an absolute byte position in the underlying stream to a cluster (index).
+ ///
+ /// The byte position to convert.
+ /// The cluster containing the specified byte.
+ public long OffsetToCluster(long offset)
+ {
+ return GetRealFileSystem().OffsetToCluster(offset);
+ }
+
+ ///
+ /// Converts a file name to the list of clusters occupied by the file's data.
+ ///
+ /// The path to inspect.
+ /// The clusters.
+ /// Note that in some file systems, small files may not have dedicated
+ /// clusters. Only dedicated clusters will be returned.
+ public Range[] PathToClusters(string path)
+ {
+ return GetRealFileSystem().PathToClusters(path);
+ }
+
+ ///
+ /// Converts a file name to the extents containing its data.
+ ///
+ /// The path to inspect.
+ /// The file extents, as absolute byte positions in the underlying stream.
+ /// Use this method with caution - not all file systems will store all bytes
+ /// directly in extents. Files may be compressed, sparse or encrypted. This method
+ /// merely indicates where file data is stored, not what's stored.
+ public StreamExtent[] PathToExtents(string path)
+ {
+ return GetRealFileSystem().PathToExtents(path);
+ }
+
+ ///
+ /// Gets an object that can convert between clusters and files.
+ ///
+ /// The cluster map.
+ public ClusterMap BuildClusterMap()
+ {
+ return GetRealFileSystem().BuildClusterMap();
+ }
+
+ ///
+ /// Retrieves Unix-specific information about a file or directory.
+ ///
+ /// Path to the file or directory.
+ /// Information about the owner, group, permissions and type of the
+ /// file or directory.
+ public UnixFileSystemInfo GetUnixFileInfo(string path)
+ {
+ return GetRealFileSystem().GetUnixFileInfo(path);
+ }
+
+ ///
+ /// Detects if a stream contains a valid ISO file system.
+ ///
+ /// The stream to inspect.
+ /// true if the stream contains an ISO file system, else false.
+ public static bool Detect(Stream data)
+ {
+ byte[] buffer = new byte[IsoUtilities.SectorSize];
+
+ if (data.Length < 0x8000 + IsoUtilities.SectorSize)
+ {
+ return false;
+ }
+
+ data.Position = 0x8000;
+ int numRead = StreamUtilities.ReadMaximum(data, buffer, 0, IsoUtilities.SectorSize);
+ if (numRead != IsoUtilities.SectorSize)
+ {
+ return false;
+ }
+
+ BaseVolumeDescriptor bvd = new BaseVolumeDescriptor(buffer, 0);
+
+ return bvd.StandardIdentifier == BaseVolumeDescriptor.Iso9660StandardIdentifier;
+ }
+
+ ///
+ /// Opens a stream containing the boot image.
+ ///
+ /// The boot image as a stream.
+ public Stream OpenBootImage()
+ {
+ return GetRealFileSystem().OpenBootImage();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/CommonVolumeDescriptor.cs b/CHOVY-SIGN/DiscUtils/Iso9660/CommonVolumeDescriptor.cs
new file mode 100644
index 0000000..7ef3bf6
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/CommonVolumeDescriptor.cs
@@ -0,0 +1,140 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+using DiscUtils.Internal;
+using DiscUtils.Streams;
+
+namespace DiscUtils.Iso9660
+{
+ internal class CommonVolumeDescriptor : BaseVolumeDescriptor
+ {
+ public string AbstractFileIdentifier;
+ public string ApplicationIdentifier;
+ public string BibliographicFileIdentifier;
+ public Encoding CharacterEncoding;
+ public string CopyrightFileIdentifier;
+ public DateTime CreationDateAndTime;
+ public string DataPreparerIdentifier;
+ public DateTime EffectiveDateAndTime;
+ public DateTime ExpirationDateAndTime;
+ public byte FileStructureVersion;
+ public ushort LogicalBlockSize;
+ public DateTime ModificationDateAndTime;
+ public uint OptionalTypeLPathTableLocation;
+ public uint OptionalTypeMPathTableLocation;
+ public uint PathTableSize;
+ public string PublisherIdentifier;
+ public DirectoryRecord RootDirectory;
+
+ public string SystemIdentifier;
+ public uint TypeLPathTableLocation;
+ public uint TypeMPathTableLocation;
+ public string VolumeIdentifier;
+ public ushort VolumeSequenceNumber;
+ public string VolumeSetIdentifier;
+ public ushort VolumeSetSize;
+ public uint VolumeSpaceSize;
+
+ public CommonVolumeDescriptor(byte[] src, int offset, Encoding enc)
+ : base(src, offset)
+ {
+ CharacterEncoding = enc;
+
+ SystemIdentifier = IsoUtilities.ReadChars(src, offset + 8, 32, CharacterEncoding);
+ VolumeIdentifier = IsoUtilities.ReadChars(src, offset + 40, 32, CharacterEncoding);
+ VolumeSpaceSize = IsoUtilities.ToUInt32FromBoth(src, offset + 80);
+ VolumeSetSize = IsoUtilities.ToUInt16FromBoth(src, offset + 120);
+ VolumeSequenceNumber = IsoUtilities.ToUInt16FromBoth(src, offset + 124);
+ LogicalBlockSize = IsoUtilities.ToUInt16FromBoth(src, offset + 128);
+ PathTableSize = IsoUtilities.ToUInt32FromBoth(src, offset + 132);
+ TypeLPathTableLocation = EndianUtilities.ToUInt32LittleEndian(src, offset + 140);
+ OptionalTypeLPathTableLocation = EndianUtilities.ToUInt32LittleEndian(src, offset + 144);
+ TypeMPathTableLocation = Utilities.BitSwap(EndianUtilities.ToUInt32LittleEndian(src, offset + 148));
+ OptionalTypeMPathTableLocation = Utilities.BitSwap(EndianUtilities.ToUInt32LittleEndian(src, offset + 152));
+ DirectoryRecord.ReadFrom(src, offset + 156, CharacterEncoding, out RootDirectory);
+ VolumeSetIdentifier = IsoUtilities.ReadChars(src, offset + 190, 318 - 190, CharacterEncoding);
+ PublisherIdentifier = IsoUtilities.ReadChars(src, offset + 318, 446 - 318, CharacterEncoding);
+ DataPreparerIdentifier = IsoUtilities.ReadChars(src, offset + 446, 574 - 446, CharacterEncoding);
+ ApplicationIdentifier = IsoUtilities.ReadChars(src, offset + 574, 702 - 574, CharacterEncoding);
+ CopyrightFileIdentifier = IsoUtilities.ReadChars(src, offset + 702, 739 - 702, CharacterEncoding);
+ AbstractFileIdentifier = IsoUtilities.ReadChars(src, offset + 739, 776 - 739, CharacterEncoding);
+ BibliographicFileIdentifier = IsoUtilities.ReadChars(src, offset + 776, 813 - 776, CharacterEncoding);
+ CreationDateAndTime = IsoUtilities.ToDateTimeFromVolumeDescriptorTime(src, offset + 813);
+ ModificationDateAndTime = IsoUtilities.ToDateTimeFromVolumeDescriptorTime(src, offset + 830);
+ ExpirationDateAndTime = IsoUtilities.ToDateTimeFromVolumeDescriptorTime(src, offset + 847);
+ EffectiveDateAndTime = IsoUtilities.ToDateTimeFromVolumeDescriptorTime(src, offset + 864);
+ FileStructureVersion = src[offset + 881];
+ }
+
+ public CommonVolumeDescriptor(
+ VolumeDescriptorType type,
+ byte version,
+ uint volumeSpaceSize,
+ uint pathTableSize,
+ uint typeLPathTableLocation,
+ uint typeMPathTableLocation,
+ uint rootDirExtentLocation,
+ uint rootDirDataLength,
+ DateTime buildTime,
+ Encoding enc)
+ : base(type, version)
+ {
+ CharacterEncoding = enc;
+
+ SystemIdentifier = string.Empty;
+ VolumeIdentifier = string.Empty;
+ VolumeSpaceSize = volumeSpaceSize;
+ VolumeSetSize = 1;
+ VolumeSequenceNumber = 1;
+ LogicalBlockSize = IsoUtilities.SectorSize;
+ PathTableSize = pathTableSize;
+ TypeLPathTableLocation = typeLPathTableLocation;
+ ////OptionalTypeLPathTableLocation = 0;
+ TypeMPathTableLocation = typeMPathTableLocation;
+ ////OptionalTypeMPathTableLocation = 0;
+ RootDirectory = new DirectoryRecord();
+ RootDirectory.ExtendedAttributeRecordLength = 0;
+ RootDirectory.LocationOfExtent = rootDirExtentLocation;
+ RootDirectory.DataLength = rootDirDataLength;
+ RootDirectory.RecordingDateAndTime = buildTime;
+ RootDirectory.Flags = FileFlags.Directory;
+ RootDirectory.FileUnitSize = 0;
+ RootDirectory.InterleaveGapSize = 0;
+ RootDirectory.VolumeSequenceNumber = 1;
+ RootDirectory.FileIdentifier = "\0";
+ VolumeSetIdentifier = string.Empty;
+ PublisherIdentifier = string.Empty;
+ DataPreparerIdentifier = string.Empty;
+ ApplicationIdentifier = string.Empty;
+ CopyrightFileIdentifier = string.Empty;
+ AbstractFileIdentifier = string.Empty;
+ BibliographicFileIdentifier = string.Empty;
+ CreationDateAndTime = buildTime;
+ ModificationDateAndTime = buildTime;
+ ExpirationDateAndTime = DateTime.MinValue;
+ EffectiveDateAndTime = buildTime;
+ FileStructureVersion = 1; // V1
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-JUAN/DirectoryExtent.cs b/CHOVY-SIGN/DiscUtils/Iso9660/DirectoryExtent.cs
similarity index 100%
rename from CHOVY-JUAN/DirectoryExtent.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/DirectoryExtent.cs
diff --git a/CHOVY-JUAN/DirectoryRecord.cs b/CHOVY-SIGN/DiscUtils/Iso9660/DirectoryRecord.cs
similarity index 100%
rename from CHOVY-JUAN/DirectoryRecord.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/DirectoryRecord.cs
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/ExtentStream.cs b/CHOVY-SIGN/DiscUtils/Iso9660/ExtentStream.cs
new file mode 100644
index 0000000..e7d5aa4
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/ExtentStream.cs
@@ -0,0 +1,123 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+
+namespace DiscUtils.Iso9660
+{
+ internal class ExtentStream : Stream
+ {
+ private readonly uint _dataLength;
+ private readonly byte _fileUnitSize;
+ private readonly byte _interleaveGapSize;
+
+ private readonly Stream _isoStream;
+ private long _position;
+
+ private readonly uint _startBlock;
+
+ public ExtentStream(Stream isoStream, uint startBlock, uint dataLength, byte fileUnitSize,
+ byte interleaveGapSize)
+ {
+ _isoStream = isoStream;
+ _startBlock = startBlock;
+ _dataLength = dataLength;
+ _fileUnitSize = fileUnitSize;
+ _interleaveGapSize = interleaveGapSize;
+
+ if (_fileUnitSize != 0 || _interleaveGapSize != 0)
+ {
+ throw new NotSupportedException("Non-contiguous extents not supported");
+ }
+ }
+
+ public override bool CanRead
+ {
+ get { return true; }
+ }
+
+ public override bool CanSeek
+ {
+ get { return true; }
+ }
+
+ public override bool CanWrite
+ {
+ get { return false; }
+ }
+
+ public override long Length
+ {
+ get { return _dataLength; }
+ }
+
+ public override long Position
+ {
+ get { return _position; }
+ set { _position = value; }
+ }
+
+ public override void Flush() {}
+
+ public override int Read(byte[] buffer, int offset, int count)
+ {
+ if (_position > _dataLength)
+ {
+ return 0;
+ }
+
+ int toRead = (int)Math.Min((uint)count, _dataLength - _position);
+
+ _isoStream.Position = _position + _startBlock * (long)IsoUtilities.SectorSize;
+ int numRead = _isoStream.Read(buffer, offset, toRead);
+ _position += numRead;
+ return numRead;
+ }
+
+ public override long Seek(long offset, SeekOrigin origin)
+ {
+ long newPos = offset;
+ if (origin == SeekOrigin.Current)
+ {
+ newPos += _position;
+ }
+ else if (origin == SeekOrigin.End)
+ {
+ newPos += _dataLength;
+ }
+
+ _position = newPos;
+ return newPos;
+ }
+
+ public override void SetLength(long value)
+ {
+ throw new NotSupportedException();
+ }
+
+ public override void Write(byte[] buffer, int offset, int count)
+ {
+ throw new NotSupportedException();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/File.cs b/CHOVY-SIGN/DiscUtils/Iso9660/File.cs
new file mode 100644
index 0000000..0ca134a
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/File.cs
@@ -0,0 +1,119 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+using DiscUtils.Vfs;
+using DiscUtils.Streams;
+
+namespace DiscUtils.Iso9660
+{
+ internal class File : IVfsFile
+ {
+ protected IsoContext _context;
+ protected ReaderDirEntry _dirEntry;
+
+ public File(IsoContext context, ReaderDirEntry dirEntry)
+ {
+ _context = context;
+ _dirEntry = dirEntry;
+ }
+
+ public virtual byte[] SystemUseData
+ {
+ get { return _dirEntry.Record.SystemUseData; }
+ }
+
+ public UnixFileSystemInfo UnixFileInfo
+ {
+ get
+ {
+ if (!_context.SuspDetected || string.IsNullOrEmpty(_context.RockRidgeIdentifier))
+ {
+ throw new InvalidOperationException("No RockRidge file information available");
+ }
+
+ SuspRecords suspRecords = new SuspRecords(_context, SystemUseData, 0);
+
+ PosixFileInfoSystemUseEntry pfi =
+ suspRecords.GetEntry(_context.RockRidgeIdentifier, "PX");
+ if (pfi != null)
+ {
+ return new UnixFileSystemInfo
+ {
+ FileType = (UnixFileType)((pfi.FileMode >> 12) & 0xff),
+ Permissions = (UnixFilePermissions)(pfi.FileMode & 0xfff),
+ UserId = (int)pfi.UserId,
+ GroupId = (int)pfi.GroupId,
+ Inode = pfi.Inode,
+ LinkCount = (int)pfi.NumLinks
+ };
+ }
+
+ throw new InvalidOperationException("No RockRidge file information available for this file");
+ }
+ }
+
+ public DateTime LastAccessTimeUtc
+ {
+ get { return _dirEntry.LastAccessTimeUtc; }
+
+ set { throw new NotSupportedException(); }
+ }
+
+ public DateTime LastWriteTimeUtc
+ {
+ get { return _dirEntry.LastWriteTimeUtc; }
+
+ set { throw new NotSupportedException(); }
+ }
+
+ public DateTime CreationTimeUtc
+ {
+ get { return _dirEntry.CreationTimeUtc; }
+
+ set { throw new NotSupportedException(); }
+ }
+
+ public FileAttributes FileAttributes
+ {
+ get { return _dirEntry.FileAttributes; }
+
+ set { throw new NotSupportedException(); }
+ }
+
+ public long FileLength
+ {
+ get { return _dirEntry.Record.DataLength; }
+ }
+
+ public IBuffer FileContent
+ {
+ get
+ {
+ ExtentStream es = new ExtentStream(_context.DataStream, _dirEntry.Record.LocationOfExtent,
+ _dirEntry.Record.DataLength, _dirEntry.Record.FileUnitSize, _dirEntry.Record.InterleaveGapSize);
+ return new StreamBuffer(es, Ownership.Dispose);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-JUAN/FileExtent.cs b/CHOVY-SIGN/DiscUtils/Iso9660/FileExtent.cs
similarity index 100%
rename from CHOVY-JUAN/FileExtent.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/FileExtent.cs
diff --git a/CHOVY-JUAN/FileFlags.cs b/CHOVY-SIGN/DiscUtils/Iso9660/FileFlags.cs
similarity index 100%
rename from CHOVY-JUAN/FileFlags.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/FileFlags.cs
diff --git a/CHOVY-JUAN/Iso9660Variant.cs b/CHOVY-SIGN/DiscUtils/Iso9660/Iso9660Variant.cs
similarity index 100%
rename from CHOVY-JUAN/Iso9660Variant.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/Iso9660Variant.cs
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/IsoContext.cs b/CHOVY-SIGN/DiscUtils/Iso9660/IsoContext.cs
new file mode 100644
index 0000000..5ff6396
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/IsoContext.cs
@@ -0,0 +1,42 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System.Collections.Generic;
+using System.IO;
+using DiscUtils.Vfs;
+
+namespace DiscUtils.Iso9660
+{
+ internal class IsoContext : VfsContext
+ {
+ public Stream DataStream { get; set; }
+
+ public string RockRidgeIdentifier { get; set; }
+
+ public bool SuspDetected { get; set; }
+
+ public List SuspExtensions { get; set; }
+
+ public int SuspSkipBytes { get; set; }
+ public CommonVolumeDescriptor VolumeDescriptor { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/IsoUtilities.cs b/CHOVY-SIGN/DiscUtils/Iso9660/IsoUtilities.cs
new file mode 100644
index 0000000..ac6e552
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/IsoUtilities.cs
@@ -0,0 +1,467 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using DiscUtils.Streams;
+
+namespace DiscUtils.Iso9660
+{
+ internal static class IsoUtilities
+ {
+ public const int SectorSize = 2048;
+
+ public static uint ToUInt32FromBoth(byte[] data, int offset)
+ {
+ return EndianUtilities.ToUInt32LittleEndian(data, offset);
+ }
+
+ public static ushort ToUInt16FromBoth(byte[] data, int offset)
+ {
+ return EndianUtilities.ToUInt16LittleEndian(data, offset);
+ }
+
+ internal static void ToBothFromUInt32(byte[] buffer, int offset, uint value)
+ {
+ EndianUtilities.WriteBytesLittleEndian(value, buffer, offset);
+ EndianUtilities.WriteBytesBigEndian(value, buffer, offset + 4);
+ }
+
+ internal static void ToBothFromUInt16(byte[] buffer, int offset, ushort value)
+ {
+ EndianUtilities.WriteBytesLittleEndian(value, buffer, offset);
+ EndianUtilities.WriteBytesBigEndian(value, buffer, offset + 2);
+ }
+
+ internal static void ToBytesFromUInt32(byte[] buffer, int offset, uint value)
+ {
+ EndianUtilities.WriteBytesLittleEndian(value, buffer, offset);
+ }
+
+ internal static void ToBytesFromUInt16(byte[] buffer, int offset, ushort value)
+ {
+ EndianUtilities.WriteBytesLittleEndian(value, buffer, offset);
+ }
+
+ internal static void WriteAChars(byte[] buffer, int offset, int numBytes, string str)
+ {
+ // Validate string
+ if (!IsValidAString(str))
+ {
+ throw new IOException("Attempt to write string with invalid a-characters");
+ }
+
+ ////WriteASCII(buffer, offset, numBytes, true, str);
+ WriteString(buffer, offset, numBytes, true, str, Encoding.ASCII);
+ }
+
+ internal static void WriteDChars(byte[] buffer, int offset, int numBytes, string str)
+ {
+ // Validate string
+ if (!IsValidDString(str))
+ {
+ throw new IOException("Attempt to write string with invalid d-characters");
+ }
+
+ ////WriteASCII(buffer, offset, numBytes, true, str);
+ WriteString(buffer, offset, numBytes, true, str, Encoding.ASCII);
+ }
+
+ internal static void WriteA1Chars(byte[] buffer, int offset, int numBytes, string str, Encoding enc)
+ {
+ // Validate string
+ if (!IsValidAString(str))
+ {
+ throw new IOException("Attempt to write string with invalid a-characters");
+ }
+
+ WriteString(buffer, offset, numBytes, true, str, enc);
+ }
+
+ internal static void WriteD1Chars(byte[] buffer, int offset, int numBytes, string str, Encoding enc)
+ {
+ // Validate string
+ if (!IsValidDString(str))
+ {
+ throw new IOException("Attempt to write string with invalid d-characters");
+ }
+
+ WriteString(buffer, offset, numBytes, true, str, enc);
+ }
+
+ internal static string ReadChars(byte[] buffer, int offset, int numBytes, Encoding enc)
+ {
+ char[] chars;
+
+ // Special handling for 'magic' names '\x00' and '\x01', which indicate root and parent, respectively
+ if (numBytes == 1)
+ {
+ chars = new char[1];
+ chars[0] = (char)buffer[offset];
+ }
+ else
+ {
+ Decoder decoder = enc.GetDecoder();
+ chars = new char[decoder.GetCharCount(buffer, offset, numBytes, false)];
+ decoder.GetChars(buffer, offset, numBytes, chars, 0, false);
+ }
+
+ return new string(chars).TrimEnd(' ');
+ }
+
+#if false
+ public static byte WriteFileName(byte[] buffer, int offset, int numBytes, string str, Encoding enc)
+ {
+ if (numBytes > 255 || numBytes < 0)
+ {
+ throw new ArgumentOutOfRangeException("numBytes", "Attempt to write overlength or underlength file name");
+ }
+
+ // Validate string
+ if (!isValidFileName(str))
+ {
+ throw new IOException("Attempt to write string with invalid file name characters");
+ }
+
+ return (byte)WriteString(buffer, offset, numBytes, false, str, enc);
+ }
+
+ public static byte WriteDirectoryName(byte[] buffer, int offset, int numBytes, string str, Encoding enc)
+ {
+ if (numBytes > 255 || numBytes < 0)
+ {
+ throw new ArgumentOutOfRangeException("numBytes", "Attempt to write overlength or underlength directory name");
+ }
+
+ // Validate string
+ if (!isValidDirectoryName(str))
+ {
+ throw new IOException("Attempt to write string with invalid directory name characters");
+ }
+
+ return (byte)WriteString(buffer, offset, numBytes, false, str, enc);
+ }
+#endif
+
+ internal static int WriteString(byte[] buffer, int offset, int numBytes, bool pad, string str, Encoding enc)
+ {
+ return WriteString(buffer, offset, numBytes, pad, str, enc, false);
+ }
+
+ internal static int WriteString(byte[] buffer, int offset, int numBytes, bool pad, string str, Encoding enc,
+ bool canTruncate)
+ {
+ Encoder encoder = enc.GetEncoder();
+
+ string paddedString = pad ? str + new string(' ', numBytes) : str;
+
+ // Assumption: never less than one byte per character
+
+ int charsUsed;
+ int bytesUsed;
+ bool completed;
+ encoder.Convert(paddedString.ToCharArray(), 0, paddedString.Length, buffer, offset, numBytes, false,
+ out charsUsed, out bytesUsed, out completed);
+
+ if (!canTruncate && charsUsed < str.Length)
+ {
+ throw new IOException("Failed to write entire string");
+ }
+
+ return bytesUsed;
+ }
+
+ internal static bool IsValidAString(string str)
+ {
+ for (int i = 0; i < str.Length; ++i)
+ {
+ if (!(
+ (str[i] >= ' ' && str[i] <= '\"')
+ || (str[i] >= '%' && str[i] <= '/')
+ || (str[i] >= ':' && str[i] <= '?')
+ || (str[i] >= '0' && str[i] <= '9')
+ || (str[i] >= 'A' && str[i] <= 'Z')
+ || (str[i] == '_')))
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ internal static bool IsValidDString(string str)
+ {
+ for (int i = 0; i < str.Length; ++i)
+ {
+ if (!IsValidDChar(str[i]))
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ internal static bool IsValidDChar(char ch)
+ {
+ return (ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'Z') || (ch == '_');
+ }
+
+ internal static bool IsValidFileName(string str)
+ {
+ for (int i = 0; i < str.Length; ++i)
+ {
+ if (
+ !((str[i] >= '0' && str[i] <= '9') || (str[i] >= 'A' && str[i] <= 'Z') || (str[i] == '_') ||
+ (str[i] == '.') || (str[i] == ';')))
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ internal static bool IsValidDirectoryName(string str)
+ {
+ if (str.Length == 1 && (str[0] == 0 || str[0] == 1))
+ {
+ return true;
+ }
+ return IsValidDString(str);
+ }
+
+ internal static string NormalizeFileName(string name)
+ {
+ string[] parts = SplitFileName(name);
+ return parts[0] + '.' + parts[1] + ';' + parts[2];
+ }
+
+ internal static string[] SplitFileName(string name)
+ {
+ string[] parts = { name, string.Empty, "1" };
+
+ if (name.Contains("."))
+ {
+ int endOfFilePart = name.IndexOf('.');
+ parts[0] = name.Substring(0, endOfFilePart);
+ if (name.Contains(";"))
+ {
+ int verSep = name.IndexOf(';', endOfFilePart + 1);
+ parts[1] = name.Substring(endOfFilePart + 1, verSep - (endOfFilePart + 1));
+ parts[2] = name.Substring(verSep + 1);
+ }
+ else
+ {
+ parts[1] = name.Substring(endOfFilePart + 1);
+ }
+ }
+ else
+ {
+ if (name.Contains(";"))
+ {
+ int verSep = name.IndexOf(';');
+ parts[0] = name.Substring(0, verSep);
+ parts[2] = name.Substring(verSep + 1);
+ }
+ }
+
+ ushort ver;
+ if (!ushort.TryParse(parts[2], out ver) || ver > 32767 || ver < 1)
+ {
+ ver = 1;
+ }
+
+ parts[2] = string.Format(CultureInfo.InvariantCulture, "{0}", ver);
+
+ return parts;
+ }
+
+ ///
+ /// Converts a DirectoryRecord time to UTC.
+ ///
+ /// Buffer containing the time data.
+ /// Offset in buffer of the time data.
+ /// The time in UTC.
+ internal static DateTime ToUTCDateTimeFromDirectoryTime(byte[] data, int offset)
+ {
+ try
+ {
+ DateTime relTime = new DateTime(
+ 1900 + data[offset],
+ data[offset + 1],
+ data[offset + 2],
+ data[offset + 3],
+ data[offset + 4],
+ data[offset + 5],
+ DateTimeKind.Utc);
+ return relTime - TimeSpan.FromMinutes(15 * (sbyte)data[offset + 6]);
+ }
+ catch (ArgumentOutOfRangeException)
+ {
+ // In case the ISO has a bad date encoded, we'll just fall back to using a fixed date
+ return DateTime.MinValue;
+ }
+ }
+
+ internal static void ToDirectoryTimeFromUTC(byte[] data, int offset, DateTime dateTime)
+ {
+ if (dateTime == DateTime.MinValue)
+ {
+ Array.Clear(data, offset, 7);
+ }
+ else
+ {
+ if (dateTime.Year < 1900)
+ {
+ throw new IOException("Year is out of range");
+ }
+
+ data[offset] = (byte)(dateTime.Year - 1900);
+ data[offset + 1] = (byte)dateTime.Month;
+ data[offset + 2] = (byte)dateTime.Day;
+ data[offset + 3] = (byte)dateTime.Hour;
+ data[offset + 4] = (byte)dateTime.Minute;
+ data[offset + 5] = (byte)dateTime.Second;
+ data[offset + 6] = 0;
+ }
+ }
+
+ internal static DateTime ToDateTimeFromVolumeDescriptorTime(byte[] data, int offset)
+ {
+ bool allNull = true;
+ for (int i = 0; i < 16; ++i)
+ {
+ if (data[offset + i] != (byte)'0' && data[offset + i] != 0)
+ {
+ allNull = false;
+ break;
+ }
+ }
+
+ if (allNull)
+ {
+ return DateTime.MinValue;
+ }
+
+ string strForm = Encoding.ASCII.GetString(data, offset, 16);
+
+ // Work around bugs in burning software that may use zero bytes (rather than '0' characters)
+ strForm = strForm.Replace('\0', '0');
+
+ int year = SafeParseInt(1, 9999, strForm.Substring(0, 4));
+ int month = SafeParseInt(1, 12, strForm.Substring(4, 2));
+ int day = SafeParseInt(1, 31, strForm.Substring(6, 2));
+ int hour = SafeParseInt(0, 23, strForm.Substring(8, 2));
+ int min = SafeParseInt(0, 59, strForm.Substring(10, 2));
+ int sec = SafeParseInt(0, 59, strForm.Substring(12, 2));
+ int hundredths = SafeParseInt(0, 99, strForm.Substring(14, 2));
+
+ try
+ {
+ DateTime time = new DateTime(year, month, day, hour, min, sec, hundredths * 10, DateTimeKind.Utc);
+ return time - TimeSpan.FromMinutes(15 * (sbyte)data[offset + 16]);
+ }
+ catch (ArgumentOutOfRangeException)
+ {
+ return DateTime.MinValue;
+ }
+ }
+
+ internal static void ToVolumeDescriptorTimeFromUTC(byte[] buffer, int offset, DateTime dateTime)
+ {
+ if (dateTime == DateTime.MinValue)
+ {
+ for (int i = offset; i < offset + 16; ++i)
+ {
+ buffer[i] = (byte)'0';
+ }
+
+ buffer[offset + 16] = 0;
+ return;
+ }
+
+ string strForm = dateTime.ToString("yyyyMMddHHmmssff", CultureInfo.InvariantCulture);
+ EndianUtilities.StringToBytes(strForm, buffer, offset, 16);
+ buffer[offset + 16] = 0;
+ }
+
+ internal static void EncodingToBytes(Encoding enc, byte[] data, int offset)
+ {
+ Array.Clear(data, offset, 32);
+ if (enc == Encoding.ASCII)
+ {
+ // Nothing to do
+ }
+ else if (enc == Encoding.BigEndianUnicode)
+ {
+ data[offset + 0] = 0x25;
+ data[offset + 1] = 0x2F;
+ data[offset + 2] = 0x45;
+ }
+ else
+ {
+ throw new ArgumentException("Unrecognized character encoding");
+ }
+ }
+
+ internal static Encoding EncodingFromBytes(byte[] data, int offset)
+ {
+ Encoding enc = Encoding.ASCII;
+ if (data[offset + 0] == 0x25 && data[offset + 1] == 0x2F
+ && (data[offset + 2] == 0x40 || data[offset + 2] == 0x43 || data[offset + 2] == 0x45))
+ {
+ // I.e. this is a joliet disc!
+ enc = Encoding.BigEndianUnicode;
+ }
+
+ return enc;
+ }
+
+ internal static bool IsSpecialDirectory(DirectoryRecord r)
+ {
+ return r.FileIdentifier == "\0" || r.FileIdentifier == "\x01";
+ }
+
+ private static int SafeParseInt(int minVal, int maxVal, string str)
+ {
+ int val;
+ if (!int.TryParse(str, out val))
+ {
+ return minVal;
+ }
+
+ if (val < minVal)
+ {
+ return minVal;
+ }
+ if (val > maxVal)
+ {
+ return maxVal;
+ }
+ return val;
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-JUAN/PathTable.cs b/CHOVY-SIGN/DiscUtils/Iso9660/PathTable.cs
similarity index 100%
rename from CHOVY-JUAN/PathTable.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/PathTable.cs
diff --git a/CHOVY-JUAN/PathTableRecord.cs b/CHOVY-SIGN/DiscUtils/Iso9660/PathTableRecord.cs
similarity index 100%
rename from CHOVY-JUAN/PathTableRecord.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/PathTableRecord.cs
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/PrimaryVolumeDescriptor.cs b/CHOVY-SIGN/DiscUtils/Iso9660/PrimaryVolumeDescriptor.cs
new file mode 100644
index 0000000..1d3199d
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/PrimaryVolumeDescriptor.cs
@@ -0,0 +1,75 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+using DiscUtils.Internal;
+
+namespace DiscUtils.Iso9660
+{
+ internal class PrimaryVolumeDescriptor : CommonVolumeDescriptor
+ {
+ public PrimaryVolumeDescriptor(byte[] src, int offset)
+ : base(src, offset, Encoding.ASCII) {}
+
+ public PrimaryVolumeDescriptor(
+ uint volumeSpaceSize,
+ uint pathTableSize,
+ uint typeLPathTableLocation,
+ uint typeMPathTableLocation,
+ uint rootDirExtentLocation,
+ uint rootDirDataLength,
+ DateTime buildTime)
+ : base(
+ VolumeDescriptorType.Primary, 1, volumeSpaceSize, pathTableSize, typeLPathTableLocation,
+ typeMPathTableLocation, rootDirExtentLocation, rootDirDataLength, buildTime, Encoding.ASCII) {}
+
+ internal override void WriteTo(byte[] buffer, int offset)
+ {
+ base.WriteTo(buffer, offset);
+ IsoUtilities.WriteAChars(buffer, offset + 8, 32, SystemIdentifier);
+ IsoUtilities.WriteString(buffer, offset + 40, 32, true, VolumeIdentifier, Encoding.ASCII, true);
+ IsoUtilities.ToBothFromUInt32(buffer, offset + 80, VolumeSpaceSize);
+ IsoUtilities.ToBothFromUInt16(buffer, offset + 120, VolumeSetSize);
+ IsoUtilities.ToBothFromUInt16(buffer, offset + 124, VolumeSequenceNumber);
+ IsoUtilities.ToBothFromUInt16(buffer, offset + 128, LogicalBlockSize);
+ IsoUtilities.ToBothFromUInt32(buffer, offset + 132, PathTableSize);
+ IsoUtilities.ToBytesFromUInt32(buffer, offset + 140, TypeLPathTableLocation);
+ IsoUtilities.ToBytesFromUInt32(buffer, offset + 144, OptionalTypeLPathTableLocation);
+ IsoUtilities.ToBytesFromUInt32(buffer, offset + 148, Utilities.BitSwap(TypeMPathTableLocation));
+ IsoUtilities.ToBytesFromUInt32(buffer, offset + 152, Utilities.BitSwap(OptionalTypeMPathTableLocation));
+ RootDirectory.WriteTo(buffer, offset + 156, Encoding.ASCII);
+ IsoUtilities.WriteDChars(buffer, offset + 190, 129, VolumeSetIdentifier);
+ IsoUtilities.WriteAChars(buffer, offset + 318, 129, PublisherIdentifier);
+ IsoUtilities.WriteAChars(buffer, offset + 446, 129, DataPreparerIdentifier);
+ IsoUtilities.WriteAChars(buffer, offset + 574, 129, ApplicationIdentifier);
+ IsoUtilities.WriteDChars(buffer, offset + 702, 37, CopyrightFileIdentifier); // FIXME!!
+ IsoUtilities.WriteDChars(buffer, offset + 739, 37, AbstractFileIdentifier); // FIXME!!
+ IsoUtilities.WriteDChars(buffer, offset + 776, 37, BibliographicFileIdentifier); // FIXME!!
+ IsoUtilities.ToVolumeDescriptorTimeFromUTC(buffer, offset + 813, CreationDateAndTime);
+ IsoUtilities.ToVolumeDescriptorTimeFromUTC(buffer, offset + 830, ModificationDateAndTime);
+ IsoUtilities.ToVolumeDescriptorTimeFromUTC(buffer, offset + 847, ExpirationDateAndTime);
+ IsoUtilities.ToVolumeDescriptorTimeFromUTC(buffer, offset + 864, EffectiveDateAndTime);
+ buffer[offset + 881] = FileStructureVersion;
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/PrimaryVolumeDescriptorRegion.cs b/CHOVY-SIGN/DiscUtils/Iso9660/PrimaryVolumeDescriptorRegion.cs
new file mode 100644
index 0000000..0f0ae5d
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/PrimaryVolumeDescriptorRegion.cs
@@ -0,0 +1,42 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+namespace DiscUtils.Iso9660
+{
+ internal class PrimaryVolumeDescriptorRegion : VolumeDescriptorDiskRegion
+ {
+ private readonly PrimaryVolumeDescriptor _descriptor;
+
+ public PrimaryVolumeDescriptorRegion(PrimaryVolumeDescriptor descriptor, long start)
+ : base(start)
+ {
+ _descriptor = descriptor;
+ }
+
+ protected override byte[] GetBlockData()
+ {
+ byte[] buffer = new byte[IsoUtilities.SectorSize];
+ _descriptor.WriteTo(buffer, 0);
+ return buffer;
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-JUAN/ReaderDirEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/ReaderDirEntry.cs
similarity index 100%
rename from CHOVY-JUAN/ReaderDirEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/ReaderDirEntry.cs
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/ReaderDirectory.cs b/CHOVY-SIGN/DiscUtils/Iso9660/ReaderDirectory.cs
new file mode 100644
index 0000000..d88d312
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/ReaderDirectory.cs
@@ -0,0 +1,128 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using DiscUtils.CoreCompat;
+using DiscUtils.Streams;
+using DiscUtils.Vfs;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+
+namespace DiscUtils.Iso9660
+{
+ internal class ReaderDirectory : File, IVfsDirectory
+ {
+ private readonly List _records;
+
+ public ReaderDirectory(IsoContext context, ReaderDirEntry dirEntry)
+ : base(context, dirEntry)
+ {
+ byte[] buffer = new byte[IsoUtilities.SectorSize];
+ Stream extent = new ExtentStream(_context.DataStream, dirEntry.Record.LocationOfExtent, uint.MaxValue, 0, 0);
+
+ _records = new List();
+
+ uint totalLength = dirEntry.Record.DataLength;
+ uint totalRead = 0;
+ while (totalRead < totalLength)
+ {
+ int bytesRead = (int)Math.Min(buffer.Length, totalLength - totalRead);
+
+ StreamUtilities.ReadExact(extent, buffer, 0, bytesRead);
+ totalRead += (uint)bytesRead;
+
+ uint pos = 0;
+ while (pos < bytesRead && buffer[pos] != 0)
+ {
+ DirectoryRecord dr;
+ uint length = (uint)DirectoryRecord.ReadFrom(buffer, (int)pos, context.VolumeDescriptor.CharacterEncoding, out dr);
+
+ if (!IsoUtilities.IsSpecialDirectory(dr))
+ {
+ ReaderDirEntry childDirEntry = new ReaderDirEntry(_context, dr);
+
+ if (context.SuspDetected && !string.IsNullOrEmpty(context.RockRidgeIdentifier))
+ {
+ if (childDirEntry.SuspRecords == null || !childDirEntry.SuspRecords.HasEntry(context.RockRidgeIdentifier, "RE"))
+ {
+ _records.Add(childDirEntry);
+ }
+ }
+ else
+ {
+ _records.Add(childDirEntry);
+ }
+ }
+ else if (dr.FileIdentifier == "\0")
+ {
+ Self = new ReaderDirEntry(_context, dr);
+ }
+
+ pos += length;
+ }
+ }
+ }
+
+ public override byte[] SystemUseData
+ {
+ get { return Self.Record.SystemUseData; }
+ }
+
+ public ICollection AllEntries
+ {
+ get { return _records; }
+ }
+
+ public ReaderDirEntry Self { get; }
+
+ public ReaderDirEntry GetEntryByName(string name)
+ {
+ bool anyVerMatch = name.IndexOf(';') < 0;
+ string normName = IsoUtilities.NormalizeFileName(name).ToUpper(CultureInfo.InvariantCulture);
+ if (anyVerMatch)
+ {
+ normName = normName.Substring(0, normName.LastIndexOf(';') + 1);
+ }
+
+ foreach (ReaderDirEntry r in _records)
+ {
+ string toComp = IsoUtilities.NormalizeFileName(r.FileName).ToUpper(CultureInfo.InvariantCulture);
+ if (!anyVerMatch && toComp == normName)
+ {
+ return r;
+ }
+ if (anyVerMatch && toComp.StartsWith(normName, StringComparison.Ordinal))
+ {
+ return r;
+ }
+ }
+
+ return null;
+ }
+
+ public ReaderDirEntry CreateNewFile(string name)
+ {
+ throw new NotSupportedException();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-JUAN/RockRidge/ChildLinkSystemUseEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/RockRidge/ChildLinkSystemUseEntry.cs
similarity index 100%
rename from CHOVY-JUAN/RockRidge/ChildLinkSystemUseEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/RockRidge/ChildLinkSystemUseEntry.cs
diff --git a/CHOVY-JUAN/RockRidge/FileTimeSystemUseEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/RockRidge/FileTimeSystemUseEntry.cs
similarity index 100%
rename from CHOVY-JUAN/RockRidge/FileTimeSystemUseEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/RockRidge/FileTimeSystemUseEntry.cs
diff --git a/CHOVY-JUAN/RockRidge/PosixFileInfoSystemUseEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/RockRidge/PosixFileInfoSystemUseEntry.cs
similarity index 100%
rename from CHOVY-JUAN/RockRidge/PosixFileInfoSystemUseEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/RockRidge/PosixFileInfoSystemUseEntry.cs
diff --git a/CHOVY-JUAN/RockRidge/PosixNameSystemUseEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/RockRidge/PosixNameSystemUseEntry.cs
similarity index 100%
rename from CHOVY-JUAN/RockRidge/PosixNameSystemUseEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/RockRidge/PosixNameSystemUseEntry.cs
diff --git a/CHOVY-JUAN/RockRidge/RockRidgeExtension.cs b/CHOVY-SIGN/DiscUtils/Iso9660/RockRidge/RockRidgeExtension.cs
similarity index 100%
rename from CHOVY-JUAN/RockRidge/RockRidgeExtension.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/RockRidge/RockRidgeExtension.cs
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/SupplementaryVolumeDescriptor.cs b/CHOVY-SIGN/DiscUtils/Iso9660/SupplementaryVolumeDescriptor.cs
new file mode 100644
index 0000000..dfe5ebb
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/SupplementaryVolumeDescriptor.cs
@@ -0,0 +1,79 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+using DiscUtils.Internal;
+
+namespace DiscUtils.Iso9660
+{
+ internal class SupplementaryVolumeDescriptor : CommonVolumeDescriptor
+ {
+ public SupplementaryVolumeDescriptor(byte[] src, int offset)
+ : base(src, offset, IsoUtilities.EncodingFromBytes(src, offset + 88)) {}
+
+ public SupplementaryVolumeDescriptor(
+ uint volumeSpaceSize,
+ uint pathTableSize,
+ uint typeLPathTableLocation,
+ uint typeMPathTableLocation,
+ uint rootDirExtentLocation,
+ uint rootDirDataLength,
+ DateTime buildTime,
+ Encoding enc)
+ : base(
+ VolumeDescriptorType.Supplementary, 1, volumeSpaceSize, pathTableSize, typeLPathTableLocation,
+ typeMPathTableLocation, rootDirExtentLocation, rootDirDataLength, buildTime, enc) {}
+
+ internal override void WriteTo(byte[] buffer, int offset)
+ {
+ base.WriteTo(buffer, offset);
+ IsoUtilities.WriteA1Chars(buffer, offset + 8, 32, SystemIdentifier, CharacterEncoding);
+ IsoUtilities.WriteString(buffer, offset + 40, 32, true, VolumeIdentifier, CharacterEncoding, true);
+ IsoUtilities.ToBothFromUInt32(buffer, offset + 80, VolumeSpaceSize);
+ IsoUtilities.EncodingToBytes(CharacterEncoding, buffer, offset + 88);
+ IsoUtilities.ToBothFromUInt16(buffer, offset + 120, VolumeSetSize);
+ IsoUtilities.ToBothFromUInt16(buffer, offset + 124, VolumeSequenceNumber);
+ IsoUtilities.ToBothFromUInt16(buffer, offset + 128, LogicalBlockSize);
+ IsoUtilities.ToBothFromUInt32(buffer, offset + 132, PathTableSize);
+ IsoUtilities.ToBytesFromUInt32(buffer, offset + 140, TypeLPathTableLocation);
+ IsoUtilities.ToBytesFromUInt32(buffer, offset + 144, OptionalTypeLPathTableLocation);
+ IsoUtilities.ToBytesFromUInt32(buffer, offset + 148, Utilities.BitSwap(TypeMPathTableLocation));
+ IsoUtilities.ToBytesFromUInt32(buffer, offset + 152, Utilities.BitSwap(OptionalTypeMPathTableLocation));
+ RootDirectory.WriteTo(buffer, offset + 156, CharacterEncoding);
+ IsoUtilities.WriteD1Chars(buffer, offset + 190, 129, VolumeSetIdentifier, CharacterEncoding);
+ IsoUtilities.WriteA1Chars(buffer, offset + 318, 129, PublisherIdentifier, CharacterEncoding);
+ IsoUtilities.WriteA1Chars(buffer, offset + 446, 129, DataPreparerIdentifier, CharacterEncoding);
+ IsoUtilities.WriteA1Chars(buffer, offset + 574, 129, ApplicationIdentifier, CharacterEncoding);
+ IsoUtilities.WriteD1Chars(buffer, offset + 702, 37, CopyrightFileIdentifier, CharacterEncoding); // FIXME!!
+ IsoUtilities.WriteD1Chars(buffer, offset + 739, 37, AbstractFileIdentifier, CharacterEncoding); // FIXME!!
+ IsoUtilities.WriteD1Chars(buffer, offset + 776, 37, BibliographicFileIdentifier, CharacterEncoding);
+
+ // FIXME!!
+ IsoUtilities.ToVolumeDescriptorTimeFromUTC(buffer, offset + 813, CreationDateAndTime);
+ IsoUtilities.ToVolumeDescriptorTimeFromUTC(buffer, offset + 830, ModificationDateAndTime);
+ IsoUtilities.ToVolumeDescriptorTimeFromUTC(buffer, offset + 847, ExpirationDateAndTime);
+ IsoUtilities.ToVolumeDescriptorTimeFromUTC(buffer, offset + 864, EffectiveDateAndTime);
+ buffer[offset + 881] = FileStructureVersion;
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/SupplementaryVolumeDescriptorRegion.cs b/CHOVY-SIGN/DiscUtils/Iso9660/SupplementaryVolumeDescriptorRegion.cs
new file mode 100644
index 0000000..317ea7f
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/SupplementaryVolumeDescriptorRegion.cs
@@ -0,0 +1,42 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+namespace DiscUtils.Iso9660
+{
+ internal class SupplementaryVolumeDescriptorRegion : VolumeDescriptorDiskRegion
+ {
+ private readonly SupplementaryVolumeDescriptor _descriptor;
+
+ public SupplementaryVolumeDescriptorRegion(SupplementaryVolumeDescriptor descriptor, long start)
+ : base(start)
+ {
+ _descriptor = descriptor;
+ }
+
+ protected override byte[] GetBlockData()
+ {
+ byte[] buffer = new byte[IsoUtilities.SectorSize];
+ _descriptor.WriteTo(buffer, 0);
+ return buffer;
+ }
+ }
+}
\ No newline at end of file
diff --git a/CHOVY-JUAN/Susp/ContinuationSystemUseEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/Susp/ContinuationSystemUseEntry.cs
similarity index 100%
rename from CHOVY-JUAN/Susp/ContinuationSystemUseEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/Susp/ContinuationSystemUseEntry.cs
diff --git a/CHOVY-JUAN/Susp/ExtensionSelectSystemUseEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/Susp/ExtensionSelectSystemUseEntry.cs
similarity index 100%
rename from CHOVY-JUAN/Susp/ExtensionSelectSystemUseEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/Susp/ExtensionSelectSystemUseEntry.cs
diff --git a/CHOVY-JUAN/Susp/ExtensionSystemUseEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/Susp/ExtensionSystemUseEntry.cs
similarity index 100%
rename from CHOVY-JUAN/Susp/ExtensionSystemUseEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/Susp/ExtensionSystemUseEntry.cs
diff --git a/CHOVY-JUAN/Susp/GenericSuspExtension.cs b/CHOVY-SIGN/DiscUtils/Iso9660/Susp/GenericSuspExtension.cs
similarity index 100%
rename from CHOVY-JUAN/Susp/GenericSuspExtension.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/Susp/GenericSuspExtension.cs
diff --git a/CHOVY-JUAN/Susp/GenericSystemUseEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/Susp/GenericSystemUseEntry.cs
similarity index 100%
rename from CHOVY-JUAN/Susp/GenericSystemUseEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/Susp/GenericSystemUseEntry.cs
diff --git a/CHOVY-JUAN/Susp/PaddingSystemUseEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/Susp/PaddingSystemUseEntry.cs
similarity index 100%
rename from CHOVY-JUAN/Susp/PaddingSystemUseEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/Susp/PaddingSystemUseEntry.cs
diff --git a/CHOVY-JUAN/Susp/SharingProtocolSystemUseEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/Susp/SharingProtocolSystemUseEntry.cs
similarity index 100%
rename from CHOVY-JUAN/Susp/SharingProtocolSystemUseEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/Susp/SharingProtocolSystemUseEntry.cs
diff --git a/CHOVY-JUAN/Susp/SuspExtension.cs b/CHOVY-SIGN/DiscUtils/Iso9660/Susp/SuspExtension.cs
similarity index 100%
rename from CHOVY-JUAN/Susp/SuspExtension.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/Susp/SuspExtension.cs
diff --git a/CHOVY-JUAN/Susp/SuspRecords.cs b/CHOVY-SIGN/DiscUtils/Iso9660/Susp/SuspRecords.cs
similarity index 100%
rename from CHOVY-JUAN/Susp/SuspRecords.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/Susp/SuspRecords.cs
diff --git a/CHOVY-JUAN/Susp/SystemUseEntry.cs b/CHOVY-SIGN/DiscUtils/Iso9660/Susp/SystemUseEntry.cs
similarity index 100%
rename from CHOVY-JUAN/Susp/SystemUseEntry.cs
rename to CHOVY-SIGN/DiscUtils/Iso9660/Susp/SystemUseEntry.cs
diff --git a/CHOVY-SIGN/DiscUtils/Iso9660/VfsCDReader.cs b/CHOVY-SIGN/DiscUtils/Iso9660/VfsCDReader.cs
new file mode 100644
index 0000000..9c628f2
--- /dev/null
+++ b/CHOVY-SIGN/DiscUtils/Iso9660/VfsCDReader.cs
@@ -0,0 +1,523 @@
+//
+// Copyright (c) 2008-2011, Kenneth Bell
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using DiscUtils.Streams;
+using DiscUtils.Vfs;
+
+namespace DiscUtils.Iso9660
+{
+ internal class VfsCDReader : VfsReadOnlyFileSystem,
+ IClusterBasedFileSystem, IUnixFileSystem
+ {
+ private static readonly Iso9660Variant[] DefaultVariantsNoJoliet = { Iso9660Variant.RockRidge, Iso9660Variant.Iso9660 };
+
+ private static readonly Iso9660Variant[] DefaultVariantsWithJoliet = { Iso9660Variant.Joliet, Iso9660Variant.RockRidge, Iso9660Variant.Iso9660 };
+
+ private byte[] _bootCatalog;
+ private readonly BootVolumeDescriptor _bootVolDesc;
+
+ private readonly Stream _data;
+ private readonly bool _hideVersions;
+
+ ///
+ /// Initializes a new instance of the VfsCDReader class.
+ ///
+ /// The stream to read the ISO image from.
+ /// Whether to read Joliet extensions.
+ /// Hides version numbers (e.g. ";1") from the end of files.
+ public VfsCDReader(Stream data, bool joliet, bool hideVersions)
+ : this(data, joliet ? DefaultVariantsWithJoliet : DefaultVariantsNoJoliet, hideVersions) {}
+
+ ///
+ /// Initializes a new instance of the VfsCDReader class.
+ ///
+ /// The stream to read the ISO image from.
+ /// Which possible file system variants to use, and with which priority.
+ /// Hides version numbers (e.g. ";1") from the end of files.
+ ///
+ ///
+ /// The implementation considers each of the file system variants in variantProperties and selects
+ /// the first which is determined to be present. In this example Joliet, then Rock Ridge, then vanilla
+ /// Iso9660 will be considered:
+ ///
+ ///
+ /// VfsCDReader(stream, new Iso9660Variant[] {Joliet, RockRidge, Iso9660}, true);
+ ///
+ /// The Iso9660 variant should normally be specified as the final entry in the list. Placing it earlier
+ /// in the list will effectively mask later items and not including it may prevent some ISOs from being read.
+ ///
+ public VfsCDReader(Stream data, Iso9660Variant[] variantPriorities, bool hideVersions)
+ : base(new DiscFileSystemOptions())
+ {
+ _data = data;
+ _hideVersions = hideVersions;
+
+ long vdpos = 0x8000; // Skip lead-in
+
+ byte[] buffer = new byte[IsoUtilities.SectorSize];
+
+ long pvdPos = 0;
+ long svdPos = 0;
+
+ BaseVolumeDescriptor bvd;
+ do
+ {
+ data.Position = vdpos;
+ int numRead = data.Read(buffer, 0, IsoUtilities.SectorSize);
+ if (numRead != IsoUtilities.SectorSize)
+ {
+ break;
+ }
+
+ bvd = new BaseVolumeDescriptor(buffer, 0);
+
+ if (bvd.StandardIdentifier != BaseVolumeDescriptor.Iso9660StandardIdentifier)
+ {
+ throw new InvalidFileSystemException("Volume is not ISO-9660");
+ }
+
+ switch (bvd.VolumeDescriptorType)
+ {
+ case VolumeDescriptorType.Boot:
+ _bootVolDesc = new BootVolumeDescriptor(buffer, 0);
+ if (_bootVolDesc.SystemId != BootVolumeDescriptor.ElToritoSystemIdentifier)
+ {
+ _bootVolDesc = null;
+ }
+
+ break;
+
+ case VolumeDescriptorType.Primary: // Primary Vol Descriptor
+ pvdPos = vdpos;
+ break;
+
+ case VolumeDescriptorType.Supplementary: // Supplementary Vol Descriptor
+ svdPos = vdpos;
+ break;
+
+ case VolumeDescriptorType.Partition: // Volume Partition Descriptor
+ break;
+ case VolumeDescriptorType.SetTerminator: // Volume Descriptor Set Terminator
+ break;
+ }
+
+ vdpos += IsoUtilities.SectorSize;
+ } while (bvd.VolumeDescriptorType != VolumeDescriptorType.SetTerminator);
+
+ ActiveVariant = Iso9660Variant.None;
+ foreach (Iso9660Variant variant in variantPriorities)
+ {
+ switch (variant)
+ {
+ case Iso9660Variant.Joliet:
+ if (svdPos != 0)
+ {
+ data.Position = svdPos;
+ data.Read(buffer, 0, IsoUtilities.SectorSize);
+ SupplementaryVolumeDescriptor volDesc = new SupplementaryVolumeDescriptor(buffer, 0);
+
+ Context = new IsoContext { VolumeDescriptor = volDesc, DataStream = _data };
+ RootDirectory = new ReaderDirectory(Context,
+ new ReaderDirEntry(Context, volDesc.RootDirectory));
+ ActiveVariant = Iso9660Variant.Iso9660;
+ }
+
+ break;
+
+ case Iso9660Variant.RockRidge:
+ case Iso9660Variant.Iso9660:
+ if (pvdPos != 0)
+ {
+ data.Position = pvdPos;
+ data.Read(buffer, 0, IsoUtilities.SectorSize);
+ PrimaryVolumeDescriptor volDesc = new PrimaryVolumeDescriptor(buffer, 0);
+
+ IsoContext context = new IsoContext { VolumeDescriptor = volDesc, DataStream = _data };
+ DirectoryRecord rootSelfRecord = ReadRootSelfRecord(context);
+
+ InitializeSusp(context, rootSelfRecord);
+
+ if (variant == Iso9660Variant.Iso9660
+ ||
+ (variant == Iso9660Variant.RockRidge &&
+ !string.IsNullOrEmpty(context.RockRidgeIdentifier)))
+ {
+ Context = context;
+ RootDirectory = new ReaderDirectory(context, new ReaderDirEntry(context, rootSelfRecord));
+ ActiveVariant = variant;
+ }
+ }
+
+ break;
+ }
+
+ if (ActiveVariant != Iso9660Variant.None)
+ {
+ break;
+ }
+ }
+
+ if (ActiveVariant == Iso9660Variant.None)
+ {
+ throw new IOException("None of the permitted ISO9660 file system variants was detected");
+ }
+ }
+
+ public Iso9660Variant ActiveVariant { get; }
+
+ public BootDeviceEmulation BootEmulation
+ {
+ get
+ {
+ BootInitialEntry initialEntry = GetBootInitialEntry();
+ if (initialEntry != null)
+ {
+ return initialEntry.BootMediaType;
+ }
+
+ return BootDeviceEmulation.NoEmulation;
+ }
+ }
+
+ public long BootImageStart
+ {
+ get
+ {
+ BootInitialEntry initialEntry = GetBootInitialEntry();
+ if (initialEntry != null)
+ {
+ return initialEntry.ImageStart * IsoUtilities.SectorSize;
+ }
+ return 0;
+ }
+ }
+
+ public int BootLoadSegment
+ {
+ get
+ {
+ BootInitialEntry initialEntry = GetBootInitialEntry();
+ if (initialEntry != null)
+ {
+ return initialEntry.LoadSegment;
+ }
+
+ return 0;
+ }
+ }
+
+ ///
+ /// Provides the friendly name for the CD filesystem.
+ ///
+ public override string FriendlyName
+ {
+ get { return "ISO 9660 (CD-ROM)"; }
+ }
+
+ public bool HasBootImage
+ {
+ get
+ {
+ if (_bootVolDesc == null)
+ {
+ return false;
+ }
+
+ byte[] bootCatalog = GetBootCatalog();
+ if (bootCatalog == null)
+ {
+ return false;
+ }
+
+ BootValidationEntry entry = new BootValidationEntry(bootCatalog, 0);
+ return entry.ChecksumValid;
+ }
+ }
+
+ ///
+ /// Gets the Volume Identifier.
+ ///
+ public override string VolumeLabel
+ {
+ get { return Context.VolumeDescriptor.VolumeIdentifier; }
+ }
+
+ public long ClusterSize
+ {
+ get { return IsoUtilities.SectorSize; }
+ }
+
+ public long TotalClusters
+ {
+ get { return Context.VolumeDescriptor.VolumeSpaceSize; }
+ }
+
+ public long ClusterToOffset(long cluster)
+ {
+ return cluster * ClusterSize;
+ }
+
+ public long OffsetToCluster(long offset)
+ {
+ return offset / ClusterSize;
+ }
+
+ ///
+ /// Size of the Filesystem in bytes
+ ///
+ public override long Size
+ {
+ get { throw new NotSupportedException("Filesystem size is not (yet) supported"); }
+ }
+
+ ///
+ /// Used space of the Filesystem in bytes
+ ///
+ public override long UsedSpace
+ {
+ get { throw new NotSupportedException("Filesystem size is not (yet) supported"); }
+ }
+
+ ///
+ /// Available space of the Filesystem in bytes
+ ///
+ public override long AvailableSpace
+ {
+ get { throw new NotSupportedException("Filesystem size is not (yet) supported"); }
+ }
+
+ public Range[] PathToClusters(string path)
+ {
+ ReaderDirEntry entry = GetDirectoryEntry(path);
+ if (entry == null)
+ {
+ throw new FileNotFoundException("File not found", path);
+ }
+
+ if (entry.Record.FileUnitSize != 0 || entry.Record.InterleaveGapSize != 0)
+ {
+ throw new NotSupportedException("Non-contiguous extents not supported");
+ }
+
+ return new[]
+ {
+ new Range(entry.Record.LocationOfExtent,
+ MathUtilities.Ceil(entry.Record.DataLength, IsoUtilities.SectorSize))
+ };
+ }
+
+ public StreamExtent[] PathToExtents(string path)
+ {
+ ReaderDirEntry entry = GetDirectoryEntry(path);
+ if (entry == null)
+ {
+ throw new FileNotFoundException("File not found", path);
+ }
+
+ if (entry.Record.FileUnitSize != 0 || entry.Record.InterleaveGapSize != 0)
+ {
+ throw new NotSupportedException("Non-contiguous extents not supported");
+ }
+
+ return new[]
+ { new StreamExtent(entry.Record.LocationOfExtent * IsoUtilities.SectorSize, entry.Record.DataLength) };
+ }
+
+ public ClusterMap BuildClusterMap()
+ {
+ long totalClusters = TotalClusters;
+ ClusterRoles[] clusterToRole = new ClusterRoles[totalClusters];
+ object[] clusterToFileId = new object[totalClusters];
+ Dictionary