diff --git a/cryptdll.vcproj b/cryptdll.vcproj
index 293fe0c6..94ea2d78 100644
--- a/cryptdll.vcproj
+++ b/cryptdll.vcproj
@@ -523,7 +523,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\authenc.cpp"
+				RelativePath="authenc.cpp"
 				>
 			</File>
 			<File
@@ -611,7 +611,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ccm.cpp"
+				RelativePath="ccm.cpp"
 				>
 			</File>
 			<File
@@ -657,11 +657,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\cmac.cpp"
+				RelativePath="cmac.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\cpu.cpp"
+				RelativePath="cpu.cpp"
 				>
 			</File>
 			<File
@@ -1261,7 +1261,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\gcm.cpp"
+				RelativePath="gcm.cpp"
 				>
 			</File>
 			<File
@@ -1433,7 +1433,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\hrtimer.cpp"
+				RelativePath="hrtimer.cpp"
 				>
 			</File>
 			<File
@@ -1865,7 +1865,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\pssr.cpp"
+				RelativePath="pssr.cpp"
 				>
 			</File>
 			<File
@@ -2163,7 +2163,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\rw.cpp"
+				RelativePath="rw.cpp"
 				>
 			</File>
 			<File
@@ -2377,7 +2377,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\x64dll.asm"
+				RelativePath="x64dll.asm"
 				>
 				<FileConfiguration
 					Name="Release|x64"
@@ -2424,7 +2424,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\authenc.h"
+				RelativePath="authenc.h"
 				>
 			</File>
 			<File
@@ -2436,7 +2436,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\ccm.h"
+				RelativePath="ccm.h"
 				>
 			</File>
 			<File
@@ -2444,7 +2444,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\cmac.h"
+				RelativePath="cmac.h"
 				>
 			</File>
 			<File
@@ -2452,7 +2452,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\cpu.h"
+				RelativePath="cpu.h"
 				>
 			</File>
 			<File
@@ -2512,7 +2512,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\gcm.h"
+				RelativePath="gcm.h"
 				>
 			</File>
 			<File
@@ -2592,7 +2592,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\pssr.h"
+				RelativePath="pssr.h"
 				>
 			</File>
 			<File
@@ -2620,7 +2620,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\rw.h"
+				RelativePath="rw.h"
 				>
 			</File>
 			<File
@@ -2655,6 +2655,10 @@
 				RelativePath="strciphr.h"
 				>
 			</File>
+			<File
+				RelativePath="trap.h"
+				>
+			</File>
 			<File
 				RelativePath="trdlocal.h"
 				>
diff --git a/cryptest.vcproj b/cryptest.vcproj
index 9ae71ea3..399384a1 100644
--- a/cryptest.vcproj
+++ b/cryptest.vcproj
@@ -734,131 +734,131 @@
 			Filter=".dat"
 			>
 			<File
-				RelativePath=".\TestVectors\aes.txt"
+				RelativePath="TestVectors\aes.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\all.txt"
+				RelativePath="TestVectors\all.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\camellia.txt"
+				RelativePath="TestVectors\camellia.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\ccm.txt"
+				RelativePath="TestVectors\ccm.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\cmac.txt"
+				RelativePath="TestVectors\cmac.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\dlies.txt"
+				RelativePath="TestVectors\dlies.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\dsa.txt"
+				RelativePath="TestVectors\dsa.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\dsa_1363.txt"
+				RelativePath="TestVectors\dsa_1363.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\eax.txt"
+				RelativePath="TestVectors\eax.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\esign.txt"
+				RelativePath="TestVectors\esign.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\gcm.txt"
+				RelativePath="TestVectors\gcm.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\hmac.txt"
+				RelativePath="TestVectors\hmac.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\mars.txt"
+				RelativePath="TestVectors\mars.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\nr.txt"
+				RelativePath="TestVectors\nr.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\panama.txt"
+				RelativePath="TestVectors\panama.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\Readme.txt"
+				RelativePath="TestVectors\Readme.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\rsa_oaep.txt"
+				RelativePath="TestVectors\rsa_oaep.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\rsa_pkcs1_1_5.txt"
+				RelativePath="TestVectors\rsa_pkcs1_1_5.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\rsa_pss.txt"
+				RelativePath="TestVectors\rsa_pss.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\rw.txt"
+				RelativePath="TestVectors\rw.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\salsa.txt"
+				RelativePath="TestVectors\salsa.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\seal.txt"
+				RelativePath="TestVectors\seal.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\seed.txt"
+				RelativePath="TestVectors\seed.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\sha.txt"
+				RelativePath="TestVectors\sha.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\sha3.txt"
+				RelativePath="TestVectors\sha3.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\shacal2.txt"
+				RelativePath="TestVectors\shacal2.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\sosemanuk.txt"
+				RelativePath="TestVectors\sosemanuk.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\tea.txt"
+				RelativePath="TestVectors\tea.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\ttmac.txt"
+				RelativePath="TestVectors\ttmac.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\vmac.txt"
+				RelativePath="TestVectors\vmac.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\wake.txt"
+				RelativePath="TestVectors\wake.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\TestVectors\whrlpool.txt"
+				RelativePath="TestVectors\whrlpool.txt"
 				>
 			</File>
 		</Filter>
@@ -1021,7 +1021,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\bench2.cpp"
+				RelativePath="bench2.cpp"
 				>
 			</File>
 			<File
@@ -1637,223 +1637,223 @@
 			Name="TestData"
 			>
 			<File
-				RelativePath=".\TestData\3desval.dat"
+				RelativePath="TestData\3desval.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\3wayval.dat"
+				RelativePath="TestData\3wayval.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\camellia.dat"
+				RelativePath="TestData\camellia.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\cast128v.dat"
+				RelativePath="TestData\cast128v.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\cast256v.dat"
+				RelativePath="TestData\cast256v.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\descert.dat"
+				RelativePath="TestData\descert.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\dh1024.dat"
+				RelativePath="TestData\dh1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\dh2048.dat"
+				RelativePath="TestData\dh2048.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\dlie1024.dat"
+				RelativePath="TestData\dlie1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\dlie2048.dat"
+				RelativePath="TestData\dlie2048.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\dsa1024.dat"
+				RelativePath="TestData\dsa1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\dsa1024b.dat"
+				RelativePath="TestData\dsa1024b.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\dsa512.dat"
+				RelativePath="TestData\dsa512.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\elgc1024.dat"
+				RelativePath="TestData\elgc1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\esig1023.dat"
+				RelativePath="TestData\esig1023.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\esig1536.dat"
+				RelativePath="TestData\esig1536.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\esig2046.dat"
+				RelativePath="TestData\esig2046.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\gostval.dat"
+				RelativePath="TestData\gostval.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\ideaval.dat"
+				RelativePath="TestData\ideaval.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\luc1024.dat"
+				RelativePath="TestData\luc1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\luc2048.dat"
+				RelativePath="TestData\luc2048.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\lucc1024.dat"
+				RelativePath="TestData\lucc1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\lucc512.dat"
+				RelativePath="TestData\lucc512.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\lucd1024.dat"
+				RelativePath="TestData\lucd1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\lucd512.dat"
+				RelativePath="TestData\lucd512.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\lucs1024.dat"
+				RelativePath="TestData\lucs1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\lucs512.dat"
+				RelativePath="TestData\lucs512.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\marsval.dat"
+				RelativePath="TestData\marsval.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\mqv1024.dat"
+				RelativePath="TestData\mqv1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\mqv2048.dat"
+				RelativePath="TestData\mqv2048.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\nr1024.dat"
+				RelativePath="TestData\nr1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\nr2048.dat"
+				RelativePath="TestData\nr2048.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rabi1024.dat"
+				RelativePath="TestData\rabi1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rabi2048.dat"
+				RelativePath="TestData\rabi2048.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rc2val.dat"
+				RelativePath="TestData\rc2val.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rc5val.dat"
+				RelativePath="TestData\rc5val.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rc6val.dat"
+				RelativePath="TestData\rc6val.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rijndael.dat"
+				RelativePath="TestData\rijndael.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rsa1024.dat"
+				RelativePath="TestData\rsa1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rsa2048.dat"
+				RelativePath="TestData\rsa2048.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rsa400pb.dat"
+				RelativePath="TestData\rsa400pb.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rsa400pv.dat"
+				RelativePath="TestData\rsa400pv.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rsa512a.dat"
+				RelativePath="TestData\rsa512a.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rw1024.dat"
+				RelativePath="TestData\rw1024.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\rw2048.dat"
+				RelativePath="TestData\rw2048.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\saferval.dat"
+				RelativePath="TestData\saferval.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\serpentv.dat"
+				RelativePath="TestData\serpentv.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\shacal2v.dat"
+				RelativePath="TestData\shacal2v.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\sharkval.dat"
+				RelativePath="TestData\sharkval.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\skipjack.dat"
+				RelativePath="TestData\skipjack.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\squareva.dat"
+				RelativePath="TestData\squareva.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\twofishv.dat"
+				RelativePath="TestData\twofishv.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\usage.dat"
+				RelativePath="TestData\usage.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\xtrdh171.dat"
+				RelativePath="TestData\xtrdh171.dat"
 				>
 			</File>
 			<File
-				RelativePath=".\TestData\xtrdh342.dat"
+				RelativePath="TestData\xtrdh342.dat"
 				>
 			</File>
 		</Filter>
diff --git a/cryptlib.vcproj b/cryptlib.vcproj
index 713b49a0..96f0e450 100644
--- a/cryptlib.vcproj
+++ b/cryptlib.vcproj
@@ -1110,7 +1110,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\authenc.cpp"
+				RelativePath="authenc.cpp"
 				>
 			</File>
 			<File
@@ -1854,7 +1854,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ccm.cpp"
+				RelativePath="ccm.cpp"
 				>
 			</File>
 			<File
@@ -1932,11 +1932,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\cmac.cpp"
+				RelativePath="cmac.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\cpu.cpp"
+				RelativePath="cpu.cpp"
 				>
 			</File>
 			<File
@@ -2614,7 +2614,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\eax.cpp"
+				RelativePath="eax.cpp"
 				>
 			</File>
 			<File
@@ -3378,7 +3378,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\gcm.cpp"
+				RelativePath="gcm.cpp"
 				>
 			</File>
 			<File
@@ -6803,7 +6803,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\salsa.cpp"
+				RelativePath="salsa.cpp"
 				>
 			</File>
 			<File
@@ -6881,7 +6881,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\seed.cpp"
+				RelativePath="seed.cpp"
 				>
 			</File>
 			<File
@@ -7033,7 +7033,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\sha3.cpp"
+				RelativePath="sha3.cpp"
 				>
 			</File>
 			<File
@@ -7481,7 +7481,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\sosemanuk.cpp"
+				RelativePath="sosemanuk.cpp"
 				>
 			</File>
 			<File
@@ -8225,7 +8225,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\vmac.cpp"
+				RelativePath="vmac.cpp"
 				>
 			</File>
 			<File
@@ -8525,7 +8525,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\x64dll.asm"
+				RelativePath="x64dll.asm"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -8599,7 +8599,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\x64masm.asm"
+				RelativePath="x64masm.asm"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -9078,7 +9078,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\authenc.h"
+				RelativePath="authenc.h"
 				>
 			</File>
 			<File
@@ -9114,7 +9114,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\ccm.h"
+				RelativePath="ccm.h"
 				>
 			</File>
 			<File
@@ -9122,7 +9122,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\cmac.h"
+				RelativePath="cmac.h"
 				>
 			</File>
 			<File
@@ -9130,7 +9130,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\cpu.h"
+				RelativePath="cpu.h"
 				>
 			</File>
 			<File
@@ -9166,7 +9166,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\eax.h"
+				RelativePath="eax.h"
 				>
 			</File>
 			<File
@@ -9214,7 +9214,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\gcm.h"
+				RelativePath="gcm.h"
 				>
 			</File>
 			<File
@@ -9422,7 +9422,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\salsa.h"
+				RelativePath="salsa.h"
 				>
 			</File>
 			<File
@@ -9438,7 +9438,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\seed.h"
+				RelativePath="seed.h"
 				>
 			</File>
 			<File
@@ -9450,7 +9450,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\sha3.h"
+				RelativePath="sha3.h"
 				>
 			</File>
 			<File
@@ -9478,7 +9478,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\sosemanuk.h"
+				RelativePath="sosemanuk.h"
 				>
 			</File>
 			<File
@@ -9486,7 +9486,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\stdcpp.h"
+				RelativePath="stdcpp.h"
 				>
 			</File>
 			<File
@@ -9501,6 +9501,10 @@
 				RelativePath="tiger.h"
 				>
 			</File>
+			<File
+				RelativePath="trap.h"
+				>
+			</File>
 			<File
 				RelativePath="trdlocal.h"
 				>
@@ -9518,7 +9522,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\vmac.h"
+				RelativePath="vmac.h"
 				>
 			</File>
 			<File
@@ -9574,11 +9578,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\License.txt"
+				RelativePath="License.txt"
 				>
 			</File>
 			<File
-				RelativePath=".\Readme.txt"
+				RelativePath="Readme.txt"
 				>
 			</File>
 		</Filter>