diff -r 2f10d260163b -r d07aa956024a cryptoservices/certificateandkeymgmt/group/bld.inf
--- a/cryptoservices/certificateandkeymgmt/group/bld.inf	Mon Mar 15 12:46:43 2010 +0200
+++ b/cryptoservices/certificateandkeymgmt/group/bld.inf	Thu Apr 01 00:24:41 2010 +0300
@@ -31,8 +31,6 @@
 // If there's no destination then the source file will be copied
 // to the same name in /epoc32/include
 
-../group/makecertstore.ipr	/epoc32/engdoc/tools/makecertstore.ipr
-
 ../inc/x509cert.h 	 SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(x509cert.h)
 ../inc/x509keys.h 	 SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(x509keys.h)
 ../inc/pkcs10attr.h	  SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(pkcs10attr.h)
@@ -505,7 +503,7 @@
 ../tcertstore/tdata/nrcertkey.txt		/epoc32/winscw/c/tcertstore/data/nrcertkey.txt
 ../tcertstore/tdata/signcertkey2.txt	/epoc32/winscw/c/tcertstore/data/signcertkey2.txt
 ../tcertstore/tdata/enciphersigncertkey2.txt	/epoc32/winscw/c/tcertstore/data/enciphersigncertkey2.txt
-../tcertstore/tdata/SelfSignedPrivateKey_pk8.der	/epoc32/winscw/c/tcertstore/data/SelfSignedPrivateKey_pk8.der
+../tcertstore/tdata/SelfSignedPrivateKey_pk8.pk8	/epoc32/winscw/c/tcertstore/data/SelfSignedPrivateKey_pk8.pk8
 
 ../tcertstore/scripts/certstoreconcurrent1.txt		/epoc32/winscw/c/tcertstoreconcurrent/scripts/certstoreconcurrent1.txt
 ../tcertstore/scripts/certstoreconcurrent2.txt		/epoc32/winscw/c/tcertstoreconcurrent/scripts/certstoreconcurrent2.txt