4 files changed, 648 insertions, 494 deletions
diff --git a/win32/project/Balau.vcxproj b/win32/project/Balau.vcxproj
index 36566f8..30afcc2 100644
--- a/win32/project/Balau.vcxproj
+++ b/win32/project/Balau.vcxproj
@@ -558,125 +558,6 @@
     </ClCompile>
     <ClCompile Include="..\..\libtomcrypt\src\prngs\sprng.c" />
     <ClCompile Include="..\..\libtomcrypt\src\prngs\yarrow.c" />
-    <ClCompile Include="..\..\libtommath\bncore.c" />
-    <ClCompile Include="..\..\libtommath\bn_error.c" />
-    <ClCompile Include="..\..\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="..\..\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_add.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_and.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_div.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_init.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_or.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_set.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="..\..\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="..\..\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="..\..\libtommath\bn_reverse.c" />
-    <ClCompile Include="..\..\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="..\..\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="..\..\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="..\..\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="..\..\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="..\..\libtommath\bn_s_mp_sub.c" />
     <ClCompile Include="..\..\src\Async.cc" />
     <ClCompile Include="..\..\src\Base64.cc" />
     <ClCompile Include="..\..\src\BigInt.cc" />
@@ -774,9 +655,6 @@
     <ClInclude Include="..\..\libtomcrypt\src\headers\tomcrypt_pk.h" />
     <ClInclude Include="..\..\libtomcrypt\src\headers\tomcrypt_pkcs.h" />
     <ClInclude Include="..\..\libtomcrypt\src\headers\tomcrypt_prng.h" />
-    <ClInclude Include="..\..\libtommath\tommath.h" />
-    <ClInclude Include="..\..\libtommath\tommath_class.h" />
-    <ClInclude Include="..\..\libtommath\tommath_superclass.h" />
     <ClInclude Include="..\..\msvc-config.h" />
     <ClInclude Include="..\..\src\jsoncpp\include\json\autolink.h" />
     <ClInclude Include="..\..\src\jsoncpp\include\json\config.h" />
diff --git a/win32/project/Balau.vcxproj.filters b/win32/project/Balau.vcxproj.filters
index eee48f3..703edd4 100644
--- a/win32/project/Balau.vcxproj.filters
+++ b/win32/project/Balau.vcxproj.filters
@@ -10,9 +10,6 @@
     <Filter Include="Third Party">
       <UniqueIdentifier>{893ad8e1-312b-4844-80e6-80e0720df61b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Third Party\pthreads">
-      <UniqueIdentifier>{36efb68a-7dfa-472e-b797-26c9b8adfa10}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Third Party\libev">
       <UniqueIdentifier>{a5055a5d-6046-4233-b626-ae9b81fac69d}</UniqueIdentifier>
     </Filter>
@@ -22,9 +19,6 @@
     <Filter Include="Third Party\jsoncpp">
       <UniqueIdentifier>{590f1cba-186b-465c-b0d9-e2b68a9d9c34}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Third Party\tommath">
-      <UniqueIdentifier>{710b4743-23b2-45b7-afba-36991d953407}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Third Party\tomcrypt">
       <UniqueIdentifier>{5bd9abad-0cad-4ac1-a4c2-0e259ff9618a}</UniqueIdentifier>
     </Filter>
@@ -339,363 +333,6 @@
     <ClCompile Include="..\..\src\jsoncpp\src\json_writer.cpp">
       <Filter>Third Party\jsoncpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libtommath\bncore.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_error.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_fast_mp_invmod.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_fast_mp_montgomery_reduce.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_mul_digs.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_mul_high_digs.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_sqr.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_2expt.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_abs.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_add.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_addmod.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_add_d.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_and.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_clamp.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_clear.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_clear_multi.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_cmp.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_cmp_d.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_cmp_mag.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_cnt_lsb.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_copy.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_count_bits.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_div.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_div_2.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_div_2d.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_div_3.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_div_d.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_dr_is_modulus.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_dr_reduce.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_dr_setup.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_exch.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_exptmod.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_exptmod_fast.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_expt_d.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_exteuclid.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_fread.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_fwrite.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_gcd.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_get_int.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_grow.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_init.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_init_copy.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_init_multi.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_init_set.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_init_set_int.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_init_size.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_invmod.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_invmod_slow.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_is_square.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_jacobi.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_karatsuba_mul.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_karatsuba_sqr.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_lcm.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_lshd.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_mod.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_mod_2d.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_mod_d.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_calc_normalization.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_reduce.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_setup.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_mul.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_mulmod.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_mul_2.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_mul_2d.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_mul_d.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_neg.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_n_root.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_or.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_fermat.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_is_divisible.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_is_prime.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_miller_rabin.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_next_prime.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_rabin_miller_trials.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_prime_random_ex.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_radix_size.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_radix_smap.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_rand.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_read_radix.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_read_signed_bin.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_read_unsigned_bin.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_l.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_setup.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_setup_l.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_is_2k.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_is_2k_l.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_reduce_setup.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_rshd.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_set.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_set_int.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_shrink.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_signed_bin_size.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_sqr.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_sqrmod.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_sqrt.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_sub.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_submod.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_sub_d.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_toom_mul.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_toom_sqr.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_toradix.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_toradix_n.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_to_signed_bin.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_to_signed_bin_n.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_to_unsigned_bin.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_to_unsigned_bin_n.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_unsigned_bin_size.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_xor.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_mp_zero.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_prime_tab.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_reverse.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_s_mp_add.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_s_mp_exptmod.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_s_mp_mul_digs.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_s_mp_mul_high_digs.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_s_mp_sqr.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libtommath\bn_s_mp_sub.c">
-      <Filter>Third Party\tommath</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\libtomcrypt\src\prngs\fortuna.c">
       <Filter>Third Party\tomcrypt\prngs</Filter>
     </ClCompile>
@@ -1811,15 +1448,6 @@
     <ClInclude Include="..\..\src\jsoncpp\src\json_batchallocator.h">
       <Filter>Third Party\jsoncpp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libtommath\tommath.h">
-      <Filter>Third Party\tommath</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libtommath\tommath_class.h">
-      <Filter>Third Party\tommath</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libtommath\tommath_superclass.h">
-      <Filter>Third Party\tommath</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\libtomcrypt\src\headers\tomcrypt.h">
       <Filter>Third Party\tomcrypt\headers</Filter>
     </ClInclude>
diff --git a/win32/project/tommath.vcxproj b/win32/project/tommath.vcxproj
new file mode 100644
index 0000000..9361e3e
--- /dev/null
+++ b/win32/project/tommath.vcxproj
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0C334D26-6F19-4959-BB14-B4FB81099E99}</ProjectGuid>
+    <RootNamespace>tommath</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\..\libtommath</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\..\libtommath</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\..\libtommath</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\..\libtommath</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\libtommath\bncore.c" />
+    <ClCompile Include="..\..\libtommath\bn_error.c" />
+    <ClCompile Include="..\..\libtommath\bn_fast_mp_invmod.c" />
+    <ClCompile Include="..\..\libtommath\bn_fast_mp_montgomery_reduce.c" />
+    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_mul_digs.c" />
+    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_mul_high_digs.c" />
+    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_sqr.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_2expt.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_abs.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_add.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_addmod.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_add_d.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_and.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_clamp.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_clear.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_clear_multi.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_cmp.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_cmp_d.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_cmp_mag.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_cnt_lsb.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_copy.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_count_bits.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_div.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_div_2.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_div_2d.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_div_3.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_div_d.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_dr_is_modulus.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_dr_reduce.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_dr_setup.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_exch.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_exptmod.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_exptmod_fast.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_expt_d.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_exteuclid.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_fread.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_fwrite.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_gcd.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_get_int.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_grow.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_init.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_init_copy.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_init_multi.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_init_set.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_init_set_int.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_init_size.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_invmod.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_invmod_slow.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_is_square.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_jacobi.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_karatsuba_mul.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_karatsuba_sqr.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_lcm.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_lshd.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_mod.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_mod_2d.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_mod_d.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_calc_normalization.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_reduce.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_setup.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_mul.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_mulmod.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_mul_2.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_mul_2d.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_mul_d.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_neg.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_n_root.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_or.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_fermat.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_is_divisible.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_is_prime.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_miller_rabin.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_next_prime.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_rabin_miller_trials.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_random_ex.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_radix_size.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_radix_smap.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_rand.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_read_radix.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_read_signed_bin.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_read_unsigned_bin.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_l.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_setup.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_setup_l.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_is_2k.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_is_2k_l.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_setup.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_rshd.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_set.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_set_int.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_shrink.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_signed_bin_size.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_sqr.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_sqrmod.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_sqrt.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_sub.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_submod.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_sub_d.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_toom_mul.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_toom_sqr.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_toradix.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_toradix_n.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_to_signed_bin.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_to_signed_bin_n.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_to_unsigned_bin.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_to_unsigned_bin_n.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_unsigned_bin_size.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_xor.c" />
+    <ClCompile Include="..\..\libtommath\bn_mp_zero.c" />
+    <ClCompile Include="..\..\libtommath\bn_prime_tab.c" />
+    <ClCompile Include="..\..\libtommath\bn_reverse.c" />
+    <ClCompile Include="..\..\libtommath\bn_s_mp_add.c" />
+    <ClCompile Include="..\..\libtommath\bn_s_mp_exptmod.c" />
+    <ClCompile Include="..\..\libtommath\bn_s_mp_mul_digs.c" />
+    <ClCompile Include="..\..\libtommath\bn_s_mp_mul_high_digs.c" />
+    <ClCompile Include="..\..\libtommath\bn_s_mp_sqr.c" />
+    <ClCompile Include="..\..\libtommath\bn_s_mp_sub.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\libtommath\tommath.h" />
+    <ClInclude Include="..\..\libtommath\tommath_class.h" />
+    <ClInclude Include="..\..\libtommath\tommath_superclass.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/win32/project/tommath.vcxproj.filters b/win32/project/tommath.vcxproj.filters
new file mode 100644
index 0000000..17d76ec
--- /dev/null
+++ b/win32/project/tommath.vcxproj.filters
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\libtommath\bn_error.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_fast_mp_invmod.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_fast_mp_montgomery_reduce.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_mul_digs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_mul_high_digs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_fast_s_mp_sqr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_2expt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_abs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_add.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_add_d.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_addmod.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_and.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_clamp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_clear.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_clear_multi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_cmp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_cmp_d.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_cmp_mag.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_cnt_lsb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_copy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_count_bits.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_div.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_div_2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_div_2d.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_div_3.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_div_d.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_dr_is_modulus.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_dr_reduce.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_dr_setup.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_exch.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_expt_d.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_exptmod.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_exptmod_fast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_exteuclid.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_fread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_fwrite.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_gcd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_get_int.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_grow.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_init_copy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_init_multi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_init_set.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_init_set_int.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_init_size.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_invmod.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_invmod_slow.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_is_square.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_jacobi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_karatsuba_mul.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_karatsuba_sqr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_lcm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_lshd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_mod.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_mod_2d.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_mod_d.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_calc_normalization.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_reduce.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_montgomery_setup.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_mul.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_mul_2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_mul_2d.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_mul_d.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_mulmod.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_n_root.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_neg.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_or.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_fermat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_is_divisible.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_is_prime.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_miller_rabin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_next_prime.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_rabin_miller_trials.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_prime_random_ex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_radix_size.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_radix_smap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_rand.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_read_radix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_read_signed_bin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_read_unsigned_bin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_l.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_setup.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_2k_setup_l.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_is_2k.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_is_2k_l.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_reduce_setup.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_rshd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_set.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_set_int.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_shrink.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_signed_bin_size.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_sqr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_sqrmod.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_sqrt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_sub.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_sub_d.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_submod.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_to_signed_bin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_to_signed_bin_n.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_to_unsigned_bin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_to_unsigned_bin_n.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_toom_mul.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_toom_sqr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_toradix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_toradix_n.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_unsigned_bin_size.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_xor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_mp_zero.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_prime_tab.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_reverse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_s_mp_add.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_s_mp_exptmod.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_s_mp_mul_digs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_s_mp_mul_high_digs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_s_mp_sqr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bn_s_mp_sub.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libtommath\bncore.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\libtommath\tommath.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libtommath\tommath_class.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libtommath\tommath_superclass.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
+\ No newline at end of file