--- a/crypto/weakcryptospi/inc/cryptotests.iby	Thu Aug 19 11:38:48 2010 +0300
+++ b/crypto/weakcryptospi/inc/cryptotests.iby	Tue Aug 31 17:00:08 2010 +0300
@@ -24,8 +24,14 @@
 #include "pkcs5kdftests.iby"
 #include "paddingtests.iby"
 #include "tcryptospi.iby"
+// conditionally included to avoid to be included in vasco image creation but needed in h4/h6 image creation
+#ifdef _SERIAL_DOWNLOAD
 #include "cryptospi_testplugins.iby"
+#endif
 
+#if (defined(SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT) && defined(SYMBIAN_ENABLE_SDP_ECC))
+#include "cryptospi_testwmdrmplugins.iby"
+#endif
 
 file=ABI_DIR\BUILD_DIR\tsymmetric.exe	System\Programs\tsymmetric.exe
 file=ABI_DIR\BUILD_DIR\tasymmetric.exe	System\Programs\tasymmetric.exe
@@ -111,6 +117,9 @@
 data = ZDRIVE\tbigint\tprimefailuretests.ini		tbigint\tprimefailuretests.ini
 data = ZDRIVE\tbigint\tprimegen.ini             tbigint\tprimegen.ini
 
+// conditionally included to avoid to be included in vasco image creation but needed in h4/h6 image creation
+#ifdef _SERIAL_DOWNLOAD
+
 #if !defined(SMP)
 // Proof of concept KMS (Key Management Server)
 // Add them to the Core image (core.img) only. As rofs1.img does not support the device, and extension.
@@ -130,6 +139,7 @@
 file=ABI_DIR\BUILD_DIR\kmsclient.dll		sys\bin\kmsclient.dll
 
 file=ABI_DIR\BUILD_DIR\kmstest.exe			sys\bin\kmstest.exe
+#endif
 
 #endif
 // End of cryptotests.iby