# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1254478559 -10800 # Node ID afc583cfa176d10a661eae3e84a4cdd9afb42718 # Parent 35751d3474b7aa61e4d5e0c7703e86dac58f9b00 Revision: 200938 diff -r 35751d3474b7 -r afc583cfa176 authorisation/userpromptservice/database/group/bld.inf --- a/authorisation/userpromptservice/database/group/bld.inf Thu Sep 10 14:01:51 2009 +0300 +++ b/authorisation/userpromptservice/database/group/bld.inf Fri Oct 02 13:15:59 2009 +0300 @@ -19,10 +19,7 @@ PRJ_EXPORTS ../inc/upsdb.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ups/upsdb.h) - -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/upsdbw.h /epoc32/include/ups/upsdbw.h -#endif +../inc/upsdbw.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ups/upsdbw.h) PRJ_MMPFILES diff -r 35751d3474b7 -r afc583cfa176 authorisation/userpromptservice/test/group/tups_notifier.mmp --- a/authorisation/userpromptservice/test/group/tups_notifier.mmp Thu Sep 10 14:01:51 2009 +0300 +++ b/authorisation/userpromptservice/test/group/tups_notifier.mmp Fri Oct 02 13:15:59 2009 +0300 @@ -43,6 +43,7 @@ end start resource tups_notifierapp.rss +DEPENDS techview/eikon.rsg header targetpath resource/apps end diff -r 35751d3474b7 -r afc583cfa176 authorisation/userpromptutils/group/bld.inf --- a/authorisation/userpromptutils/group/bld.inf Thu Sep 10 14:01:51 2009 +0300 +++ b/authorisation/userpromptutils/group/bld.inf Fri Oct 02 13:15:59 2009 +0300 @@ -17,9 +17,7 @@ PRJ_EXPORTS -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/upsnotifierutil.h /epoc32/include/ups/upsnotifierutil.h -#endif +../inc/upsnotifierutil.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ups/upsnotifierutil.h) ../inc/security_ups_utils.iby /epoc32/rom/include/security_ups_utils.iby diff -r 35751d3474b7 -r afc583cfa176 contentmgmt/referencedrmagent/RefTestAgent/streamingrefagent/source/plugin/10285A34.rss --- a/contentmgmt/referencedrmagent/RefTestAgent/streamingrefagent/source/plugin/10285A34.rss Thu Sep 10 14:01:51 2009 +0300 +++ b/contentmgmt/referencedrmagent/RefTestAgent/streamingrefagent/source/plugin/10285A34.rss Fri Oct 02 13:15:59 2009 +0300 @@ -43,4 +43,5 @@ }; } }; - } \ No newline at end of file + } + diff -r 35751d3474b7 -r afc583cfa176 crypto/weakcryptospi/group/security_cryptospi_strong.mrp --- a/crypto/weakcryptospi/group/security_cryptospi_strong.mrp Thu Sep 10 14:01:51 2009 +0300 +++ b/crypto/weakcryptospi/group/security_cryptospi_strong.mrp Fri Oct 02 13:15:59 2009 +0300 @@ -8,7 +8,6 @@ source \sf\os\security\crypto\weakcryptospi\strong source \sf\os\security\crypto\weakcryptospi\test source \sf\os\security\crypto\weakcryptospi\examples -source \sf\os\unref\orphan\comgen\security\wincrypto binary \sf\os\security\crypto\weakcryptospi\strong all exports \sf\os\security\crypto\weakcryptospi\strong notes_source \component_defs\release.src @@ -34,5 +33,5 @@ ipr export-restricted T \sf\os\security\crypto\weakcryptospi\test ipr export-restricted T \sf\os\security\crypto\weakcryptospi\examples ipr T \sf\os\security\crypto\weakcryptospi\test\dumpcryptoplugin -ipr export-restricted E \sf\os\unref\orphan\comgen\security\wincrypto + diff -r 35751d3474b7 -r afc583cfa176 crypto/weakcryptospi/test/tplugins/group/tplugin01.mmp --- a/crypto/weakcryptospi/test/tplugins/group/tplugin01.mmp Thu Sep 10 14:01:51 2009 +0300 +++ b/crypto/weakcryptospi/test/tplugins/group/tplugin01.mmp Fri Oct 02 13:15:59 2009 +0300 @@ -54,7 +54,7 @@ #ifdef SYMBIAN_SDP_IPSEC_VOIP_SUPPORT SOURCE rijndaelimpl.cpp -SOURCEPATH ..\src\tplugin01 +SOURCEPATH ../src/tplugin01 SOURCE cmacimpl.cpp macimpl.cpp #endif diff -r 35751d3474b7 -r afc583cfa176 crypto/weakcryptospi/test/tplugins/group/tplugin02.mmp --- a/crypto/weakcryptospi/test/tplugins/group/tplugin02.mmp Thu Sep 10 14:01:51 2009 +0300 +++ b/crypto/weakcryptospi/test/tplugins/group/tplugin02.mmp Fri Oct 02 13:15:59 2009 +0300 @@ -57,7 +57,7 @@ #ifdef SYMBIAN_SDP_IPSEC_VOIP_SUPPORT SOURCE rijndaelimpl.cpp -SOURCEPATH ..\src\tplugin02 +SOURCEPATH ../src/tplugin02 SOURCE cmacimpl.cpp macimpl.cpp #endif diff -r 35751d3474b7 -r afc583cfa176 crypto/weakcryptospi/test/trandom/t_random.mmp --- a/crypto/weakcryptospi/test/trandom/t_random.mmp Thu Sep 10 14:01:51 2009 +0300 +++ b/crypto/weakcryptospi/test/trandom/t_random.mmp Fri Oct 02 13:15:59 2009 +0300 @@ -26,8 +26,8 @@ SOURCEPATH . SOURCE t_random.cpp -USERINCLUDE ..\inc ..\random -SYSTEMINCLUDE \epoc32\include +USERINCLUDE ../inc ../random +SYSTEMINCLUDE /epoc32/include LIBRARY euser.lib LIBRARY efsrv.lib random.lib diff -r 35751d3474b7 -r afc583cfa176 cryptomgmtlibs/securitycommonutils/group/bld.inf --- a/cryptomgmtlibs/securitycommonutils/group/bld.inf Thu Sep 10 14:01:51 2009 +0300 +++ b/cryptomgmtlibs/securitycommonutils/group/bld.inf Fri Oct 02 13:15:59 2009 +0300 @@ -22,16 +22,10 @@ PRJ_EXPORTS //SCS Exports -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/scsclient.h /epoc32/include/scs/scsclient.h -#endif +../inc/scsclient.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/scsclient.h) ../inc/scsserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/scsserver.h) -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/scscommon.h /epoc32/include/scs/scscommon.h -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/scscommon.inl /epoc32/include/scs/scscommon.inl -#endif +../inc/scscommon.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/scscommon.h) +../inc/scscommon.inl SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/scscommon.inl) #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS #ifdef SYMBIAN_OLD_EXPORT_LOCATION @@ -40,31 +34,15 @@ #endif //IPCStream Exports -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/nullstream.h /epoc32/include/scs/nullstream.h -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/nullbuf.h /epoc32/include/scs/nullbuf.h -#endif +../inc/nullstream.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/nullstream.h) +../inc/nullbuf.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/nullbuf.h) ../inc/ipcstream.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/ipcstream.h) -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/ipcstream.inl /epoc32/include/scs/ipcstream.inl -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/ipcbuf.h /epoc32/include/scs/ipcbuf.h -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/streamingarray.h /epoc32/include/scs/streamingarray.h -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/streamingarray.inl /epoc32/include/scs/streamingarray.inl -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/cleanuputils.h /epoc32/include/scs/cleanuputils.h -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/cleanuputils.inl /epoc32/include/scs/cleanuputils.inl -#endif +../inc/ipcstream.inl SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/ipcstream.inl) +../inc/ipcbuf.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/ipcbuf.h) +../inc/streamingarray.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/streamingarray.h) +../inc/streamingarray.inl SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/streamingarray.inl) +../inc/cleanuputils.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/cleanuputils.h) +../inc/cleanuputils.inl SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/cleanuputils.inl) ../inc/scs.iby /epoc32/rom/include/scs.iby ../inc/securitycommonutils.iby /epoc32/rom/include/securitycommonutils.iby @@ -75,9 +53,7 @@ #endif // Common Log file -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/securitylog.h /epoc32/include/scs/securitylog.h -#endif +../inc/securitylog.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/securitylog.h) PRJ_MMPFILES diff -r 35751d3474b7 -r afc583cfa176 cryptomgmtlibs/securitytestfw/group/bld.inf --- a/cryptomgmtlibs/securitytestfw/group/bld.inf Thu Sep 10 14:01:51 2009 +0300 +++ b/cryptomgmtlibs/securitytestfw/group/bld.inf Fri Oct 02 13:15:59 2009 +0300 @@ -71,9 +71,6 @@ ../test/autotesting/searchtags.pl /epoc32/winscw/c/tswi/searchtags.pl ../test/autotesting/testexecute.ini /epoc32/winscw/c/system/data/testexecute.ini -../test/autotesting/SFUpdateLicenceHeader.pl /epoc32/winscw/c/sfupdatelicenceheader.pl -../test/autotesting/check_for_cpr_lic_issues.pl /epoc32/winscw/c/check_for_cpr_lic_issues.pl -../test/autotesting/check_for_cpr_lic_issues.bat /epoc32/winscw/c/check_for_cpr_lic_issues.bat // batch files for automated hardware testing diff -r 35751d3474b7 -r afc583cfa176 cryptomgmtlibs/securitytestfw/test/autotesting/check_for_cpr_lic_issues.bat --- a/cryptomgmtlibs/securitytestfw/test/autotesting/check_for_cpr_lic_issues.bat Thu Sep 10 14:01:51 2009 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -@rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -@rem All rights reserved. -@rem This component and the accompanying materials are made available -@rem under the terms of the License "Eclipse Public License v1.0" -@rem which accompanies this distribution, and is available -@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -@rem -@rem Initial Contributors: -@rem Nokia Corporation - initial contribution. -@rem -@rem Contributors: -@rem -@rem Description: Check for the issues not considering the -@rem --- Top level bld.inf ( Not in MCL ) -@rem --- openssllib ( Maintained by OE ) -@rem --- opencryptolibs ( Maintained by OE ) -@rem --- testframework ( Not in MCL ) -@rem --- openssl ( Maintained by OE ) -@rem --- SFUpdateLicenceHeader.pl ( Don't complain about the script itself!! ) -@rem --- nokia_security_metadata/distribution.policy.s60 ( Not a part of Symbian Foundation ) -@rem - -@rem Remove the issues( lines ) related to the above from the generated verif_issues.txt LOG file -perl -ni.bak -e "print unless /\/common\/generic\/security\/distribution.policy.s60/;" \epoc32\winscw\c\verify_issues.txt -perl -ni.bak -e "print unless /openssllib/;" \epoc32\winscw\c\verify_issues.txt -perl -ni.bak -e "print unless /opencryptolibs/;" \epoc32\winscw\c\verify_issues.txt -perl -ni.bak -e "print unless /testframework/;" \epoc32\winscw\c\verify_issues.txt -perl -ni.bak -e "print unless /openssl/;" \epoc32\winscw\c\verify_issues.txt -perl -ni.bak -e "print unless /SFUpdateLicenceHeader.pl/;" \epoc32\winscw\c\verify_issues.txt -perl -ni.bak -e "print unless /\/common\/generic\/security\/os\/security\/security_info\/nokia_security_metadata\/distribution.policy.s60/;" \epoc32\winscw\c\verify_issues.txt - -@rem Append the result - Pass or fail to the same verify_issues.txt file. -perl \epoc32\winscw\c\check_for_cpr_lic_issues.pl diff -r 35751d3474b7 -r afc583cfa176 cryptomgmtlibs/securitytestfw/test/autotesting/check_for_cpr_lic_issues.pl --- a/cryptomgmtlibs/securitytestfw/test/autotesting/check_for_cpr_lic_issues.pl Thu Sep 10 14:01:51 2009 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -# -# Copyright (c) 2009 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: PREQ 2518 - Modification of Symbian OS copy-right notices -# PREQ 2683 - Adding distribution.policy.s60 files for all components in the MCL -# Script to check for the conflicting copy-right-licenses and missing policy files. -# Just checks the size of the file - verify_issues.txt to decide whether there are -# any issues! -# - - -#!/usr/bin/perl -use strict; -use warnings; -my $filesize = -s '\epoc32\winscw\c\verify_issues.txt'; -my $outputfile = '\epoc32\winscw\c\verify_issues.txt'; -open(OP,">>$outputfile") || die("Cannot Open File"); - -if( $filesize == 0 ) -{ - print (OP "\n\n\n\n\n\n\n\n\n No issues found. Test PASSED.\n\n"); - print (OP "\n Tests completed OK"); - print (OP "\n Run: 1"); - print (OP "\n Passed: 1"); - print (OP "\n 0 tests failed out of 1"); -} -else -{ - print (OP "\n\n\n\n\n\n\n\n\n\n Tests completed OK"); - print (OP "\n Issues found."); - print (OP "\n Run: 1"); - print (OP "\n Passed: 0"); - print (OP "\n 1 tests failed out of 1"); -} -exit 0; \ No newline at end of file diff -r 35751d3474b7 -r afc583cfa176 cryptomgmtlibs/securitytestfw/test/autotesting/hosts --- a/cryptomgmtlibs/securitytestfw/test/autotesting/hosts Thu Sep 10 14:01:51 2009 +0300 +++ b/cryptomgmtlibs/securitytestfw/test/autotesting/hosts Fri Oct 02 13:15:59 2009 +0300 @@ -1,2 +1,2 @@ -10.253.18.26 cam-ocsptest01.intra -10.253.18.26 cam-OCSPTEST01.prod.ad.symbian.intra +10.253.18.15 cam-ocsptest01.intra +10.253.18.15 cam-OCSPTEST01.prod.ad.symbian.intra diff -r 35751d3474b7 -r afc583cfa176 cryptomgmtlibs/securitytestfw/test/autotesting/panicscan_authserver.pl --- a/cryptomgmtlibs/securitytestfw/test/autotesting/panicscan_authserver.pl Thu Sep 10 14:01:51 2009 +0300 +++ b/cryptomgmtlibs/securitytestfw/test/autotesting/panicscan_authserver.pl Fri Oct 02 13:15:59 2009 +0300 @@ -52,8 +52,6 @@ ("Thread tauthcliserv.exe::Worker.*Panic AUTHEXPR 64", 3))); push(@{$expectedPanicsHash{"tauthsvr2_epocwind.txt"}}, (0, ("Thread AuthServer.EXE::Main Panic AuthServer 5", 3))); -push(@{$expectedPanicsHash{"tpinplugin_epocwind.txt"}}, (0, - ("Thread tpinplugin.exe::Worker.*Panic PINPLUGIN 1", 2))); # crypto - padding related tests expect panics push(@{$expectedPanicsHash{"tpaddingudeb_epocwind.txt"}}, (0, diff -r 35751d3474b7 -r afc583cfa176 cryptomgmtlibs/securitytestfw/test/autotesting/test_spec_sdp_9.5.txt --- a/cryptomgmtlibs/securitytestfw/test/autotesting/test_spec_sdp_9.5.txt Thu Sep 10 14:01:51 2009 +0300 +++ b/cryptomgmtlibs/securitytestfw/test/autotesting/test_spec_sdp_9.5.txt Fri Oct 02 13:15:59 2009 +0300 @@ -691,7 +691,7 @@ TESTEXECUTE, \logs\testexecute\authsecuritytests.htm,, -Dstartupmode=1 -- \tauth\securitytests\scripts\authsecuritytests.script, 1600, UDEB#UREL,, \epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_tauthsvr.bat TESTEXECUTE, \logs\testexecute\tauthsvroom.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tauthsvroom.script, 5000, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pretauthsvroom.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\posttauthsvroom.bat # Pinplugin test -TESTEXECUTE, \logs\testexecute\tpinplugin.htm,, \tauth\tpinplugin\scripts\tpinplugin.script, 300, UDEB#UREL,, +TESTEXECUTE, \logs\testexecute\tpinplugin.htm,, -Dstartupmode=1 -- \tauth\tpinplugin\scripts\tpinplugin.script, 300, UDEB#UREL,, # Scan for unexpected panics in epocwind.out files PERL, \panicscanlog.txt,,\epoc32\winscw\c\tswi\panicscan_authserver.pl, 300, UDEB,, @@ -718,6 +718,10 @@ t_certstore, \logs\testexecute\SDP-Security_Tools-CertApp-FILEDAT-EMU00.htm,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-FILEDAT-EMU00.script \logs\testexecute\SDP-Security_Tools-CertApp-FILEDAT-EMU00.htm, 600, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat t_certstore, \logs\testexecute\SDP-Security_Tools-CertApp-SWIDAT-EMU00.htm,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-SWIDAT-EMU00.script \logs\testexecute\SDP-Security_Tools-CertApp-SWIDAT-EMU00.htm 600, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat +[UptoMCL] +# Scan for unexpected panics in epocwind.out files +PERL, \panicscanlog.txt,,\epoc32\winscw\c\tswi\panicscan.pl, 300, UDEB,, + [Misc] # Check that there are no test certificates in invalid locations in the source code @@ -728,11 +732,3 @@ # Categorisation tags are checked for all of security sub-system PERL, \searchtags.txt,,\epoc32\winscw\c\tswi\searchtags.pl, 300, UDEB,, - -# PREQ2518 and 2683 - Check for any missing distribution.policy.s60 file and copyright license issues. -PERL, \verify_issues.txt,, \epoc32\winscw\c\SFUpdateLicenceHeader.pl -verify -log verify.log -output \epoc32\winscw\c\verify_issues.txt %SECURITYSOURCEDIR%, 300, UDEB,, \epoc32\winscw\c\check_for_cpr_lic_issues.bat - -[UptoMCL] -# Scan for unexpected panics in epocwind.out files -PERL, \panicscanlog.txt,,\epoc32\winscw\c\tswi\panicscan.pl, 300, UDEB,, -# END of file diff -r 35751d3474b7 -r afc583cfa176 cryptomgmtlibs/securityutils/group/bld.inf --- a/cryptomgmtlibs/securityutils/group/bld.inf Thu Sep 10 14:01:51 2009 +0300 +++ b/cryptomgmtlibs/securityutils/group/bld.inf Fri Oct 02 13:15:59 2009 +0300 @@ -25,15 +25,11 @@ DEFAULT PRJ_EXPORTS -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/euserext.h -#endif -../inc/miscutil.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(miscutil.h) -../inc/callbacktimer.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(callbacktimer.h) +../inc/euserext.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(euserext.h) +../inc/miscutil.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(miscutil.h) +../inc/callbacktimer.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(callbacktimer.h) -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/securityerr.h /epoc32/include/securityerr.h -#endif +../inc/securityerr.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(securityerr.h) // ROMKIT includes ../inc/secutil.iby /epoc32/rom/include/secutil.iby ../inc/sectcbutil.iby /epoc32/rom/include/sectcbutil.iby diff -r 35751d3474b7 -r afc583cfa176 cryptoservices/asnpkcs/test/tpkcs8enc/tpkcs8enc.mmp --- a/cryptoservices/asnpkcs/test/tpkcs8enc/tpkcs8enc.mmp Thu Sep 10 14:01:51 2009 +0300 +++ b/cryptoservices/asnpkcs/test/tpkcs8enc/tpkcs8enc.mmp Fri Oct 02 13:15:59 2009 +0300 @@ -29,11 +29,11 @@ SOURCEPATH . SOURCE pkcs8Tester.cpp -USERINCLUDE ..\..\..\..\crypto\weakcrypto\inc -USERINCLUDE ..\..\..\filebasedcertificateandkeystores\source\generic\client -USERINCLUDE ..\..\..\filebasedcertificateandkeystores\source\generic\common -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE \epoc32\include\ecom +USERINCLUDE ../../../../crypto/weakcrypto/inc +USERINCLUDE ../../../filebasedcertificateandkeystores/source/generic/client +USERINCLUDE ../../../filebasedcertificateandkeystores/source/generic/common +SYSTEMINCLUDE /epoc32/include +SYSTEMINCLUDE /epoc32/include/ecom LIBRARY euser.lib efsrv.lib ecom.lib cryptography.lib LIBRARY certstore.lib asn1.lib crypto.lib hash.lib diff -r 35751d3474b7 -r afc583cfa176 cryptoservices/certificateandkeymgmt/group/bld.inf --- a/cryptoservices/certificateandkeymgmt/group/bld.inf Thu Sep 10 14:01:51 2009 +0300 +++ b/cryptoservices/certificateandkeymgmt/group/bld.inf Fri Oct 02 13:15:59 2009 +0300 @@ -29,7 +29,7 @@ // specify the source file followed by its destination here // copy will be used to copy the source file to its destination // If there's no destination then the source file will be copied -// to the same name in \epoc32\include +// to the same name in /epoc32/include ../group/makecertstore.ipr /epoc32/engdoc/tools/makecertstore.ipr @@ -51,13 +51,9 @@ ../inc/pkixCertChain_v2.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(pkixcertchain.h) ../inc/pkixvalidationresult_v2.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(pkixvalidationresult.h) ../inc/x509CertExt_v2.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(x509certext.h) -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/x509constraintext.h /epoc32/include/x509constraintext.h -#endif +../inc/x509constraintext.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(x509constraintext.h) -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/x509keyencoder.h /epoc32/include/x509keyencoder.h -#endif +../inc/x509keyencoder.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(x509keyencoder.h) #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS #ifdef SYMBIAN_OLD_EXPORT_LOCATION ../inc/x509bitstring.h /epoc32/include/x509bitstring.h @@ -67,9 +63,7 @@ #endif #endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/swicertstore.h -#endif +../inc/swicertstore.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(swicertstore.h) @@ -80,9 +74,7 @@ ../inc/wtlsnames.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(wtlsnames.h) ../inc/wtlskeys.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(wtlskeys.h) ../inc/wtlscertchain.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(wtlscertchain.h) -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/pkcs7excert.h -#endif +../inc/pkcs7excert.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(pkcs7excert.h) ../inc/pkcs7issuerserial.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(pkcs7issuerserial.h) #ifdef SYMBIAN_OLD_EXPORT_LOCATION ../inc/pkcs7signerinfo.h @@ -114,7 +106,7 @@ ../certstore/certclients.dat /epoc32/release/winscw/urel/z/private/101f72a6/certclients.dat ../certstore/certclients.dat /epoc32/data/z/private/101f72a6/certclients.dat -//..\makecertstore\makecertstore.bat \epoc32\tools\makecertstore.bat +//../makecertstore/makecertstore.bat /epoc32/tools/makecertstore.bat // ROMKIT includes ../inc/CERTMAN.IBY /epoc32/rom/include/certman.iby diff -r 35751d3474b7 -r afc583cfa176 cryptoservices/certificateandkeymgmt/tpkixcert_tef/group/tpkixcert_tef.mmp --- a/cryptoservices/certificateandkeymgmt/tpkixcert_tef/group/tpkixcert_tef.mmp Thu Sep 10 14:01:51 2009 +0300 +++ b/cryptoservices/certificateandkeymgmt/tpkixcert_tef/group/tpkixcert_tef.mmp Fri Oct 02 13:15:59 2009 +0300 @@ -21,16 +21,16 @@ UID 0x1000007A 0x101FE229 VENDORID 0x70000001 -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE tpkixcertserver.cpp SOURCE pkixcertstepbase.cpp SOURCE apiteststeps.cpp SOURCE validateteststep.cpp SOURCE datetimefatalteststep.cpp -USERINCLUDE ..\src -SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE \epoc32\include\test +USERINCLUDE ../src +SYSTEMINCLUDE /epoc32/include +SYSTEMINCLUDE /epoc32/include/test LIBRARY euser.lib LIBRARY testexecuteutils.lib diff -r 35751d3474b7 -r afc583cfa176 package_definition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_definition.xml Fri Oct 02 13:15:59 2009 +0300 @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 35751d3474b7 -r afc583cfa176 security_info/security_metadata/security_metadata.mrp --- a/security_info/security_metadata/security_metadata.mrp Thu Sep 10 14:01:51 2009 +0300 +++ b/security_info/security_metadata/security_metadata.mrp Fri Oct 02 13:15:59 2009 +0300 @@ -1,5 +1,6 @@ component security_metadata source \sf\os\security\security_info\security_metadata source \sf\os\security\package_definition.xml +source \sf\os\security\distribution.policy.s60 notes_source \component_defs\release.src ipr T diff -r 35751d3474b7 -r afc583cfa176 securityanddataprivacytools/securityconfig/group/securityconfig.mmp --- a/securityanddataprivacytools/securityconfig/group/securityconfig.mmp Thu Sep 10 14:01:51 2009 +0300 +++ b/securityanddataprivacytools/securityconfig/group/securityconfig.mmp Fri Oct 02 13:15:59 2009 +0300 @@ -40,7 +40,7 @@ #ifdef __SECURE_DATA__ TARGETPATH /resource/errors #else -TARGETPATH \System\Errors +TARGETPATH /System/Errors #endif SMPSAFE