diff -r 581b7c2ef978 -r c11c717470d0 crypto/weakcryptospi/group/bld.inf
--- a/crypto/weakcryptospi/group/bld.inf	Fri Mar 19 10:03:04 2010 +0200
+++ b/crypto/weakcryptospi/group/bld.inf	Fri Apr 16 16:52:34 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -60,20 +60,25 @@
 #endif
 
 
-// Everything else is subject to export control; do not export them
-//../inc/spi/asymmetriccipherplugin.h		/epoc32/include/cryptospi/asymmetriccipherplugin.h
-//../inc/spi/cryptosymmetriccipherapi.h	/epoc32/include/cryptospi/cryptosymmetriccipherapi.h
-//../inc/spi/cryptoasymmetriccipherapi.h	/epoc32/include/cryptospi/cryptoasymmetriccipherapi.h
-//../inc/spi/cryptosignatureapi.h			/epoc32/include/cryptospi/cryptosignatureapi.h
-//../inc/spi/cryptokeypairgeneratorapi.h	/epoc32/include/cryptospi/cryptokeypairgeneratorapi.h
-//../inc/spi/keys.h						/epoc32/include/cryptospi/keys.h
-//../inc/spi/keypair.h					/epoc32/include/cryptospi/keypair.h
-//../inc/spi/keypairgeneratorplugin.h		/epoc32/include/cryptospi/keypairgeneratorplugin.h
-//../inc/spi/signerplugin.h				/epoc32/include/cryptospi/signerplugin.h
-//../inc/spi/symmetriccipherplugin.h		/epoc32/include/cryptospi/symmetriccipherplugin.h
-//../inc/spi/verifierplugin.h				/epoc32/include/cryptospi/verifierplugin.h
-//../inc/spi/cryptokeyagreementapi.h		/epoc32/include/cryptospi/cryptokeyagreementapi.h
-//../inc/spi/keyagreementplugin.h			/epoc32/include/cryptospi/keyagreementplugin.h
+// Now, the export control measures do not apply for the below set of headers. Hence, they can be exported.
+../inc/spi/asymmetriccipherplugin.h		      SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/asymmetriccipherplugin.h)
+../inc/spi/cryptosymmetriccipherapi.h			  SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/cryptosymmetriccipherapi.h)
+../inc/spi/cryptoasymmetriccipherapi.h	    SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/cryptoasymmetriccipherapi.h)
+../inc/spi/cryptosignatureapi.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/cryptosignatureapi.h)
+../inc/spi/cryptokeypairgeneratorapi.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/cryptokeypairgeneratorapi.h)
+../inc/spi/keys.h														SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(cryptospi/keys.h)
+../inc/spi/keypair.h												SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/keypair.h)
+../inc/spi/keypairgeneratorplugin.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/keypairgeneratorplugin.h)
+../inc/spi/signerplugin.h										SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/signerplugin.h)
+../inc/spi/symmetriccipherplugin.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/symmetriccipherplugin.h)
+../inc/spi/verifierplugin.h									SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/verifierplugin.h)
+../inc/spi/cryptokeyagreementapi.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/cryptokeyagreementapi.h)
+../inc/spi/keyagreementplugin.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/keyagreementplugin.h)
+
+
+// Cryptospi error codes.
+../inc/spi/cryptospi_errs.h               	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(cryptospi/cryptospi_errs.h)
+
 
 ../inc/cryptopanic.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(cryptopanic.h)
 ../inc/hash.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(hash.h)
@@ -270,3 +275,4 @@
 #ifdef SYMBIAN_SDP_IPSEC_VOIP_SUPPORT
 #include "../examples/bld.inf"
 #endif
+