# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1283444589 -3600
# Node ID c575b960b6c82466d8b0a950f075a6bf257edea5
# Parent  a71299154b210c4e4dfced634920758e946d2914# Parent  f14a3bd1d49193445a4f93651c3fd54e216ec678
Merge RCL_3 fixes with reverted delivery

diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/bwins/upspoliciesu.def
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/database/source/upsdb.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/database/source/upsdbcompact.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/database/source/upsdbw.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/database/test/tupsdb/source/tupsdbbase.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/database/test/tupsdb/source/tupsdbstep.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/eabi/upspoliciesu.def
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/inc/tups.iby
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/inc/tups_integ.iby
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/policies/source/policyreader.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/policies/source/promptrequest.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/server/source/upsclient/upsclientserver.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/group/tups_dialogcreator_never.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/group/tupsinteg.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/group/tupsinteg_post1.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/group/tupsinteg_unprotected.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/inc_private/tups_notifiertypes.h
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/tups/packages/integ_buildsis.fil
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/tups/scripts/tups_integ.script
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/tups/src/tupsclientstep.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/tups/src/tupsclientstep.h
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/tups_backuprestore/tbackuprestore.h
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/tups_backuprestore/tbackuprestorestep.h
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/tups_dialogcreator/source/tups_dialogcreator.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 authorisation/userpromptservice/test/tups_dialogcreator/source/tups_dialogcreator_noprops.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafrecogniserconfig/ABLD.BAT
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/group/staclient.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/group/staserver.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/group/stashared.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/group/tscaf.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/group/tscaf_singleprocess_streamagent.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/group/tscaf_streamagent01.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/group/tscaf_streamagent02.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/run_tests.bat
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/streamingtestagent/inc/stacommon.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/streamingtestagent/inc/staserver.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/streamingtestagent/source/client/staclient.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/streamingtestagent/source/server/staserver.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/streamingtestagent/source/server/stasession.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/streamingtestagent_singleprocess/source/shared/testsingleprocesskeystreamdecoder.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/tscaf/inc/tscafstep.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/tscaf/source/tipsec.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/tscaf/source/tkeystreamdecoderattributes.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/tscaf/source/tkeystreamdecoderconstruct.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/tscaf/source/tkeystreamsink.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/tscaf/source/tmultikeystreamdecoders.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/tscaf/source/tpostacquisition.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/tscaf/source/treferenceagent.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/cafstreamingsupport/test/tscaf/source/tscafstep.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/group/CafUtils.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/group/caf.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/group/tcaf.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/inc/agentfactory.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/inc/agentinterface.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/inc/attribute.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/inc/caferr.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/inc/caftest.iby
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/inc/content.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/inc/data.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/inc/manager.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/caf/Agentfactory.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/caf/attribute.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/caf/content.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/caf/data.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/caf/manager.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/caf/resolver.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/caf/resolver.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/f32agent/f32agentcontent.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/f32agent/f32agentcontent.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/f32agent/f32agentdata.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/f32agent/f32agentdata.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/f32agent/f32agentfactory.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/f32agent/f32agentfactory.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/f32agent/f32agentmanager.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/f32agent/f32agentmanager.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/f32agent/f32defaultattributes.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/f32agent/f32defaultattributes.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/contentaccessfwfordrm/source/reccaf/CafApaRecognizer.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RTAServer/Client/rtacontent.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RTAServer/Client/rtadata.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RTAServer/Client/rtamanager.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RTAServer/Common/clientserver.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RTAServer/Server/rtacontenthandler.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RTAServer/Server/rtacontenthandler.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RTAServer/Server/rtadatahandler.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RTAServer/Server/rtadatahandler.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RTAServer/Server/rtamanagerhandler.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RTAServer/Server/rtamanagerhandler.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RefTestAgent/Reftestagentcontent.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RefTestAgent/Reftestagentcontent.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RefTestAgent/Reftestagentdata.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RefTestAgent/Reftestagentdata.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RefTestAgent/Reftestagentfactory.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RefTestAgent/Reftestagentfactory.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RefTestAgent/Reftestagentmanager.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/RefTestAgent/Reftestagentmanager.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/group/ABLD.BAT
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/group/RTAclient.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/group/RTAparser.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/group/sraclient.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/group/sraplugin.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/group/sraserver.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/group/srautils.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/inc/reftestagentconstants.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/inc/rta.iby
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/inc/rtacontent.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/inc/rtadata.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/inc/rtamanager.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/streamingrefagent/inc/sracommon.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/streamingrefagent/inc/sraserver.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/streamingrefagent/inc/srautils.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/streamingrefagent/source/client/sraclient.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/streamingrefagent/source/server/sraserver.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/streamingrefagent/source/server/srasession.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/RefTestAgent/streamingrefagent/source/utils/srautils.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/scripts/consumerstep.ini
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/scripts/drmfileperformance_armv5.script
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/scripts/managerstep.ini
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/scripts/nodrmcapsteps.script
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/CafUtilsStep.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/CafutilsStep.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/Consumerstep.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/Consumerstep.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/Contentstep.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/ManagerStep.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/ManagerStep.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/RecognizerStep.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/RecognizerStep.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/cafserver.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/cafstep.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/cafstep.h
diff -r f14a3bd1d491 -r c575b960b6c8 contentmgmt/referencedrmagent/tcaf/source/contentstep.h
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/group/ABLD.BAT
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/group/random.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/group/tcryptospi.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/inc/cryptotests.iby
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/inc/spi/cryptospidef.h
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/inc/tcryptospi.iby
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/source/bigint/stackinteger.h
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/source/spi/cryptospiutil.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/test/kms/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/test/tasymmetric/script_gen/keys.c
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/test/tasymmetric/script_gen/rsa_test.c
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/test/tcryptospi/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/test/tcryptospi/scripts/tcryptospi.script
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/test/tcryptospi/scripts/tcryptospi_v2.script
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/test/tcryptospi/src/dummyecccipherloadstep.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/test/tcryptospi/src/te_cryptospiconversion.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 crypto/weakcryptospi/test/tcryptospi/src/te_cryptospiserver.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/cryptotokenfw/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/cryptotokenfw/inc_interfaces/MCTKeyStoreManager_v2.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/cryptotokenfw/inc_interfaces/MCTKeyStore_v2.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/cryptotokenfw/inc_interfaces/mkeystore_v2.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitycommonutils/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitycommonutils/inc/cleanuputils.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitycommonutils/inc/ipcstream.inl
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitycommonutils/inc/securityutils.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitycommonutils/inc/streamingarray.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitycommonutils/inc/streamingarray.inl
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/group/t_testhandler2.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/inc/SecurityTests.iby
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/inc/cryptodeps.iby
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/test/autotesting/runcrypto_wmdrm.bat
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/test/autotesting/sdp_bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/test/autotesting/test_launcher.pl
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_sdp_auth.bat
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_sdp_newrom.bat
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/test/testhandler2/tScriptSetup.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/test/testhandler2/t_tefinput.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptomgmtlibs/securitytestfw/testcertificates/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoplugins/cryptospiplugins/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoplugins/cryptospiplugins/test/h4drv/crypto_h4/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/certstore/certclients.dat
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/certstore/certstore.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/certstore/unifiedkeystore.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/inc/unifiedkeystore_v2.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/inc/x509cert.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/tcertstore/T_unifiedcertstoreadd.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/tcertstore/readme first.txt
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/tcertstore/scripts/unifiedcertstore2-conf1.ini
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/tcertstore/scripts/unifiedcertstore2-conf1.script
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/tcertstore/t_filter.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/tcertstore/t_filter.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/inc/tpkcs12integrationserver.iby
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/tx509/comparisontest.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/tx509/extensiontest.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/certificateandkeymgmt/x509/x509cert.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/Inc/CFSTokenTypeClient.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/Inc/filetokens.iby
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/Inc/filetokenstests.iby
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/Inc/fsdatatypes.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/Inc/fsdatatypes.inl
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/Inc/keystore_errs.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/generic/client/clientsession.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/generic/common/fstokencliserv.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/generic/common/fstokenservername.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/generic/server/fsserver.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Client/cfskeystoreclient.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Client/cfskeystoreclient.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/CKeyDataManager.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/CKeyDataManager.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/CKeyStoreConduit.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/Cfskeystoreserver.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/Ckeystoreconduit.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/OpenedKeys.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/OpenedKeys.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/cfskeystoreserver.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystorecenrepconfig.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystorecenrepconfig.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystreamutils.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystreamutils.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.rls
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.rss
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool_usage.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/tkeystore/t_addkey.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/tkeystore/t_import.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/tkeystore/t_keystore.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/tkeystore/t_keystore_actions.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/tkeystore/t_keystore_actions.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/tkeystore/t_keystore_defs.h
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/tkeystore/t_open.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/tkeystore/tkeystore.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 cryptoservices/filebasedcertificateandkeystores/test/ttesttools/ttesttoolserver.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 package_definition.xml
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securityconfig/conf/securityconfig.confml
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securityconfig/conf/securityconfig_2002b28b.crml
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securityconfig/group/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securityconfig/tlsprovider/SWTLSTOKENTYPE.RLS
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securityconfig/tlsprovider/SWTLSTOKENTYPE.RSS
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securityconfig/tlsprovider/tlscachetimeouts.rh
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securityconfig/tlsprovider/tlscachetimeouts.rss
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securityconfig/tlsprovider/tlsproviderconfig.iby
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securityconfig/tlsprovider/tlsproviderpolicy.ini
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securityconfig/ups/romstub/bld.inf
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securityconfig/ups/romstub/buildstub.mak
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securitytools/certapp/encdec/certinfo.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securitytools/certapp/encdec/certinfo.h
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securitytools/certapp/encdec/filecertstore.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securitytools/certapp/encdec/x509utils.cpp
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securitytools/certapp/encdec/x509utils.h
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securitytools/certapp/group/certapp.mmp
diff -r f14a3bd1d491 -r c575b960b6c8 securityanddataprivacytools/securitytools/certapp/test/tcertapp/ucs2-bigendian.txt