Merge pull request #282 from ladislav-zezula/LZ_ReduceBuildTime

Reduced build time in Windows

15 files changed, 291 insertions, 4917 deletions

diff --git a/StormLib_vs08.vcproj b/StormLib_vs08.vcproj
index 4f59a1b..031dde8 100644
--- a/StormLib_vs08.vcproj
+++ b/StormLib_vs08.vcproj
@@ -1239,6 +1239,18 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\src\LibTomCrypt.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\LibTomMath.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\LibTomMathDesc.c"
+				>
+			</File>
+			<File
 				RelativePath=".\src\SBaseCommon.cpp"
 				>
 				<FileConfiguration
@@ -4083,830 +4095,6 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="libtomcrypt"
-				>
-				<Filter
-					Name="hashes"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\hash_memory.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\md5.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\sha1.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="math"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\ltm_desc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\multi.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\rand_prime.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="misc"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\base64_decode.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_argchk.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_libc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\zeromem.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="pk"
-					>
-					<Filter
-						Name="asn1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_choice.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_set.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_setof.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_sequence.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_sequence_free.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="ecc"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="pkcs1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="rsa"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_exptmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_free.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_import.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_make_key.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="libtommath"
-				>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_invmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_montgomery_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_high_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_2expt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_abs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_addmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_and.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clamp.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear_multi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_mag.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cnt_lsb.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_copy.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_count_bits.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_3.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_is_modulus.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exch.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_expt_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod_fast.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exteuclid.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fread.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fwrite.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_gcd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_get_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_grow.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_copy.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_multi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod_slow.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_is_square.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_jacobi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lcm.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lshd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_calc_normalization.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mulmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_n_root.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_neg.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_or.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_fermat.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_divisible.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_prime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_miller_rabin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_next_prime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_rabin_miller_trials.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_random_ex.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_smap.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rand.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_radix.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_signed_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_unsigned_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rshd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_shrink.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_signed_bin_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_submod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_unsigned_bin_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_xor.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_zero.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_prime_tab.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_reverse.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_add.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_exptmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_high_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sub.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bncore.c"
-					>
-				</File>
-			</Filter>
-			<Filter
 				Name="lzma"
 				>
 				<File
diff --git a/StormLib_vs08_dll.vcproj b/StormLib_vs08_dll.vcproj
index 8658887..4a04074 100644
--- a/StormLib_vs08_dll.vcproj
+++ b/StormLib_vs08_dll.vcproj
@@ -441,6 +441,18 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\src\LibTomCrypt.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\LibTomMath.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\LibTomMathDesc.c"
+				>
+			</File>
+			<File
 				RelativePath=".\src\SBaseCommon.cpp"
 				>
 				<FileConfiguration
@@ -1725,830 +1737,6 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="libtomcrypt"
-				>
-				<Filter
-					Name="hashes"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\hash_memory.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\md5.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\sha1.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="math"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\ltm_desc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\multi.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\rand_prime.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="misc"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\base64_decode.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_argchk.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_libc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\zeromem.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="pk"
-					>
-					<Filter
-						Name="asn1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_choice.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_set.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_setof.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_sequence.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_sequence_free.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="ecc"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="pkcs1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="rsa"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_exptmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_free.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_import.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_make_key.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="libtommath"
-				>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_invmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_montgomery_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_high_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_2expt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_abs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_addmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_and.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clamp.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear_multi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_mag.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cnt_lsb.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_copy.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_count_bits.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_3.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_is_modulus.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exch.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_expt_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod_fast.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exteuclid.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fread.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fwrite.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_gcd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_get_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_grow.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_copy.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_multi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod_slow.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_is_square.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_jacobi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lcm.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lshd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_calc_normalization.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mulmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_n_root.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_neg.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_or.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_fermat.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_divisible.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_prime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_miller_rabin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_next_prime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_rabin_miller_trials.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_random_ex.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_smap.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rand.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_radix.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_signed_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_unsigned_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rshd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_shrink.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_signed_bin_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_submod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_unsigned_bin_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_xor.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_zero.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_prime_tab.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_reverse.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_add.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_exptmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_high_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sub.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bncore.c"
-					>
-				</File>
-			</Filter>
-			<Filter
 				Name="lzma"
 				>
 				<File
diff --git a/StormLib_vs08_test.vcproj b/StormLib_vs08_test.vcproj
index 2f03a0b..d3506ea 100644
--- a/StormLib_vs08_test.vcproj
+++ b/StormLib_vs08_test.vcproj
@@ -411,6 +411,18 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\src\LibTomCrypt.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\LibTomMath.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\LibTomMathDesc.c"
+				>
+			</File>
+			<File
 				RelativePath=".\src\SBaseCommon.cpp"
 				>
 				<FileConfiguration
@@ -1151,830 +1163,6 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="libtomcrypt"
-				>
-				<Filter
-					Name="hashes"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\hash_memory.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\md5.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\sha1.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="math"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\ltm_desc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\multi.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\rand_prime.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="misc"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\base64_decode.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_argchk.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_libc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\zeromem.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="pk"
-					>
-					<Filter
-						Name="asn1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_choice.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_set.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_setof.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_sequence.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_sequence_free.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="ecc"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="pkcs1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="rsa"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_exptmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_free.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_import.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_make_key.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="libtommath"
-				>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_invmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_montgomery_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_high_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_2expt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_abs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_addmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_and.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clamp.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear_multi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_mag.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cnt_lsb.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_copy.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_count_bits.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_3.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_is_modulus.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exch.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_expt_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod_fast.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exteuclid.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fread.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fwrite.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_gcd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_get_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_grow.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_copy.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_multi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod_slow.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_is_square.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_jacobi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lcm.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lshd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_calc_normalization.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mulmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_n_root.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_neg.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_or.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_fermat.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_divisible.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_prime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_miller_rabin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_next_prime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_rabin_miller_trials.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_random_ex.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_smap.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rand.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_radix.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_signed_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_unsigned_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rshd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_shrink.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_signed_bin_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_submod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_unsigned_bin_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_xor.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_zero.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_prime_tab.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_reverse.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_add.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_exptmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_high_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sub.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bncore.c"
-					>
-				</File>
-			</Filter>
-			<Filter
 				Name="lzma"
 				>
 				<File
diff --git a/StormLib_vs22.vcxproj b/StormLib_vs22.vcxproj
index eba3ea2..26d8f70 100644
--- a/StormLib_vs22.vcxproj
+++ b/StormLib_vs22.vcxproj
@@ -601,23 +601,9 @@
       <PrecompiledHeaderFile>StormCommon.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c" />
+    <ClCompile Include="src\LibTomCrypt.c" />
+    <ClCompile Include="src\LibTomMath.c" />
+    <ClCompile Include="src\LibTomMathDesc.c" />
     <ClCompile Include="src\SBaseCommon.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
       <PrecompiledHeaderFile>StormCommon.h</PrecompiledHeaderFile>
@@ -1013,185 +999,6 @@
     <ClCompile Include="src\bzip2\huffman.c" />
     <ClCompile Include="src\bzip2\randtable.c" />
     <ClCompile Include="src\huffman\huff.cpp" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
     <ClCompile Include="src\lzma\C\LzFind.c" />
     <ClCompile Include="src\lzma\C\LzFindMt.c" />
     <ClCompile Include="src\lzma\C\LzmaDec.c" />
diff --git a/StormLib_vs22.vcxproj.filters b/StormLib_vs22.vcxproj.filters
index 37915d2..22c9793 100644
--- a/StormLib_vs22.vcxproj.filters
+++ b/StormLib_vs22.vcxproj.filters
@@ -19,36 +19,6 @@
     <Filter Include="Source Files\huffman">
       <UniqueIdentifier>{87256d6a-e658-4f60-8759-6bff32a35eb2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\libtomcrypt">
-      <UniqueIdentifier>{d730d7c1-2960-49d2-ba0d-d1a91dd08964}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\hashes">
-      <UniqueIdentifier>{13e5ccb1-06f1-4d10-bdc1-825b51c64dbf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\math">
-      <UniqueIdentifier>{73f7f025-7366-4d76-8d60-4327e00b9d18}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\misc">
-      <UniqueIdentifier>{be21c641-7727-4d7b-919e-c895d801db17}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk">
-      <UniqueIdentifier>{694a7758-f909-4b8e-aa13-4d06a8c70eff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\asn1">
-      <UniqueIdentifier>{3f01cae6-5676-4f33-bb38-215341eedfc4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\ecc">
-      <UniqueIdentifier>{63d75851-c430-4c76-aa08-3398523aab4a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\pkcs1">
-      <UniqueIdentifier>{11175e9e-e9f1-405c-961b-933e72503cdd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\rsa">
-      <UniqueIdentifier>{e30512f4-bdf8-4460-823d-475bd8f08d28}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtommath">
-      <UniqueIdentifier>{d2889ef6-3f12-4a9b-8624-8d061748ff03}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\lzma">
       <UniqueIdentifier>{02c6dfb8-4a58-46c5-bb35-69ba6215a3a6}</UniqueIdentifier>
     </Filter>
@@ -181,543 +151,6 @@
     <ClCompile Include="src\huffman\huff.cpp">
       <Filter>Source Files\huffman</Filter>
     </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_abs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_and.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exch.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fread.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_grow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_neg.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_or.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rand.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_submod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_xor.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_zero.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_prime_tab.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_reverse.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bncore.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
     <ClCompile Include="src\lzma\C\LzFind.c">
       <Filter>Source Files\lzma</Filter>
     </ClCompile>
@@ -775,56 +208,14 @@
     <ClCompile Include="src\SBaseSubTypes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    <ClCompile Include="src\LibTomCrypt.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    <ClCompile Include="src\LibTomMath.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    <ClCompile Include="src\LibTomMathDesc.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/StormLib_vs22_dll.vcxproj b/StormLib_vs22_dll.vcxproj
index ba888e9..bda8dd9 100644
--- a/StormLib_vs22_dll.vcxproj
+++ b/StormLib_vs22_dll.vcxproj
@@ -213,202 +213,9 @@
     </ClCompile>
     <ClCompile Include="src\huffman\huff.cpp" />
     <ClCompile Include="src\jenkins\lookup3.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
+    <ClCompile Include="src\LibTomCrypt.c" />
+    <ClCompile Include="src\LibTomMath.c" />
+    <ClCompile Include="src\LibTomMathDesc.c" />
     <ClCompile Include="src\lzma\C\LzFind.c" />
     <ClCompile Include="src\lzma\C\LzFindMt.c" />
     <ClCompile Include="src\lzma\C\LzmaDec.c" />
diff --git a/StormLib_vs22_dll.vcxproj.filters b/StormLib_vs22_dll.vcxproj.filters
index 644488f..2eaf026 100644
--- a/StormLib_vs22_dll.vcxproj.filters
+++ b/StormLib_vs22_dll.vcxproj.filters
@@ -19,36 +19,6 @@
     <Filter Include="Source Files\huffman">
       <UniqueIdentifier>{593ac5e7-fe06-42b8-8025-e3bd725f95d8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\libtomcrypt">
-      <UniqueIdentifier>{9887a885-78fa-4164-80b9-9db6b0c11f86}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\hashes">
-      <UniqueIdentifier>{7db62947-d38d-48e9-8b52-4cad226394a6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\math">
-      <UniqueIdentifier>{b435fecf-9a65-4f2e-8d64-7dfc70de3137}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\misc">
-      <UniqueIdentifier>{d8ad7878-9e42-427a-b5b6-ae51d92b92cf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk">
-      <UniqueIdentifier>{07806629-c061-49ed-8212-0585d25fae23}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\asn1">
-      <UniqueIdentifier>{ca554d9f-b602-452a-971e-86b537ee2ad1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\ecc">
-      <UniqueIdentifier>{46e1697c-e6c2-4a8c-b4d2-0142311bb48b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\pkcs1">
-      <UniqueIdentifier>{99279e07-2e33-44c9-8f37-0b810ee4ba25}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\rsa">
-      <UniqueIdentifier>{04fbcfe0-3023-4fa0-8e36-26ab024a4abf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtommath">
-      <UniqueIdentifier>{4720c7a0-f4aa-4737-978c-9efe8b429906}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\lzma">
       <UniqueIdentifier>{856c9964-4d85-40e9-8cbd-f4c672c07780}</UniqueIdentifier>
     </Filter>
@@ -184,594 +154,6 @@
     <ClCompile Include="src\huffman\huff.cpp">
       <Filter>Source Files\huffman</Filter>
     </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_abs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_and.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exch.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fread.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_grow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_neg.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_or.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rand.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_submod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_xor.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_zero.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_prime_tab.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_reverse.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bncore.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
     <ClCompile Include="src\lzma\C\LzFind.c">
       <Filter>Source Files\lzma</Filter>
     </ClCompile>
@@ -829,6 +211,15 @@
     <ClCompile Include="src\DllMain.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\LibTomCrypt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LibTomMath.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LibTomMathDesc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\DllMain.rc">
diff --git a/StormLib_vs22_test.vcxproj b/StormLib_vs22_test.vcxproj
index d293549..18cee5b 100644
--- a/StormLib_vs22_test.vcxproj
+++ b/StormLib_vs22_test.vcxproj
@@ -218,202 +218,9 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level1</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level1</WarningLevel>
     </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
+    <ClCompile Include="src\LibTomCrypt.c" />
+    <ClCompile Include="src\LibTomMath.c" />
+    <ClCompile Include="src\LibTomMathDesc.c" />
     <ClCompile Include="src\lzma\C\LzFind.c" />
     <ClCompile Include="src\lzma\C\LzFindMt.c" />
     <ClCompile Include="src\lzma\C\LzmaDec.c" />
diff --git a/StormLib_vs22_test.vcxproj.filters b/StormLib_vs22_test.vcxproj.filters
index 18f619a..d341b12 100644
--- a/StormLib_vs22_test.vcxproj.filters
+++ b/StormLib_vs22_test.vcxproj.filters
@@ -19,36 +19,6 @@
     <Filter Include="Source Files\huffman">
       <UniqueIdentifier>{7861b4fb-1471-4573-92ea-08c06dc14b93}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\libtomcrypt">
-      <UniqueIdentifier>{8ba6c5c7-3ad0-44e6-8829-5020fce13d49}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\hashes">
-      <UniqueIdentifier>{92cb0c1d-86f0-4735-9e4e-b07df664c359}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\math">
-      <UniqueIdentifier>{f7fb3d55-94af-4a6e-be7b-76cb909e7325}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\misc">
-      <UniqueIdentifier>{337159fe-94a7-45a8-a91b-fa8b9d06b2ae}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk">
-      <UniqueIdentifier>{359bb3d3-71d5-47e7-967a-1fada7882e4d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\asn1">
-      <UniqueIdentifier>{775dbb7e-ef06-4660-9d84-50ff2557ef54}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\ecc">
-      <UniqueIdentifier>{2e5d39cc-482c-4775-8830-79f8314e72e4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\pkcs1">
-      <UniqueIdentifier>{1e0ef267-228e-4c59-8d88-e3b33aeaff49}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\rsa">
-      <UniqueIdentifier>{98330deb-0b92-4f02-8016-8a33dc5f5d29}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtommath">
-      <UniqueIdentifier>{fa78c716-784a-43a0-a548-db413431973b}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\lzma">
       <UniqueIdentifier>{5308566b-d3fd-4561-a7fb-982a63662793}</UniqueIdentifier>
     </Filter>
@@ -193,594 +163,6 @@
     <ClCompile Include="src\huffman\huff.cpp">
       <Filter>Source Files\huffman</Filter>
     </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_abs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_and.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exch.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fread.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_grow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_neg.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_or.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rand.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_submod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_xor.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_zero.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_prime_tab.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_reverse.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bncore.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
     <ClCompile Include="src\lzma\C\LzFind.c">
       <Filter>Source Files\lzma</Filter>
     </ClCompile>
@@ -835,5 +217,14 @@
     <ClCompile Include="src\jenkins\lookup3.c">
       <Filter>Source Files\jenkins</Filter>
     </ClCompile>
+    <ClCompile Include="src\LibTomCrypt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LibTomMath.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LibTomMathDesc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/LibTomCrypt.c b/src/LibTomCrypt.c
new file mode 100644
index 0000000..012f5e0
--- /dev/null
+++ b/src/LibTomCrypt.c
@@ -0,0 +1,84 @@
+//
+// This compound source is here for reducing the long build time
+// of the entire StormLib library
+//
+
+#pragma warning(disable:4242)            // der_decode_ia5_string.c(84) : warning C4242: '=' : conversion from 'int' to 'unsigned char', possible loss of data
+
+#include "libtomcrypt/src/hashes/hash_memory.c"
+#include "libtomcrypt/src/hashes/md5.c"
+#include "libtomcrypt/src/hashes/sha1.c"
+#include "libtomcrypt/src/math/multi.c"
+#include "libtomcrypt/src/math/rand_prime.c"
+#include "libtomcrypt/src/misc/base64_decode.c"
+#include "libtomcrypt/src/misc/crypt_argchk.c"
+#include "libtomcrypt/src/misc/crypt_find_hash.c"
+#include "libtomcrypt/src/misc/crypt_find_prng.c"
+#include "libtomcrypt/src/misc/crypt_hash_descriptor.c"
+#include "libtomcrypt/src/misc/crypt_hash_is_valid.c"
+#include "libtomcrypt/src/misc/crypt_libc.c"
+#include "libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c"
+#include "libtomcrypt/src/misc/crypt_prng_descriptor.c"
+#include "libtomcrypt/src/misc/crypt_prng_is_valid.c"
+#include "libtomcrypt/src/misc/crypt_register_hash.c"
+#include "libtomcrypt/src/misc/crypt_register_prng.c"
+#include "libtomcrypt/src/misc/zeromem.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_bit_string.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_boolean.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_choice.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_ia5_string.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_integer.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_object_identifier.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_octet_string.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_printable_string.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_short_integer.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_utctime.c"
+#include "libtomcrypt/src/pk/asn1/der_decode_utf8_string.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_bit_string.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_boolean.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_ia5_string.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_integer.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_object_identifier.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_octet_string.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_printable_string.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_sequence_ex.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_sequence_multi.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_set.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_setof.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_short_integer.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_utctime.c"
+#include "libtomcrypt/src/pk/asn1/der_encode_utf8_string.c"
+#include "libtomcrypt/src/pk/asn1/der_length_bit_string.c"
+#include "libtomcrypt/src/pk/asn1/der_length_boolean.c"
+#include "libtomcrypt/src/pk/asn1/der_length_ia5_string.c"
+#include "libtomcrypt/src/pk/asn1/der_length_integer.c"
+#include "libtomcrypt/src/pk/asn1/der_length_object_identifier.c"
+#include "libtomcrypt/src/pk/asn1/der_length_octet_string.c"
+#include "libtomcrypt/src/pk/asn1/der_length_printable_string.c"
+#include "libtomcrypt/src/pk/asn1/der_length_sequence.c"
+#include "libtomcrypt/src/pk/asn1/der_length_short_integer.c"
+#include "libtomcrypt/src/pk/asn1/der_length_utctime.c"
+#include "libtomcrypt/src/pk/asn1/der_length_utf8_string.c"
+#include "libtomcrypt/src/pk/asn1/der_sequence_free.c"
+#include "libtomcrypt/src/pk/ecc/ltc_ecc_map.c"
+#include "libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c"
+#include "libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c"
+#include "libtomcrypt/src/pk/ecc/ltc_ecc_points.c"
+#include "libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c"
+#include "libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c"
+#include "libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c"
+#include "libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c"
+#include "libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c"
+#include "libtomcrypt/src/pk/pkcs1/pkcs_1_pss_encode.c"
+#include "libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c"
+#include "libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_encode.c"
+#include "libtomcrypt/src/pk/rsa/rsa_exptmod.c"
+#include "libtomcrypt/src/pk/rsa/rsa_free.c"
+#include "libtomcrypt/src/pk/rsa/rsa_import.c"
+#include "libtomcrypt/src/pk/rsa/rsa_make_key.c"
+#include "libtomcrypt/src/pk/rsa/rsa_sign_hash.c"
+#include "libtomcrypt/src/pk/rsa/rsa_verify_hash.c"
+#include "libtomcrypt/src/pk/rsa/rsa_verify_simple.c"
diff --git a/src/LibTomMath.c b/src/LibTomMath.c
new file mode 100644
index 0000000..5f6639f
--- /dev/null
+++ b/src/LibTomMath.c
@@ -0,0 +1,125 @@
+//
+// This compound source is here for reducing the long build time
+// of the entire StormLib library
+//
+
+#pragma warning(disable:4334)             // warning C4334: '<<' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
+
+#include "libtommath/bn_fast_mp_invmod.c"
+#include "libtommath/bn_fast_mp_montgomery_reduce.c"
+#include "libtommath/bn_fast_s_mp_mul_digs.c"
+#include "libtommath/bn_fast_s_mp_mul_high_digs.c"
+#include "libtommath/bn_fast_s_mp_sqr.c"
+#include "libtommath/bn_mp_2expt.c"
+#include "libtommath/bn_mp_abs.c"
+#include "libtommath/bn_mp_add.c"
+#include "libtommath/bn_mp_add_d.c"
+#include "libtommath/bn_mp_addmod.c"
+#include "libtommath/bn_mp_and.c"
+#include "libtommath/bn_mp_clamp.c"
+#include "libtommath/bn_mp_clear.c"
+#include "libtommath/bn_mp_clear_multi.c"
+#include "libtommath/bn_mp_cmp.c"
+#include "libtommath/bn_mp_cmp_d.c"
+#include "libtommath/bn_mp_cmp_mag.c"
+#include "libtommath/bn_mp_cnt_lsb.c"
+#include "libtommath/bn_mp_copy.c"
+#include "libtommath/bn_mp_count_bits.c"
+#include "libtommath/bn_mp_div.c"
+#include "libtommath/bn_mp_div_2.c"
+#include "libtommath/bn_mp_div_2d.c"
+#include "libtommath/bn_mp_div_3.c"
+#include "libtommath/bn_mp_div_d.c"
+#include "libtommath/bn_mp_dr_is_modulus.c"
+#include "libtommath/bn_mp_dr_reduce.c"
+#include "libtommath/bn_mp_dr_setup.c"
+#include "libtommath/bn_mp_exch.c"
+#include "libtommath/bn_mp_expt_d.c"
+#include "libtommath/bn_mp_exptmod.c"
+#include "libtommath/bn_mp_exptmod_fast.c"
+#include "libtommath/bn_mp_exteuclid.c"
+#include "libtommath/bn_mp_fread.c"
+#include "libtommath/bn_mp_fwrite.c"
+#include "libtommath/bn_mp_gcd.c"
+#include "libtommath/bn_mp_get_int.c"
+#include "libtommath/bn_mp_grow.c"
+#include "libtommath/bn_mp_init.c"
+#include "libtommath/bn_mp_init_copy.c"
+#include "libtommath/bn_mp_init_multi.c"
+#include "libtommath/bn_mp_init_set.c"
+#include "libtommath/bn_mp_init_set_int.c"
+#include "libtommath/bn_mp_init_size.c"
+#include "libtommath/bn_mp_invmod.c"
+#include "libtommath/bn_mp_invmod_slow.c"
+#include "libtommath/bn_mp_is_square.c"
+#include "libtommath/bn_mp_jacobi.c"
+#include "libtommath/bn_mp_karatsuba_mul.c"
+#include "libtommath/bn_mp_karatsuba_sqr.c"
+#include "libtommath/bn_mp_lcm.c"
+#include "libtommath/bn_mp_lshd.c"
+#include "libtommath/bn_mp_mod.c"
+#include "libtommath/bn_mp_mod_2d.c"
+#include "libtommath/bn_mp_mod_d.c"
+#include "libtommath/bn_mp_montgomery_calc_normalization.c"
+#include "libtommath/bn_mp_montgomery_reduce.c"
+#include "libtommath/bn_mp_montgomery_setup.c"
+#include "libtommath/bn_mp_mul.c"
+#include "libtommath/bn_mp_mul_2.c"
+#include "libtommath/bn_mp_mul_2d.c"
+#include "libtommath/bn_mp_mul_d.c"
+#include "libtommath/bn_mp_mulmod.c"
+#include "libtommath/bn_mp_n_root.c"
+#include "libtommath/bn_mp_neg.c"
+#include "libtommath/bn_mp_or.c"
+#include "libtommath/bn_mp_prime_fermat.c"
+#include "libtommath/bn_mp_prime_is_divisible.c"
+#include "libtommath/bn_mp_prime_is_prime.c"
+#include "libtommath/bn_mp_prime_miller_rabin.c"
+#include "libtommath/bn_mp_prime_next_prime.c"
+#include "libtommath/bn_mp_prime_rabin_miller_trials.c"
+#include "libtommath/bn_mp_prime_random_ex.c"
+#include "libtommath/bn_mp_radix_size.c"
+#include "libtommath/bn_mp_radix_smap.c"
+#include "libtommath/bn_mp_rand.c"
+#include "libtommath/bn_mp_read_radix.c"
+#include "libtommath/bn_mp_read_signed_bin.c"
+#include "libtommath/bn_mp_read_unsigned_bin.c"
+#include "libtommath/bn_mp_reduce.c"
+#include "libtommath/bn_mp_reduce_2k.c"
+#include "libtommath/bn_mp_reduce_2k_l.c"
+#include "libtommath/bn_mp_reduce_2k_setup.c"
+#include "libtommath/bn_mp_reduce_2k_setup_l.c"
+#include "libtommath/bn_mp_reduce_is_2k.c"
+#include "libtommath/bn_mp_reduce_is_2k_l.c"
+#include "libtommath/bn_mp_reduce_setup.c"
+#include "libtommath/bn_mp_rshd.c"
+#include "libtommath/bn_mp_set.c"
+#include "libtommath/bn_mp_set_int.c"
+#include "libtommath/bn_mp_shrink.c"
+#include "libtommath/bn_mp_signed_bin_size.c"
+#include "libtommath/bn_mp_sqr.c"
+#include "libtommath/bn_mp_sqrmod.c"
+#include "libtommath/bn_mp_sqrt.c"
+#include "libtommath/bn_mp_sub.c"
+#include "libtommath/bn_mp_sub_d.c"
+#include "libtommath/bn_mp_submod.c"
+#include "libtommath/bn_mp_to_signed_bin.c"
+#include "libtommath/bn_mp_to_signed_bin_n.c"
+#include "libtommath/bn_mp_to_unsigned_bin.c"
+#include "libtommath/bn_mp_to_unsigned_bin_n.c"
+#include "libtommath/bn_mp_toom_mul.c"
+#include "libtommath/bn_mp_toom_sqr.c"
+#include "libtommath/bn_mp_toradix.c"
+#include "libtommath/bn_mp_toradix_n.c"
+#include "libtommath/bn_mp_unsigned_bin_size.c"
+#include "libtommath/bn_mp_xor.c"
+#include "libtommath/bn_mp_zero.c"
+#include "libtommath/bn_prime_tab.c"
+#include "libtommath/bn_reverse.c"
+#include "libtommath/bn_s_mp_add.c"
+#include "libtommath/bn_s_mp_exptmod.c"
+#include "libtommath/bn_s_mp_mul_digs.c"
+#include "libtommath/bn_s_mp_mul_high_digs.c"
+#include "libtommath/bn_s_mp_sqr.c"
+#include "libtommath/bn_s_mp_sub.c"
+#include "libtommath/bncore.c"
diff --git a/src/LibTomMathDesc.c b/src/LibTomMathDesc.c
new file mode 100644
index 0000000..0d2fb3a
--- /dev/null
+++ b/src/LibTomMathDesc.c
@@ -0,0 +1,4 @@
+// This is a source file for WDK build of StormLib
+// It is copied to the root folder during the build process
+
+#include "libtomcrypt/src/math/ltm_desc.c"
diff --git a/src/wdk/sources-wdk-tommath.c b/src/wdk/sources-wdk-tommath.c
index 78e86a2..b394d27 100644
--- a/src/wdk/sources-wdk-tommath.c
+++ b/src/wdk/sources-wdk-tommath.c
@@ -121,4 +121,3 @@
 #include "src\libtommath\bn_s_mp_sqr.c"
 #include "src\libtommath\bn_s_mp_sub.c"
 #include "src\libtommath\bncore.c"
-
diff --git a/test/StormTest.cpp b/test/StormTest.cpp
index ca409f1..e8a52dc 100644
--- a/test/StormTest.cpp
+++ b/test/StormTest.cpp
@@ -36,6 +36,8 @@
 //------------------------------------------------------------------------------

 // Local structures

 

+#define ID_XHSC 0x58485343      // 'XHSC'

+

 // Artificial error code for situations where we don't know the result

 #define ERROR_UNDETERMINED_RESULT 0xC000FFFF

 

@@ -230,8 +232,8 @@ static const wchar_t szUnicodeName6[] = {   // Arabic
 

 static SFILE_MARKERS MpqMarkers[] =

 {

-    {sizeof(SFILE_MARKERS), ID_MPQ, "(hash table)", "(block table)"},

-    {sizeof(SFILE_MARKERS), 'XHSC', "(cash table)", "(clock table)"}

+    {sizeof(SFILE_MARKERS), ID_MPQ,  "(hash table)", "(block table)"},

+    {sizeof(SFILE_MARKERS), ID_XHSC, "(cash table)", "(clock table)"}

 };

 

 //-----------------------------------------------------------------------------

@@ -2242,7 +2244,7 @@ static DWORD TestArchive_LoadFiles(TLogHelper * pLogger, HANDLE hMpq, DWORD bIgn
         if(SFileHasFile(hMpq, szFileName))

         {

             dwErrCode = LoadMpqFile(*pLogger, hMpq, szFileName, 0, dwSearchFlags, &pFileData);

-            if(dwErrCode != ERROR_SUCCESS && bIgnoreOpenErrors == FALSE)

+            if(dwErrCode != ERROR_SUCCESS && bIgnoreOpenErrors == 0)

             {

                 pLogger->PrintError("Error loading the file %s", szFileName);

                 break;

@@ -2760,7 +2762,7 @@ static DWORD TestOpenArchive_SignatureTest(LPCTSTR szPlainName, LPCTSTR szOrigin
     return dwErrCode;

 }

 

-static DWORD TestOpenArchive_CompactArchive(LPCTSTR szPlainName, LPCTSTR szCopyName, BOOL bAddUserData)

+static DWORD TestOpenArchive_CompactArchive(LPCTSTR szPlainName, LPCTSTR szCopyName, DWORD bAddUserData)

 {

     TLogHelper Logger("CompactMpqTest", szPlainName);

     ULONGLONG PreMpqDataSize = (bAddUserData) ? 0x400 : 0;

@@ -4209,7 +4211,7 @@ int _tmain(int argc, TCHAR * argv[])
                 break;

         }

     }

-#endif  TEST_STREAM_OPERATIONS

+#endif  // TEST_STREAM_OPERATIONS

 

 #ifdef TEST_MASTER_MIRROR       // Test master-mirror reading operations

     if(dwErrCode == ERROR_SUCCESS)

diff --git a/test/TLogHelper.cpp b/test/TLogHelper.cpp
index 0570c65..84dc0aa 100644
--- a/test/TLogHelper.cpp
+++ b/test/TLogHelper.cpp
@@ -108,6 +108,7 @@ void TestStrCopy(wchar_t * szTarget, size_t cchTarget, const char * szSource, si
     }

 }

 

+#ifdef STORMLIB_WINDOWS

 wchar_t * CopyFormatCharacter(wchar_t * szBuffer, const wchar_t *& szFormat)

 {

     static const wchar_t * szStringFormat = _T("%s");

@@ -136,6 +137,7 @@ wchar_t * CopyFormatCharacter(wchar_t * szBuffer, const wchar_t *& szFormat)
     *szBuffer++ = *szFormat++;

     return szBuffer;

 }

+#endif  // STORMLIB_WINDOWS

 

 char * CopyFormatCharacter(char * szBuffer, const char *& szFormat)

 {