--- a/authenticationservices/authenticationserver/group/bld.inf Fri Apr 16 16:52:34 2010 +0300
+++ b/authenticationservices/authenticationserver/group/bld.inf Mon May 03 14:11:52 2010 +0300
@@ -21,6 +21,8 @@
@file
*/
+#ifdef SYMBIAN_AUTH_SERVER
+
#include "../test/reftestplugin/group/bld.inf"
PRJ_PLATFORMS
@@ -155,4 +157,5 @@
../test/tAuthSvr/scripts/performance_log_parser.pl /epoc32/winscw/c/tauth/tauthsvr/scripts/performance_log_parser.pl
+#endif //SYMBIAN_AUTH_SERVER
--- a/crypto/weakcryptospi/inc/random.h Fri Apr 16 16:52:34 2010 +0300
+++ b/crypto/weakcryptospi/inc/random.h Mon May 03 14:11:52 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -140,11 +140,9 @@
*
* Implements the contract as specified in the base class, CRandom, filling the buffer
* supplied with random data up to its current length, discarding its current content.
- * It will leave with KErrNotSecure when the generated random data is not secure enough.
+ * It will leave under no memory condition.
*
- * @param aDest The buffer to which to write random data
- * @leave KErrNotSecure The generated random data is not secure enough for cryptographic operations
- * otherwise, leaves with any other system wide error codes.
+ * @param aDest The buffer to be filled with random data
*
*/
virtual void GenerateBytesL(TDes8& aDest);
--- a/crypto/weakcryptospi/source/random/random.cpp Fri Apr 16 16:52:34 2010 +0300
+++ b/crypto/weakcryptospi/source/random/random.cpp Mon May 03 14:11:52 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -56,8 +56,13 @@
void CSystemRandom::GenerateBytesL(TDes8& aDest)
{
- iShim->GenerateBytesL(aDest);
- }
+ TRAPD(error, iShim->GenerateBytesL(aDest));
+ // This method must leave on low memory conditions.
+ if(error == KErrNoMemory)
+ {
+ User::Leave(error);
+ }
+ }
CSystemRandom::CSystemRandom(void)
{
@@ -103,12 +108,7 @@
EXPORT_C void RRandomSession::ConnectL(void)
{
- // All of the ConnectL() code has moved to randomimpl.cpp
- // in the new CryptoSPI pluggable framework. This is just
- // a stub now that is retained for binary compatibility.
-
- // Method replaced by shim
- ASSERT(EFalse);
+ // No action required
}
EXPORT_C TInt RRandomSession::GetRandom(TDes8& aDestination)
--- a/cryptomgmtlibs/cryptotokenfw/docsrc/Framework.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,289 +0,0 @@
-/**
- @page page_cryptotoken_framework Cryptographic token framework
-
- @section cryptotokens_pas Purpose and scope
-This document specifies the APIs which we will define as specified in the Hurricane Security Framework Functional Specification [1].
-
-This document assumes familiarity with the functional specification.
-
-The API definitions are organised into 4 sections:
-- @ref ct
-- @ref interfaces
-- @ref secdlg
-- @ref Securitydefs
-
-In addition, a guide to writing tokens is provided: @ref cryptotokens_Writing
-
-And a guide to the use of reference counting:@ref cryptotokens_refcount
-
-@section cryptotokens_notes General Notes
-
-- Clients of the Crypto Token Framework must use an active
- scheduler. Crypto tokens may assume that an active scheduler is
- present.
-
- @subsection cryptotokens_refs References
-All Documents can be found in <code>\\\\Londata04\\Psisoft\\Dev\\GT\\0128 Hurricane WAP</code> unless otherwise stated.
-
--# Hurricane Security Framework Functional Specification, "HSF FS.doc"
--# Certificate Management(Hurricane) Functional Specification
-
-@section cryptotokens_tsecdlg The dummy security dialog notifier
-
-See @ref cryptotokens_TSecdlg
-
-@section cryptotokens_revs Revision History
-<TABLE>
-<TR><TD>Date </TD><TD>Version </TD><TD>Status </TD><TD>Description</TD></TR>
-<TR><TD>25-10-2001 </TD><TD>0.01 </TD><TD>DRAFTversion </TD><TD>First draftversion</TD></TR>
-<TR><TD>31-10-2001 </TD><TD>0.02 </TD><TD>DRAFTversion </TD><TD>Updated after review</TD></TR>
-<TR><TD>15-11-2001 </TD><TD>0.03 </TD><TD>DRAFTversion </TD><TD>Updated following small changes after actual implementation</TD></TR>
-<TR><TD>23-11-2001 </TD><TD>0.04 </TD><TD>DRAFTversion </TD><TD>Changes to Security Dialog API - dropped Sign in favour of EstablishSecureConnection</TD></TR>
-<TR><TD>21-12-2001 </TD><TD>1.00 </TD><TD>ISSUED </TD><TD>Issued</TD></TR>
-<TR><TD>02-01-2002 </TD><TD>1.01 </TD><TD>PROPOSED </TD><TD>Extended, converted to Doxygen format and updated to reflect current APIs</TD></TR>
-<TR><TD>18-03-2002 </TD><TD>2.00 </TD><TD>ISSUED </TD><TD>Minor updates</TD></TR>
-</TABLE>
-
-
-
- */
-/**
- @page cryptotokens_Writing Writing a token type
-
- A token type is an ECom plugin that represents a particular
- implementation of cryptographic functions, for instance a WIM or a
- particular file-based certificate store.
-
- The process of writing one can be divided into the following steps:
-
- @ref cryptotokens_UIDs
-
- @ref cryptotokens_Framework
-
- @ref cryptotokens_Resource
-
- @ref cryptotokens_TokenType
-
- @ref cryptotokens_TokenInfo
-
- @ref cryptotokens_Token
-
- @ref cryptotokens_Interfaces
-
- */
-/**
- @page cryptotokens_UIDs Understanding the use of UIDs in the framework
-
- Lots of different things are associated with UIDs. It's important
- to understand what they all are.
-
- The Token Type base class is an Interface as far as ECom is
- concerned, and has a UID to identify it. This UID is defined by the
- framework, and there's a define for it, CT_INTERFACE_UID. All you
- need to do with this UID is put it in the right place in the
- resource file.
-
- Each DLL has a UID, just like normal. Your DLL will need one. ECom
- requires your resource file to be named after the UID of the DLL.
-
- Each Token Type has a UID. It is possible (but unusual) to have several token
- types in 1 DLL, which is why they each need a UID to identify them.
-
- Each interface and attribute also has a UID to identify
- them. Normaly the interfaces and attributes will have been defined
- as part of the framework, so there will be defines for these
- values.
-
- Next: @ref cryptotokens_Framework
- Previous: @ref cryptotokens_Writing
-
- */
-/**
- @page cryptotokens_Resource Writing the resource file.
-
- The resouce file generaly follows the ordinary format of an ECom
- resource file. It must be named after the UID of the
- implementation. The match data is interpreted as a list of UIDs of
- supported interfaces. The Opaque data contains the attributes,
- which are represented as pairs of UIDs and 4 byte values.
-
- Due to limitations in the format of ECom resource files, these
- resources must be specified as a list of bytes, with the LSB being
- first in each word of 4 bytes. An example is probably needed:
- @code
-// 101F4E4e.RSS
-//
-
-// This header file contains all the defines you need.
-#include "ct/CryptoTokenRegistryInfo.rh"
-RESOURCE REGISTRY_INFO theInfo
- {
- // This is the UID of the DLL, and also the name of this file.
- dll_uid = 0x101F4E4e;
- interfaces =
- {
- INTERFACE_INFO
- {
- // This is the ECom interface ID of all CT Token types
- interface_uid = CT_INTERFACE_UID;
- implementations =
- {
- BINARY_IMPLEMENTATION_INFO
- {
- implementation_uid = 0x101f4e4c; // UID of the token type
- version_no = 1; // Version number of this token type
- display_name = "Test Token Type 6"; // Human-readable name
- // Supported interfaces:
- default_data = {0x50, 0x4e, 0x1f, 0x10, // UID 0x101f4e50
- 0x51, 0x4e, 0x1f, 0x10, // UID 0x101f4e51
- 0x52, 0x4e, 0x1f, 0x10};// UID 0x101f4e52
- opaque_data = { 0x4b, 0x4e, 0x1f, 0x10, // attr 2 UID 0x101f4e4b
- 0x02, 0x00, 0x00, 0x00, // attr 2 value (2)
- 0x4a, 0x4e, 0x1f, 0x10, // attr 1 UID 0x101f4e4a
- 0x01, 0x00, 0x00, 0x00};// attr 1 value (1)
- }
-
- };
- }
- };
- }
-
- @endcode
-
- Next: @ref cryptotokens_TokenType
- Previous: @ref cryptotokens_Resource
-
-
- */
-/**
- @page cryptotokens_Framework Writing the framework of the DLL and static classes.
-
- The DLL must be built with the target type ECOMIIC. This is an
- example of a simple mmp file for a token type DLL:
- @code
-TARGET TestPlugin.dll
-TARGETTYPE ECOMIIC
-
-// ECom Dll recognition UID followed by the unique UID for this dll
-UID 0x10009D8D 0x101F4E4E
-
-SOURCEPATH .
-SOURCE TestPlugin.cpp
-
-SYSTEMINCLUDE \epoc32\include \epoc32\include\ecom
-
-RESOURCE 101F4E4E.rss
-
-LIBRARY euser.lib
-LIBRARY ctframework.lib
- @endcode
-
- The DLL will need an E32Dll function, like any other SymbianOS
- DLL. For instance, in most cases it can look like this:
- @code
-GLDEF_C TInt E32Dll(TDllReason)
- {
- return ETrue;
- }
- @endcode
-
- Then a standard ECom ImplementationTable and
- ImplementationGroupProxy function is needed. Assuming your plugin
- has 1 token type in, it'll look something like this:
- @code
-// An array listing the NewL functions of all the plugins. In this
-// case, there is only 1. The UID of the token type is 0x101F4E4D.
-const TImplementationProxy ImplementationTable[] =
- {
- {{0x101F4E4D}, CTokenTypeImplementation::NewL},
- };
-
-// This function is needed by ECom. It will probably always look like this.
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
- {
- aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
- return ImplementationTable;
- }
- @endcode
-
- Next: @ref cryptotokens_Resource
- Previous: @ref cryptotokens_UIDs
-
- */
-/**
- @page cryptotokens_TokenType Writing the Token Type class
-
- The token type class needs to implement the CTokenType
- interface. This means it needs to return a list of CTokenInfo
- objects representing every token available, and to open a token
- based on a CTokenInfo object.
-
- Both the listing of the token infos and opening tokens are
- asynchronous as they may need to talk to slow external tokens such
- as WIMs.
-
- Next: @ref cryptotokens_TokenInfo
- Previous: @ref cryptotokens_Resource
-
-
- */
-/**
- @page cryptotokens_TokenInfo Writing the Token Info class
-
- By default, the CTokenInfo contains just a label, which allows the
- user to identify which token they want to use. You can add other
- data to allow you to identify which token it refers to. If your
- token type only supports 1 token, this class will be very trivial.
-
- Next: @ref cryptotokens_Token
- Previous: @ref cryptotokens_TokenType
-
- */
-/**
- @page cryptotokens_Token Writing the Token class
-
- The token is a subclass of MCTToken. You must define the functions
- to create interfaces, and the release function. The client must
- call Release once when it has finished with the token. In addition,
- you may wish to implement a reference counting mechanism so that
- the token object is held open until the Release functions in the
- interfaces are called.
-
- The token will almost certainly need a pointer to the token type,
- and the interfaces to the token.
-
- Next: @ref cryptotokens_Interfaces
- Previous: @ref cryptotokens_TokenInfo
-
- */
-/**
- @page cryptotokens_Interfaces Implementing the interfaces
-
- You now need to implement the interfaces that your token
- supports. How to do this is described in the documentation for each
- interface.
-
- Contents: @ref cryptotokens_Writing
-
-*/
-/** @page cryptotokens_refcount The Use of Reference Counting in the framework
-The token type counts active references to it. When it is created its reference count is set to 1. Each time it constructs and returns a token it increments its reference count. Its Release decrements the reference count: if the result is zero the token type resources are freed.
-
-The token counts active references to it. When it is created its reference count is set to 1. Each time it constructs and returns an interface it increments its reference count. Its Release() decrements the reference count: if the result is zero the token's own resources are freed, and the token calls TokenType().Release(), to signal that it no longer needs the token.
-
-The token interface base class implements its Release() function by calling its DoRelease() function to free its own resources, then calling Token().Release() to signal to the token that it no longer needs it.
-
-This enables application code to create a token type, use it to create a token, then release the token type, then use the token to create an interface, then release the token; it can then, for example, pass the interface to another object without needing to worry about the fate of the token type, or the token.
-
-The sequence diagram below shows the operation of the reference counting.
-
-- the application creates a token type, whose reference count is set to 1 (1&2)
-- the application uses the token type to create two tokens A and B: each token is created with a reference count of one, and the token type's reference count is incremented each time (7&11) so is now 3
-- the application releases the token type, so its reference count is decremented (11 & 12)
-- the application opens two interfaces implemented on token A (interfaces 1 & 2); each time the token's reference count is incremented, so is now 3 (14-17)
-- the application releases token A, so its reference count is decremented to 2 (18-19)
-- this process is repeated for token B (20-28): now we have 1 token type which has generated 2 tokens, each of which has generated 2 interfaces, which hold the only handles to the interfaces. The application can now forget about the ownership of the token types and tokens.
-- when the application has finished with the interfaces it releases them. When each interface is released it releases the token hosting it, which decrements the reference count. When all the interfaces hosted by a token have released the token the reference count is zero and the token cleans up its own resources and releases the token type When both tokens have released the token type its own reference count is zero, so it frees its own resources.
-@image html sequence.bmp "Reference Counting Sequence Diagram"
-*/
Binary file cryptomgmtlibs/cryptotokenfw/docsrc/sequence.bmp has changed
--- a/cryptomgmtlibs/cryptotokenfw/docsrc/tsecdlg.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-/**
-
-@page cryptotokens_TSecdlg tsecdlg - The dummy security dialog notifier
-
-@section tsecdlg_intro Introduction
-
-This document describes tsecdlg, the dummy security dialog notifier.
-
-The security dialog API provides a way for components to ask the user various
-standard security-related questions. For example, it contains methods to prompt
-the user to enter a passphrase, among others. The API is defined in the file
-secdlg.h.
-
-It is necessary to write test harnesses for clients of this API which can be run
-unattended, without user intervention. To achieve this, tsecdlg was developed.
-It allows user responses to security dialogs to be pre-defined, and enables a
-test harness to check that the expected dialogs would have been displayed to the
-user.
-
-@section tsecdlg_secdlg_implementation Security dialog implementation
-
-The dialogs that the user sees cannot be implemented as part of the security
-subsystem because they form part of the user interface layer. So the security
-dialog API passes client requests to the security dialog notifier. This is a
-type of plugin, and is typically supplied by the UI implementation - for example
-by techview. The protocol used to pass messages to and from the plugin is
-defined in the file secDlgImplDefs.h.
-
-tsecdlg is just an implementation of the security dialog notifier that doesn't
-ask the user for information. Instead it either gives default responses or
-reads them from a file.
-
-@section tsecdlg_when_to_use_tsecdlg When it's necessary to use tsecdlg
-
-Any test that directly or indirectly uses the security dialog API will require
-the use of tsecdlg if the tests are to be run unattended. At the moment, the
-keystore is the main client of this API. The keystore tests rely heavily on
-tsecdlg, and anything that uses keystore will probably need to use it as well -
-for example TLS.
-
-<hr>
-
-@section tsecdlg_preparation Preparation for running tests that use tsecdlg
-
-@section tsecdlg_building_tsecdlg Building tsecdlg
-
-Two versions of tsecdlg are built on all platforms - one for the extended
-notifier framework (ie graphical notifiers, or techview) and one for textshell.
-This means that tests will work in both environments.
-
-To build tsecdlg just requires building the test code supplied in the
-security cryptotokens component, eg:
-
-\code
-cd common\generic\security\cryptotokens\group
-bldmake bldfiles
-abld test build wins udeb
-\endcode
-
-There are two tsecdlg components:
-
-<table>
-<tr><th>Name</th><th>Location</th><th>Description</th></tr>
-<tr><td>t_secdlg</td><td>z:\\system\\notifiers\\tsecdlg.dll</td><td>Extended notifier</td></tr>
-<tr><td>t_secdlg_text</td><td>z:\\system\\tnotifiers\\tsecdlg_text.dll</td><td>Textshell notifier</td></tr>
-</table>
-
-@section tsecdlg_emulator_testing Testing on the emulator
-
-If you are running in techview mode, you must ensure that the techview
-implementation of the security dialog notifier (secdlg.dll) is not present (if
-both secldg.dll and tsecdlg.dll are present, epoc will crash). This can be
-found in in z:\\system\\notifiers, for example
-\\epoc32\\release\\wins\\udeb\\z\\system\\notifiers for wins udeb. The easiest
-way to ensure secdlg.dll is removed is to use the following command:
-
-\code
-del /s /f /q \epoc32\secdlg.dll
-\endcode
-
-This does not matter for textshell mode, because there is no default textshell
-security dialog plugin.
-
-@section tsecdlg_hardware_testing Testing on hardware
-
-To test on hardware, the appropriate dll (either techview or textshell) must be
-included in the ROM in the same location as it is in the emulator (ie
-z:\\system\\notifiers for techview mode). This can be done adding the following
-line to an iby file:
-
-\code
-file=ABI_DIR\BUILD_DIR\tsecdlg.dll System\Notifiers\tsecdlg.dll
-\endcode
-
-This is done for security tests in the file filetokenstests.iby.
-
-Note that if you are using techview mode, you must ensure that secdlg.dll is not
-included - you must edit \\epoc32\\rom\\include\\secui.iby and comment out the
-following line:
-
-\code
-file=ABI_DIR\BUILD_DIR\secdlg.dll System\Notifiers\Secdlg.dll
-\endcode
-
-<hr>
-
-@section tsecdlg_cryptotokens_operation tsecdlg operation
-
-tsecdlg has two modes of operation:
-
-@li Default mode
-@li Scripted mode
-
-@section tsecdlg_default_mode Default mode
-
-This is the simpler mode. Whenever the dialog for a passphrase is triggered,
-tsecdlg replies with a default passphrase ('pinkcloud').
-
-This is intended to used by test code that is not directly testing a client of
-the security dialog API, for example by TLS.
-
-tsecdlg runs in this mode when the files c:\\t_secdlg_in.dat and
-c:\\t_secdlg_out.dat are not present.
-
-@section tsecdlg_scripted_mode Scripted mode
-
-This mode is more complex, and is intended to be used by for testing direct
-clients of the security dialog API - for example the keystore.
-
-Before a test is run, a file of expected dialogs and the required responses is
-prepared. Every time the security dialog API is called and tsecdlg invoked, it
-checks that the requested dialog is the one expected, and answers with the
-pre-determined response. An unexpected dialog request produces an error. A
-file containing the number of correctly answered dialog requests is maintained
-and this allows the test harness to determine whether all expected dialogs were
-triggered correctly.
-
-The list of expected dialogs is read from c:\\t_secdlg_in.dat. This has the
-following format:
-
-<table>
-<tr><th>Type</th><th>Description</th></th>
-<tr><td>TInt32</td><td>Number of dialogs expected</td></tr>
-</table>
-
-Then, for every expected dialog, the following data is present. Strings are
-represented with their size (TInt32) followed by that many bytes of data.
-
-<table>
-<tr><th>Type</th><th>Description</th></tr>
-<tr><td>TInt32</td><td>Expected operation</td></tr>
-<tr><td>String</td><td>Expected label</td></tr>
-<tr><td>String</td><td>Response 1</td></tr>
-<tr><td>String</td><td>Response 2 (not always used)</td></tr>
-</table>
-
-The expected operation should be a member of the TSecurityDialogOperation
-enumeration - this specifies the expected type of dialog that is requested (for
-example, the enter passphrase dialog). If the requested operation is not the
-same as this, the operation is completed with KErrOperationMismatch. If the
-operation is one that is not supported by tsecdlg (only the ones necessary for
-testing keystore are currently implemented), the operation is completed with
-KErrOperationNotSupported.
-
-The expected label allows the test code to specify the label passed to the API.
-It is matched if the actual label contains the expected label - this means that
-passing an empty string will always ensure a match. If the expected label is
-not matched, the operation is completed with KErrLabelMismatch.
-
-The responses are the information tsecdlg passes back as if from the user. Some
-operations (eg change PIN) return two pieces of information, but for the most
-part only the first one is used.
-
-The error codes are summarised below. Note that as this is test code, these are
-not officially allocated!
-
-<table>
-<tr><th>Name</th><th>Code</th><th>Description</th></tr>
-<tr><td>KErrTooManyDialogs</td><td>-12000</td><td>More dialogs have been requested than are described in the input file</td></tr>
-<tr><td>KErrLabelMismatch</td><td>-12001</td><td>The label requested did not match the expected value</td></tr>
-<tr><td>KErrOperationMismatch</td><td>-12002</td><td>The operation requested did not match the expected value</td></tr>
-<tr><td>KErrOperationNotSupported</td><td>-12003</td><td>The operation requested is not implemented by tsecdlg</td></tr>
-</table>
-
-Every time a request is succesfully answered, the file c:\\t_secdlg_out.dat is
-updated - it contains a single TInt32 that indicates the index of the current
-dialog in the list of expected dialogs described by c:\\t_secdlg_in.dat. If it
-is not present, its value is assumed to be zero.
-
-*/
--- a/cryptomgmtlibs/cryptotokenfw/inc_interfaces/doxygen_docs/Crypto_Interfaces_index.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-/**
-@page page_cryptoInterfaces Cryptographic interfaces
-
-Welcome to Cryptographic Interfaces
-
-@li Authentication object management interface
-@li Certificate storage interface
-@li Key storage interface
-
-
-*/
\ No newline at end of file
--- a/cryptomgmtlibs/cryptotokenfw/source/ctframework/doxygen_docs/Key_management_index.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-/**
-
-@page mainpage_key_management Key Management
-
-*/
\ No newline at end of file
--- a/cryptomgmtlibs/securitydocs/Security_Glossary.html Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,718 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Security Glossary</TITLE>
-</HEAD>
-<BODY>
-
-<H1><CENTER><b>Security Glossary</b></CENTER></H1>
-
-<P><center><TABLE WIDTH="90%" BORDER="1" CELLSPACING="1" CELLPADDING="2"><TR
-HEIGHT=0>
-<TD WIDTH="25%"></TD><TD WIDTH="75%"></TD></TD>
-</TR>
-
-<TR>
-<TD>
-Security Classification
-</td>
-<td>
-Internal
-</td>
-</tr>
-
-<TR>
-<TD>
-Document Reference
-</td>
-<td>
-SGL.GT0128.56
-</td>
-</tr>
-
-<TR>
-<TD>
-Status
-</td>
-<td>
-Draftversion
-</td>
-</tr>
-
-<TR>
-<TD>
-Version
-</td>
-<td>
-0.1
-</td>
-</tr>
-
-<TR>
-<TD>
-Team/Department
-</td>
-<td>
-Security Team
-</td>
-</tr>
-
-<TR>
-<TD>
-Author
-</td>
-<td>
-William Bamberg
-</td>
-</tr>
-
-<TR>
-<TD>
-Owner
-</td>
-<td>
-Security Team
-</td>
-</tr>
-
-<TR HEIGHT=0><TD WIDTH="35%"></TD><TD
-WIDTH="65%"></TD></TR></TABLE></P></center>
-
-<P><center><TABLE WIDTH="90%" BORDER="1" CELLSPACING="1" CELLPADDING="2"><TR
-HEIGHT=0>
-<TD WIDTH="25%"></TD><TD WIDTH="75%"></TD></TD>
-</TR>
-
-<TR>
-<TD>
-<A name="Asymmetric Cryptography"></A>Asymmetric Cryptography
-</td>
-<td>
-A form of cryptography in which the 'key' is generated as a key pair: if one key is used for encryption
-only the other can be used to decrypt, and vice versa.
-<p>
-Using asymmetric cryptography, the problem of key distribution becomes one of authentication; i.e. how to make sure
-that a given key really does belong to the entity that claims to own it.
-</td>
-</tr>
-
-<TR>
-<TD>
-Attribute Certificate
-</td>
-<td>
-A digitally signed data structure including at least an identifier for an individual entity
-and a set of attributes, whose function is to bind the entity with the attributes, usually for the
-purpose of authorisation.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Authentication"></A>Authentication
-</td>
-<td>
-Usually used to refer to a property of a communication; that the receiver of a message is able to ascertain its origin,
-so an attacker cannot successfully impersonate the sender.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Block Cipher"></A>Block Cipher
-</td>
-<td>
-A class of <A HREF="#Symmetric Cryptography">symmetric algorithm</A> in which several bits of the input data
-are encrypted at once in a fixed-size block.
-The cipher and its mode of operation define the block size:
-the plaintext is split up into appropriately-sized blocks and each block is fed into the cipher.
-</td>
-</tr>
-
-<TR>
-<TD>
-CA Certificate
-</td>
-<td>
-A certificate held by a <A HREF="#Certification Authority">CA</A>: the key pair associated with it is used for
-signing certificates issued by that CA. May or may not be self-signed.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Certificate"></A>Certificate
-</td>
-<td>
-For our purposes, this is the same thing as a <A HREF="#Public Key Certificate">
-public key certificate</A>
-</td>
-</tr>
-
-<TR>
-<TD><A name="Certification Authority"></A>Certification Authority (CA)
-</td>
-<td>
-An organization which perform the following functions in a hierachical <A HREF="#Public Key Infrastructure">PKI</A>:
-<ul>
-<li>
-providing trusted ‘root’ certificates to users (<A HREF="#End Entities">End Entities</A>), by
-supplying them with the CA’s public key via out-of-band means.
-</li>
-<li>
-certifying End Entities by generating and distributing certificates for them.
-The certified EE is the subject of the certificate: the CA is the issuer.
-</li>
-<li>
-supporting certificate <A HREF="#Revocation">revocation</A> and revocation checking: if an EE suspects that their key has
-been compromised, they contact the CA which issued it, who should revoke their certificate.
-</li>
-</ul>
-<p>A CA will always have a root certificate-signing key pair, which must be authenticated to End Entities via
-out of band channels. This key pair is not logically certified by anything, but it is usually distributed inside
-a <A HREF="#Self-signed Certificate">self-signed certificate</A> to afford some degree of <A HREF="#Tamper Evidency">tamper evidency</A>.
-<p>However, CAs do not have to use their root key pair to issue certificates directly to End Entities. For organizational
-reasons and to reduce the exposure of keys, a CA may have a single root signing key pair, which it uses to certify a
-set of subordinate key pairs, which in turn are used to certify End Entities. Also, CAs may certify the
-signing keys of other CAs by issuing <A HREF="#Cross Certificate">cross certificates</A>, which enable interoperation
-between two distinct PKIs.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Ciphertext"></A>Ciphertext
-</td>
-<td>
-The output of an <A HREF="#Encryption">encryption</A> operation, or
-the input to a <A HREF="#Decryption">decryption</A> operation.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Client Authentication"></A>Client Authentication
-</td>
-<td>
-In a secure client-server protocol such as <A HREF="#Transport Layer Security">TLS</A>, the process in which the client
-<A HREF="#Authentication">authenticates</A> itself to the server, so the server knows who it's talking to.
-</td>
-</tr>
-
-<TR>
-<TD>
-Client/User/End Entity Certificate
-</td>
-<td>
-A <A HREF="#Certificate">certificate</A> issued by a <A HREF="#Certification Authority">CA</A> to an
-<A HREF="#End Entity">end entity</A> (for example the user of a WID) who may use it
-to demonstrate their ownership of the key pair associated with it
-</td>
-</tr>
-
-
-<TR>
-<TD>
-<A name="Cross Certificate"></A>Cross Certificate
-</td>
-<td>
-A <A HREF="#Certificate">certificate</A> issued by a <A HREF="#Certification Authority">CA</A> which certificates another
-CA's <A HREF="#Root Certificate">root certificate</A>. This is way of uniting two distinct certification hierarchies.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Decryption"></A>Decryption
-</td>
-<td>
-The process of turning encrypted data (called ciphertext) into the original information (called plaintext)
-using a cryptographic algorithm parameterised with a key.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Digital Signature"></A>Digital Signature
-</td>
-<td>
-A structure linking some data and a private key. A digital signature may be generated by the application of a
-<A HREF="#Private Key">private key</A> to some piece of data. The original data
-may be reconstructed by applying the corresponding public key, demonstrating that the signature could only have been generated by
-someone with access to the private key.
-<p>Digital signatures have two primary uses: to demonstrate someone's identity by signing some challenge, as in
-<A HREF="#Client Authentication">client authentication</A> in <A HREF="#Transport Layer Security">TLS</A>, in which the client
-signs a <A HREF="#Hash">hash</A> of the messages that have been exchanged, and more strongly, for someone to demonstrate their
-acceptance of some human-processable information (e.g. 'Please withdraw £10 000 from my bank account') as in the
-<A HREF="#WMLScript Crypto API">WMLScript Crypto API</A> <A HREF="#SignText">SignText</A> function.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="DSA"></A>Digital Signature Algorithm (DSA)
-</td>
-<td>
-NIST-approved <A HREF="#Asymmetric Cryptography">asymmetric algorithm</A>. It can only be used for generating and
-verifying <A HREF="#Digital Signature">digital signatures</A>, not for encryption.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="ECC"></A>Elliptic Curve Cryptography (ECC)
-</td>
-<td>
-Elliptical curve cryptography (ECC) is an <A HREF="#Asymmetric Cryptography">asymmetric algorithm</A>
- based on elliptic curve theory that can be used to create faster, smaller, and more efficient cryptographic keys.
-Because ECC helps to establish equivalent security with lower computing power and battery resource usage,
-it is becoming widely used for mobile applications.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Encryption"></A>Encryption
-</td>
-<td>
-The process of turning meaningful data (called plaintext) into meaningless gibberish (called ciphertext)
-using a cryptographic algorithm parameterised with a key.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="End Entity"></A>End Entity
-</td>
-<td>
-A leaf node in a certification hierarchy: any entity in a <A HREF="#Public Key Infrastructure">PKI</A>
-which has a certificate, but is not allowed to issue its own certificates.
-</td>
-</tr>
-
-
-<TR>
-<TD>
-<A name="Hash"></A>Hash
-</td>
-<td>
-Hash algorithms take a variable-length input and produce a fixed length output known as a digest, or hash, of the input.
-For cryptographic purposes they need to be one-way functions:
-it should not be possible to deduce the input from the digest, or even any part of the input.
- Also, it should be hard to find collisions: that is, two different inputs which produce the same output.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="HMAC"></A>HMAC
-</td>
-<td>
-Keyed-Hashing for Message Authentication. A mechanism for message authentication using cryptographic
-<A HREF="#Hash">hashes</A>. It can be used with any iterative cryptographic
-hash function, e.g., <A HREF="#MD5">MD5</A>, <A HREF="#SHA-1">SHA-1</A>, in combination with a secret shared key.
-The cryptographic strength of HMAC depends on the properties of the underlying hash function.
-</td>
-</tr>
-
-<TR>
-<TD>
-ICC
-</td>
-<td>
-Integrated Circuit Card: removable card with at least data storage and sometimes processing
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="IPSec"></A>IPSec
-</td>
-<td>
-A standard providing <A HREF="#Secrecy">secrecy</A> and <A HREF="#Authentication">authentication</A> at the network or
-packet-processing layer of network communication. Earlier security approaches have inserted security at the
-application layer of the communications model. IPsec will be especially useful for implementing virtual
-private networks and for remote user access through dial-up connection to private networks. IPSec is mandatory in IPv6.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="MD2"></A>MD2
-</td>
-<td>
-Legacy <A HREF="#Hash">hash algorithm</A>. Considered insecure.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="MD5"></A>MD5
-</td>
-<td>
-Legacy <A HREF="#Hash">hash algorithm</A>. Considered vulnerable.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Message Digest Algorithm"></A>Message Digest Algorithm
-</td>
-<td>
-Same thing as a <A HREF="#Hash">hash algorithm</A>.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Nonrepudiation"></A>Nonrepudiation
-</td>
-<td>
-The process by which it is assured that an entity making a declaration cannot subsequently deny having made it:
-so I can't claim that I never wrote that cheque.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="OCSP"></A>Online Certificate Status Protocol (OCSP)
-</td>
-<td>
-A protocol enabling a <A HREF="#Relying Party">relying party</A> to check that a
-<A HREF="#Certificate">certificate</A> has not been <A HREF="#Revocation">revoked</A>. In this protocol the OCSP client
-asks the OCSP server about the status of one or more certificates, and receives a
-<A HREF="#Digital Signature">digitally signed</A> response.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Out Of Band"></A>Out Of Band
-</td>
-<td>
-A channel of communication which is distinct from the channel which we are using cryptography to try to secure,
-and which is secure on its own terms; that is, its security is not dependent on the cryptography we are using.
-<p>A common example of an out of band channel is a motorcycle courier.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Padding"></A>Padding
-</td>
-<td>
-The process of adding bytes to the input to a <A HREF="#Block Cipher">block cipher</A> so that the input matches the
-block size.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Plaintext"></A>Plaintext
-</td>
-<td>
-The output of an <A HREF="#Decryption">decryption</A> operation, or
-the input to a <A HREF="#Encryption">encryption</A> operation.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="PGP"></A>Pretty Good Privacy (PGP)
-</td>
-<td>
-A very widely-used <A HREF="#Encryption">encryption</A> and <A HREF="#Digital Signature">digital signing</A>
-program.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Private Key"></A>Private Key
-</td>
-<td>
-In the context of <A HREF="#Public Key Cryptography">public key cryptography</A>, the private half of the key pair.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Public Key"></A>Public Key
-</td>
-<td>
-In the context of <A HREF="#Public Key Cryptography">public key cryptography</A>, the public half of the key pair.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Public Key Certificate"></A>Public Key Certificate
-</td>
-<td>
-A digitally signed structure including at least an identifier for an
-individual entity and a public key, whose function is to bind the entity with the key.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Public Key Cryptography"></A>Public Key Cryptography
-</td>
-<td>
-A common application of <A HREF="#Asymmetric Cryptography">asymmetric cryptography</A> in which one half of the key pair is
-kept secrect (the <A HREF="#Private Key">private key</A>) and the other half is published
-(the <A HREF="#Public Key">public key</A>.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Public Key Infrastructure"></A>Public Key Infrastructure
-</td>
-<td>
-
-<p>A way of modelling real-world trust relationships which enables users of <A HREF="#Public Key Cryptography">public key cryptography</A>
-to have confidence in the ownership of
-the public keys they are using.
-
-A PKI consists of:
-<ul>
-<li>
-a <A HREF="#Trusted Third Party">trusted third party</a>
-</li>
-<li>
-an <A HREF="#Out Of Band">out of band</A> means of distributing the TTP's <A HREF="#Public Key Certificate">public key certificate</A>
-to <A HREF="#Relying Party">relying parties</a>
-</li>
-<li>
-a means of distributing other certificates to relying parties
-</li>
-<li>
-arrangements for the <A HREF="#Revocation">revocation</A> and renewal of these certificates
-</li>
-<li>
-certificate management and validation software on the relying party's computer
-</li>
-</ul>
-<p>The TTP uses its signing key pair to create certificates for other entities, which relying parties can use to authenticate these
-other entities.
-<p>We can classify PKIs according to whether they are hierachical or flat. In hierachical PKIs, such as the one defined in the <A HREF="#PKIX">PKIX</A>
-set of standards, there is a distinction between users of the PKI such as <A HREF="#End Entity">End Entities</A> and
-<A HREF="#Relying Party">Relying Parties</A>, and entities responsible for issuing and distributing certificates such as
-<A HREF="#Certification Authority">CAs</A> and <A HREF="#Registration Authority">RAs</A>. In a flat PKI such as the
-<A HREF="#Web of Trust">web of trust</A> underpinning <A HREF="#Pretty Good Privacy">PGP</A>, there are no entities whose
-sole role is to issue certificates; instead users of the PKI certify each other.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Registration Authority"></A>Registration Authority
-</td>
-<td>
-An organization responsible for registering new certificate users in a
-<A HREF="#Public Key Infrastructure">PKI</A>, e.g. by gathering and verifying information which identifies the
-certificate applicant.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Revocation"></A>Revocation
-</td>
-<td>
-The term used for asserting that a certificate is no longer valid: for example, because the private key
-associated with it has been compromised.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Relying Party"></A>Relying Party
-</td>
-<td>
-An entity who relies on the authenticity of a <A HREF="#Public Key">public key</a>.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Root Certificate"></A>Root Certificate
-</td>
-<td>
-The certificate of a <A HREF="#Trusted Third Party">trusted third party</a>.
-A certificate directly trusted by a <A HREF="#Relying Party">relying party</A>: that is, trust in it is not
-established by cryptographic means, but trust in it is the prerequisite for establishing trust in the entity
-which the relying party is trying to authenticate.
-Trust in a root certificate must be established through <A HREF="#Out Of Band">out of band</A> means. A root certificate may or may not be self signed.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Secrecy"></A>Secrecy
-</td>
-<td>
-This means that access to information is controlled: for example, it means that two entities
-(e.g. people, machines, processes) are able to communicate with one another without any other entities
-being able to access the information communicated, or that an entity may store some information and be
-assured that only this entity will be able to access it.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="SHA-1"></A>Secure Hash Algorithm 1(SHA-1)
-</td>
-<td>
-A widely used <A HREF="#Hash">hash algorithm</a>, producing a 160-bit digest.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="SSL"></A>Secure Sockets Layer (SSL)
-</td>
-<td>
-Precursor to <A HREF="#Transport Layer Security">TLS</a>. SSL has been through three versions:
-the first two are considered insecure, and the third is almost identical to TLS.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Server Authentication"></A>Server Authentication
-</td>
-<td>
-In a secure client-server protocol such as <A HREF="#Transport Layer Security">TLS</A>, the process in which the server
-<A HREF="#Authentication">authenticates</A> itself to the client, so the client knows who it's talking to.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="SignText"></A>SignText
-</td>
-<td>
-A function defined in the <A HREF="#WMLScript Crypto API">WMLScript Crypto API</A> which provides application-level
-<A HREF="#Authentication">Authentication</A> and <A HREF="#Nonrepudiation">Nonrepudiation</A> for transactions.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Stream Cipher"></A>Stream Cipher
-</td>
-<td>
-A class of <A HREF="#Symmetric Cryptography">symmetric algorithm</A> which is initialised with a key,
-then outputs a stream of pseudorandom bits.
-This 'keystream' is typically XOR-ed with the plaintext to generate the ciphertext.
-So they encrypt a bit of plaintext at a time.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Symmetric Cryptography"></A>Symmetric Cryptography
-</td>
-<td>
-A form of cryptography in which the same key is used for encryption and decryption
-<p>
-Symmetric cryptography is fast, but suffers from the problem of how to distribute the key privately.
-<A HREF="#Asymmetric Cryptography">Asymmetric cryptography</a> is an attempt to alleviate the key
-distribution problem, by reducing the requirement for the distributed key from one of privacy to one of
-authentication.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Transport Layer Security"></A>Transport Layer Security (TLS)
-</td>
-<td>
-A client-server security protocol providing <A HREF="#Secrecy">secrecy</a> and optionally <A HREF="#Authentication">authentication</a>, and
-running over TCP/IP.
-<p>In this protocol a client connects to a server; the two then perform a handshake in which they exchange a
-<A HREF="#Symmetric Cryptography">symmetric</a> key by using <A HREF="#Asymmetric Cryptography">asymmetric cryptography</a>,
-which is then used to encrypt their communications, providing the secrecy element.
-<p>Without the authentication element secrecy is not very useful; although only client and server can understand the data
-exchanged, the client doesn't know who the server is or vice versa. TLS provides the capability for
-<A HREF="#Server Authentication">server authentication</a>, in which the client establishes who the server is, and
-<A HREF="#Client Authentication">client authentication</a> in which the server establishes who the client is.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Trusted Third Party"></A>Trusted Third Party (TTP)
-</td>
-<td>
-An entity whose public key is known to a <A HREF="#Relying Party">relying party</a> due to its having been
-received via <A HREF="#Out Of Band">out of band</A> means, and which is trusted to issue <A HREF="#Public Key Certificate">
-public key certificates</A> for other entities not directly known to the relying party.
-<p>A <A HREF="#Certification Authority">CA</a> is a type of TTP.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="Web of Trust"></A>Web of Trust
-</td>
-<td>
-The set of social relationships between users of <A HREF="#PGP">PGP</a> that enables them to sign each others' keys,
-essentially providing a <A HREF="#PKI">PKI</a> for this technology.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="WMLScript Crypto API"></A>WMLScript Crypto API
-</td>
-<td>
-A WAP Forum standard which defines cryptographic functions in WML, the scripting language used in WAP.
-It defines a function for creating signed objects called <A HREF="#SignText">SignText</a>
-</td>
-</tr>
-
-
-<TR>
-<TD>
-<A name="WTLS"></A>WTLS
-</td>
-<td>
-A client-server security protocol providing <A HREF="#Secrecy">secrecy</a> and optionally <A HREF="#Authentication">authentication</a>,
-running at the transport layer of the WAP stack. WTLS is closely modelled on <A HREF="#Transport Layer Security">TLS</a>,
-and defines its own lightweight <A HREF="#Public Key Certificate">certificate</a> format.
-</td>
-</tr>
-
-<TR>
-<TD>
-<A name="X.509 Certificate"></A>X.509 Certificate
-</td>
-<td>
-A widely used type of <A HREF="#Public Key Certificate">public key certificates</A>, part of the
-now largely moribund X.500 series of standards.
-</td>
-</tr>
-
-<!--
-<TR><TD><A HREF="/rfc2459">RFC 2459</a></td>
-<td>PKIX Certificate and CRL Profile<br>
-<b>This RFC is being updated by two new Internet draftversions,
-<a href="/draftversion-ietf-pkix-new-part1">draftversion-ietf-pkix-new-part1</a>
-and <a href="/draftversion-ietf-pkix-ipki-pkalgs">draftversion-ietf-pkix-ipki-pkalgs</a>.</b>
-</td>
-</tr>
--->
-
-<!--
-<TR><TD><A
-HREF="/draftversion-ramsdell-role-names">draftversion-ramsdell-role-names</A></TD><TD>Role
-Names in X.509 Certificates</TD>
-<TD>Expired</TD></TR>
--->
-
-<TR HEIGHT=0><TD WIDTH="35%"></TD><TD
-WIDTH="65%"></TD></TR></TABLE></P></center>
-
-</BODY></HTML>
--- a/cryptomgmtlibs/securitydocs/building-certstore.txt Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-Title: Building Certificate Store
-Owner: Gleb Dolgich
-Contributors: Xavier Leclercq, Gleb Dolgich
-Copyright (C) 2003 Symbian Limited. All rights reserved.
-================================================================================
-
-Purpose
--------
-
-This document describes how to build CACerts.dat (certificate store) and
-certclients.dat (certificate client applications) files. These files are stored
-on a device in c:\system\data\ directory. They are necessary for Software
-Install and SSL/TLS.
-
-Certificates and trusters
--------------------------
-
-Every certificate stored in CACerts.dat has a set of UIDs associated with it,
-each UID marking the certificate as good for a particular purpose (application).
-Currently the following applications/UIDs are defined:
-
-- SW Install (268452523, or 0x100042AB)--certificate is suitable for software
- install (SIS files);
-- SW Install OCSP Signing (268478646, or 0x1000A8B6)--certificate is suitable
- for OCSP checking (SIS files);
-- MIDlet Installation (270506792, or 0x101F9B28)--certificate is good for Java
- MIDlet installation, which includes OCSP checking;
-- Server Authentication (268441661, or 0x1000183D)--certificate is suitable for
- SSL/TLS server authentication.
-
-These UIDs are stored in certclients.dat file. Once certclients.dat is in
-c:\system\data on the device, the Certificates Control Panel applet allows
-manual assignment of applications to each certificate.
-
-Files needed
-------------
-
-The following files are needed to build a certificate store:
-
-- T_CERTSTORE.EXE test harness, which is located in security/certman/tcertstore;
- build it from security/certman/group;
-- bldcertstore.txt: test script located in security/certman/tcertstore/scripts;
- you can modify it depending on which certificates/applications you want
- included in the store. This script is exported into device's
- c:\tcertstore\scripts.
-
-The following certificates are used for running tests:
-
-- cacert.crt "TestCA"--SSL server CA certificate (self-signed)
-- thawtetest.crt "Thawte Root"--SW Install certificate
-- TOCSP-Root5-RSA.cer--SW Install and MIDlet Installation
-- TOCSP-Signing5-RSA.cer--OCSP Signing
-
-These certificates are copied into c:\tappinst\certs\ directory on the device.
-
-Building the store
-------------------
-
-To build a certificate store, perform the following steps:
-
-1. Build the T_CERTSTORE test harness and export test files for appinst and
- certman.
-
-2. Go to the appropriate build directory (udeb or urel) and run the following
- command:
-
- t_certstore c:\tcertman\scripts\bldcertstore.txt c:\bldcertstore.log
-
- This will build c:\system\data\cacerts.dat and c:\system\data\certclients.dat
- with test certificates. If you need to add your own certificates, modify the
- bldcertstore.txt script accordingly.
--- a/cryptomgmtlibs/securitydocs/building-swicertstore.txt Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-swicertstoretool
-================
-
-swicertstoretool is a tool for creating the SWI cert store data file containing
-the root certificates used by software install.
-
-Command syntax
---------------
-
-The syntax of the command is:
-
-swicertstoretool INPUT_FILE OUTPUT_FILE LOG_FILE
-
-INPUT_FILE is a text file describing the certificates to be put in the store.
-The format is described below.
-
-OUTPUT_FILE is where the cert store data file is written. This will need to be
-copied to where the SWI cert store expects to find it,
-z:\resource\swicertstore.dat.
-
-LOG_FILE names a file that information is logged to when the command is run.
-This should be checked afterwards to see if the command succeeded. Errors are
-indicated by lines starting with "***".
-
-Input file format
------------------
-
-The input file is in "ini" format. Each section describes a certificate to be
-put in the store, with the section name taken as the certificate label.
-
-The following parameters can be specified for each certificate:
-
-Name Description
---------------------------------------------------------------------------------
-file The name of the file containing the DER encoded certificate.
- This field must be present.
-
-mandatory Whether the certificate is marked as mandatory for software
- install. The value must be either "0" or "1". The field is
- optional - if it is not present the default is "0".
-
-capability The name of a capability that the certificate can sign for.
- This field can be repeated to allow multiple capabilities to be
- specified. Allowed capabilities are:
-
- TCB
- CommDD
- PowerMgmt
- MultimediaDD
- ReadDeviceData
- WriteDeviceData
- DRM
- TrustedUI
- ProtServ
- DiskAdmin
- NetworkControl
- AllFiles
- SwEvent
- NetworkServices
- LocalServices
- ReadUserData
- WriteUserData
- Location
-
-application The name of an application that the certificate can be used for.
- This can be repeated, but it must appear at least once. Allowed
- applications are:
-
- SWInstall (Software install)
- SWInstallOCSP (Software install OCSP signing)
---------------------------------------------------------------------------------
-
-An example input file can be found in this directory.
--- a/cryptomgmtlibs/securitydocs/doxygen_docs/Security_API_migration_guide.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-/**
-@page api_migration_guide API migration guide
-
-
-*/
\ No newline at end of file
--- a/cryptomgmtlibs/securitydocs/doxygen_docs/Security_MainPage_index.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/**
-@mainpage Security on Symbian OS
-
-The Security sub-system comprises:
-
-- @ref mainpage_certman
-- @ref mainpage_caf
-- @ref mainpage_caf2
-- @ref mainpage_cryptography
-- @ref mainpage_tokenframework
-- @ref mainpage_key_management
-- @ref mainpage_pbe
-- @ref mainpage_SWI
-
-<hr>
-
-Security on Symbian OS enables data confidentiality, integrity and @ref authentication; secure comms protocols
-(for example, @ref SSL, @ref TLS, @ref WTLS, @ref IPSec, @ref SMIME "S/MIME"); and technology to support application
-signing. It provides APIs for standard cryptography and @ref hash algorithms, key generation,
-certificate management, and random number generation.
-
-@ref Security_intro provides a quick basic overview on Public Key Cryptography, Certificates, and Digital Signatures,
-that Security APIs support. However, for detailed explanations refer to any of the standard security books available
-(for example, Applied Cryptography by Bruce Schneier).
-
-For an overview of how the various security components are structured in the Symbian OS, see @ref Security_arch_overview.
-
-- @ref api_migration_guide
-- @ref security_glossary
-
-*/
--- a/cryptomgmtlibs/securitydocs/doxygen_docs/Security_architecture.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/**
-@page Security_arch_overview Symbian OS Security Architecture Overview
-\n
-
-The Symbian OS security architecture fundamentally consists of two high level components:
-
-@li Certificate management (certman)
-
-@li Cryptography (cryptalg)
-
-Together these modules/components form the basis of a number of higher level components, which include:
-
-@li Certificate management control panel item (UI to certificate management allowing control of trusted root certificates)
-
-@li Software installation (@ref authentication / @ref digital_signature "digital signatures")
-
-@li Secure comms (@ref SSL / @ref TLS, @ref WTLS, @ref IPSec, etc.)
-
-<hr>
-
-\b Diagrams
-
-The following diagrams show the:
-
-@li @ref Security_arch_pre-v8 "Security architecture: pre-v8.0"
-@li @ref Security_arch_v8 "Security architecture: v8.0 showing component dependencies"
-@li @ref Security_arch_v8_dll "Security architecture: v8.0 showing individual DLL dependencies"
-
-
-*/
Binary file cryptomgmtlibs/securitydocs/doxygen_docs/Security_architecture.gif has changed
Binary file cryptomgmtlibs/securitydocs/doxygen_docs/Security_architecture.vsd has changed
--- a/cryptomgmtlibs/securitydocs/doxygen_docs/Security_architecture_diagram_pre-v8.0.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-/**
-@page Security_arch_pre-v8 Symbian OS pre-v8.0 Security Architecture Diagram
-\n
-
-
-The diagram below shows the Security architecture before v8.0
-
-@image html Security_architecture.gif
-
-
-*/
\ No newline at end of file
--- a/cryptomgmtlibs/securitydocs/doxygen_docs/Security_architecture_diagram_v8.0.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-/**
-@page Security_arch_v8 Symbian OS v8.0 Security Architecture Diagram
-\n
-
-@image html Security_architecture_v8.0.gif
-
-
-*/
\ No newline at end of file
--- a/cryptomgmtlibs/securitydocs/doxygen_docs/Security_architecture_diagram_v8.0_dll.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-/**
-@page Security_arch_v8_dll Symbian OS v8.0 Security Architecture Diagram
-\n
-
-@image html Security_architecture_v8.0_dep.gif
-
-
-
-*/
\ No newline at end of file
Binary file cryptomgmtlibs/securitydocs/doxygen_docs/Security_architecture_v8.0.gif has changed
Binary file cryptomgmtlibs/securitydocs/doxygen_docs/Security_architecture_v8.0_dep.gif has changed
Binary file cryptomgmtlibs/securitydocs/doxygen_docs/Security_architecture_v8.0_dep.vsd has changed
--- a/cryptomgmtlibs/securitydocs/doxygen_docs/Security_glossary.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,615 +0,0 @@
-/**
-@page security_glossary Security glossary
-\n
-A glossary of security terms (mostly non-Symbian specific).
-\n\n
-@ref A, @ref B, @ref C, @ref D, @ref E, @ref F, @ref G, @ref H, @ref I, @ref J, @ref K, @ref L, @ref M, @ref N, @ref O,
-@ref P, @ref Q, @ref R, @ref S, @ref T, @ref U, @ref V, @ref W, @ref X, @ref Y, @ref Z
-\n @anchor A \n
-
-<table>
-
-<tr><td><b>A</b></td><td></td></tr>
-
-<tr><td>@anchor AES AES</td>
- <td>Advanced Encryption Standard -- The new conventional symmetric @ref block_cipher "block cipher" chosen by NIST as a
- replacement for @ref DES. It can process 128-bit data blocks using
- cipher keys with lengths of 128, 192, or 256 bits.</td></tr>
-
-<tr><td>@anchor ASN ASN.1</td>
- <td>Abstract Syntax Notation 1 (See: <A HREF="http://asn1.elibel.tm.fr/en/introduction/index.htm">ASN.1</A>,
- ISO/IEC 8824, and ISO/IEC 8825.) -- A data specification meta-language widely used in @ref public_key_cryptography "public key cryptography"
- standards. (Also of interest: <A HREF="ftp://ftp.rsasecurity.com/pub/pkcs/doc/layman.doc">A Layman's Guide to
- a Subset of ASN.1, BER, and DER</A>.)</td></tr>
-
-<tr><td>@anchor asymmetric @anchor Asymmetric Asymmetric Cryptography</td>
- <td>A form of cryptography in which the 'key' is generated as a key pair: if one key is used for @ref encryption only the
- other can be used to decrypt, and vice versa. \n\n
- Using asymmetric cryptography, the problem of key distribution becomes one of @ref authentication; i.e. how to make sure
- that a given key really does belong to the entity that claims to own it. See:
- @li @ref asymmetric_cryptography
- @li @ref SS_Cryptalg_asymmetric_ciphers.</td></tr>
-
-<tr><td>@anchor attribute_cert Attribute Certificate</td>
- <td>A digitally signed data structure including at least an identifier for an individual entity and a set of
- attributes, whose function is to bind the entity with the attributes, usually for the purpose of authorisation.
- </td></tr>
-
-<tr><td>@anchor authentication @anchor Authentication Authentication</td>
- <td>Usually used to refer to a property of a communication; that the receiver of a message is able to ascertain its
- origin, so an attacker cannot successfully impersonate the sender. </td></tr>
-
-
-
-</table>\n @anchor B \n<table>
-
-<tr><td><b>B</b></td><td></td></tr>
-
-<tr><td>@anchor BER BER</td>
- <td>Basic Encoding Rules for @ref ASN "ASN.1", as defined in X.690. (Also of interest:
- <A HREF="ftp://ftp.rsasecurity.com/pub/pkcs/doc/layman.doc">A Layman's Guide to a Subset of ASN.1, BER, and DER</A>.)
- </td></tr>
-
-<tr><td>@anchor block_cipher Block Cipher</td>
- <td>A class of symmetric algorithm in which several bits of the input data are encrypted at once in a fixed-size
- block. The cipher and its mode of operation define the block size: the @ref plaintext is split up into appropriately-sized
- blocks and each block is fed into the cipher. </td></tr>
-
-
-
-</table>\n @anchor C \n<table>
-
-<tr><td><b>C</b></td><td></td></tr>
-
-<tr><td>@anchor CA CA</td>
- <td>Certification Authority -- An organisation that performs the following functions in a hierachical @ref PKI:
- @li providing trusted @ref root_certificate "'root' certificates" to users (@ref EE "End Entities"), by supplying them with the CA's @ref public_key "public key" via
- out-of-band means.
- @li certifying End Entities (@ref EE "EE"s) by generating and distributing certificates for them. The certified @ref EE is the
- subject of the @ref certificate; the CA is the issuer. The CA validates the certificate holder's identity and 'signs'
- the @ref certificate so that it cannot be tampered with or forged. The @ref certificate issued by the CA binds a particular
- @ref public_key "public key" to the name of the @ref EE the @ref certificate identifies.
- @li supporting certificate revocation and revocation checking: if an @ref EE suspects that their key has been compromised,
- they can contact the CA that issued it, who will then revoke their @ref certificate.
-
- A CA will always have a root certificate-signing key pair that must be authenticated to End Entities via @ref out_of_band "out of band"
- channels. This key pair is not logically certified by anything, but it is usually distributed inside a self-signed
- @ref certificate to afford some degree of tamper evidency. \n\n
- However, CAs do not have to use their root key pair to issue certificates directly to End Entities. For organizational
- reasons and to reduce the exposure of keys, a CA may have a single root signing key pair, which it uses to certify a
- set of subordinate key pairs that in turn are used to certify End Entities. Also, CAs may certify the signing keys
- of other CAs by issuing cross certificates, which enable interoperation between two distinct @ref PKI "PKI"s.</td></tr>
-
-<tr><td>@anchor CA_certificate CA Certificate
- <td>A @ref certificate held by a @ref CA: the key pair associated with it is used for signing certificates issued by that
- @ref CA. May or may not be self-signed.</td></tr>
-
-<tr><td>@anchor CBC CBC</td>
- <td>Cipher Block Chaining -- A cryptographic mode for @ref block_cipher "block ciphers". It is an @ref encryption method that protects
- against block replay attacks by making the encryption of a cipher block dependent on all blocks that precede it.
- Before it is encrypted, the @ref plaintext is XORed with the previous @ref ciphertext block (which has been stored in a
- feedback register). After the encryption, the resulting ciphertext is again stored in the feedback register, to
- be XORed with the next plaintext block, and so on until the end of the message.</td></tr>
-
-<tr><td>@anchor certificate @anchor certificates Certificate</td>
- <td>For our purposes, this is the same thing as a @ref public_key_certificate "public key certificate".</td></tr>
-
-<tr><td>@anchor ciphermode Ciphermode</td>
- <td> description</td></tr>
-
-<tr><td>@anchor ciphertext Ciphertext</td>
- <td>The output of an @ref encryption operation, or the input to a @ref decryption operation.</td></tr>
-
-<tr><td>@anchor CLDC CLDC</td>
- <td><A HREF="http://java.sun.com/products/cldc/">J2ME Connected Limited Device Configuration</A> -- Serves the market consisting of personal, mobile, and
- connected information devices. This configuration includes some new classes designed specifically to fit the
- needs of small-footprint devices.</td></tr>
-
-<tr><td>@anchor client_authentication Client Authentication</td>
- <td>In a secure client-server protocol such as @ref TLS, the process in which the client authenticates itself to
- the server, so the server knows who it's talking to. \n See @ref WTLS_client_authentication "client authentication in WTLS". </td></tr>
-
-<tr><td>Client/User/End Entity Certificate</td>
- <td>A @ref certificate issued by a @ref CA to an end entity, @ref EE, who may use it to demonstrate their
- ownership of the key pair associated with it.</td></tr>
-
-<tr><td>@anchor CRL CRL</td>
- <td>Certificate Revocation List -- A list of (identifiers for) @ref certificates that have been revoked by a
- particular @ref CA. The use of CRLs is for maintaining access to servers in a network, in a @ref PKI; in some cases,
- @ref OCSP has superseded CRL. See:
- @li <A HREF="http://www.ietf.org/rfc/rfc2459.txt">RFC2459</A>
- -- Internet @ref X509 "X.509" @ref PKI Certificate and CRL Profile
- @li <A HREF="http://www.ietf.org/rfc/rfc3279.txt">RFC3279</A>
- -- Algorithms and Identifiers for the Internet @ref X509 "X.509" @ref PKI Certificate and Certificate Revocation List
- (@ref CRL) Profile
- @li <A HREF="http://www.ietf.org/rfc/rfc3280.txt">RFC3280</A>
- -- Internet @ref X509 "X.509" @ref PKI Certificate and Certificate Revocation List (@ref CRL) Profile.
- </td></tr>
-
-<tr><td>@anchor cross_certificate Cross Certificate</td>
- <td>A @ref certificate issued by a @ref CA which certificates another @ref CA's @ref root_certificate "root certificate". This is way of uniting two distinct
- certification hierarchies.</td></tr>
-
-
-
-</table>\n @anchor D \n<table>
-
-<tr><td><b>D</b></td><td></td></tr>
-
-<tr><td>@anchor decryption Decryption</td>
- <td>The process of turning encrypted data (called @ref ciphertext) into the original information (called
- @ref plaintext) using a cryptographic algorithm parameterised with a key.</td></tr>
-
-<tr><td>@anchor DER DER</td>
- <td>Distinguished Encoding Rules -- A set of rules for encoding @ref ASN "ASN.1" data structures as a byte stream, which
- has the property that any given @ref ASN "ASN.1" data structure will always encode to the same byte stream. DER is a
- subset of @ref BER. (Also of interest:
- <A HREF="ftp://ftp.rsasecurity.com/pub/pkcs/doc/layman.doc">A Layman's Guide to a Subset of ASN.1, BER, and DER</A>.)
- </td></tr>
-
-<tr><td>@anchor DES DES</td>
- <td>Data Encryption Standard -- A symmetric @ref block_cipher "block cipher" (that is the U.S. and international standard) used for
- @ref encryption and @ref decryption. A 64-bit block cipher with a 56-bit key organized as 16 rounds of operations. </td></tr>
-
-<tr><td>@anchor digital_signature Digital Signature</td>
- <td>A structure linking some data and a @ref private_key "private key". A digital signature may be generated by the application of a
- private key to some piece of data. The original data may be reconstructed by applying the corresponding @ref public_key "public key",
- demonstrating that the signature could only have been generated by someone with access to the private key.\n\n
- Digital signatures have two primary uses: to demonstrate someone's identity by signing some challenge, as in
- @ref client_authentication "client authentication" in @ref TLS, in which the client signs a @ref hash of the messages that have been exchanged;
- and more strongly, for someone to demonstrate their acceptance of some human-processable information (e.g.
- 'Please withdraw £10,000 from my bank account') as in the @ref WMLScript Crypto API SignText function.\n\n
- See: an introduction to @ref Security_signatures.</td></tr>
-
-<tr><td>@anchor DN DN</td>
- <td>Distinguished Name -- An @ref ASN "ASN.1" structure containing various attributes (name-value pairs) that together
- uniquely identify the entity for certification purposes. \n\n
- The name used in @ref X509_certificate "X.509 certificates" is the X.500 Distinguished Name, which describes a path
- through an X.500 Directory Information Tree. Conventionally, a DN comprises <i> at least </i> three attributes: a user's
- name/ID (e.g., \c cn=Fred \c Bloggs), an organization name (e.g., \c o=Symbian \c UK \c Ltd), and a country designation
- (e.g., \c c=GB ).
- </td></tr>
-
-<tr><td>@anchor DSA DSA</td>
- <td>Digital Signature Algorithm -- A NIST-approved @ref asymmetric algorithm. It can only be used for generating
- and verifying @ref digital_signature "digital signatures", not for @ref encryption.
- See: The <A HREF="http://www.itl.nist.gov/fipspubs/fip186.htm">Digital Signature Standard</A>.
- </td></tr>
-
-
-
-</table>\n @anchor E \n<table>
-
-<tr><td><b>E</b></td><td></td></tr>
-
-<tr><td>@anchor ECB ECB</td>
- <td>Electronic Codebook -- A cryptographic mode for @ref block_cipher "block ciphers". It is a mode that encrypts
- blocks of @ref plaintext to corresponding blocks of @ref ciphertext. Given use of the same key, a block of plaintext
- will always encrypt to the same block of ciphertext.</td></tr>
-
-<tr><td>@anchor ECC ECC</td>
- <td>Elliptical Curve Cryptography -- An @ref asymmetric @ref encryption technique based on elliptic curve theory that
- can be used to create faster, smaller, and more efficient cryptographic keys.</td></tr>
-
-<tr><td>@anchor encryption Encryption</td>
- <td>The process of turning meaningful data (called @ref plaintext) into meaningless gibberish (called @ref ciphertext)
- using a cryptographic algorithm parameterised with a key.</td></tr>
-
-<tr><td>@anchor EE EE</td>
- <td>End Entity -- A leaf node in a certification hierarchy: any entity in a @ref PKI which has a @ref certificate, but is
- not allowed to issue its own certificates.</td></tr>
-
-
-
-</table>\n @anchor F \n<table>
-
-<tr><td><b>F</b></td><td></td></tr>
-
-
-
-</table>\n @anchor G \n<table>
-
-<tr><td><b>G</b></td><td></td></tr>
-
-
-
-</table>\n @anchor H \n<table>
-
-<tr><td><b>H</b></td><td></td></tr>
-
-<tr><td>@anchor hash Hash</td>
- <td>Hash algorithms take a variable-length input and produce a fixed length output known as a digest, or hash, of the
- input. For cryptographic purposes they need to be one-way functions: it should not be possible to deduce the input
- from the digest, or even any part of the input. Also, it should be hard to find collisions: that is, two different
- inputs that produce the same output. See:
- @li @ref cryptographic_hash
- @li @ref SS_Cryptalg_hash_algorithms.</td></tr>
-
-<tr><td>@anchor HMAC HMAC</td>
- <td>Keyed-Hashing for Message Authentication -- A mechanism for message @ref authentication using cryptographic hashes. It
- can be used with any iterative cryptographic @ref hash function, e.g., @ref MD5, @ref SHA "SHA-1", in combination with a secret
- shared key. The cryptographic strength of HMAC depends on the properties of the underlying @ref hash function.</td></tr>
-
-
-
-</table>\n @anchor I \n<table>
-
-<tr><td><b>I</b></td><td></td></tr>
-
-<tr><td>@anchor ICC ICC</td>
- <td>Integrated Circuit Card -- A removable card with at least data storage and sometimes processing.</td></tr>
-
-<tr><td>@anchor IPSec IPSec</td>
- <td>IP Security Protocol -- A standard providing @ref secrecy and @ref authentication at the network or
- datagram layer of network communication. IPSec is mandatory in IPv6. \n
- See: <A HREF="http://www.ietf.org/html.charters/ipsec-charter.html">IPSec Working Group</A>.</td></tr>
-
-
-
-</table>\n @anchor J \n<table>
-
-<tr><td><b>J</b></td><td></td></tr>
-
-
-
-</table>\n @anchor K \n<table>
-
-<tr><td><b>K</b></td><td></td></tr>
-
-
-
-</table>\n @anchor L \n<table>
-
-<tr><td><b>L</b></td><td></td></tr>
-
-
-
-</table>\n @anchor M \n<table>
-
-<tr><td><b>M</b></td><td></td></tr>
-
-<tr><td>@anchor MD2 MD2</td>
- <td>Legacy @ref hash algorithm. Considered insecure.</td></tr>
-
-<tr><td>@anchor MD5 MD5</td>
- <td>Legacy @ref hash algorithm. Considered vulnerable.</td></tr>
-
-<tr><td>@anchor message_digest_algorithm Message Digest Algorithm</td>
- <td>Same as a @ref hash algorithm. </td></tr>
-
-<tr><td>@anchor MIDP MIDP</td>
- <td><A HREF="http://www.jcp.org/en/jsr/detail?id=118">Mobile Information Device Profile (JSP-118)</A>.
- -- A set of Java APIs that is generally implemented on the @ref CLDC "Connected Limited Device Configuration" (CLDC).
- It provides a basic J2ME application runtime environment targeted at mobile information devices, such as
- mobile phones and two-way pagers. The MIDP specification addresses issues such as user interface, persistent storage,
- networking, and application model.</td></tr>
-
-
-
-</table>\n @anchor N \n<table>
-
-<tr><td><b>N</b></td><td></td></tr>
-
-<tr><td>@anchor nonrepudiation Non-repudiation</td>
- <td>The process by which it is assured that an entity making a declaration cannot subsequently deny having made it:
- so I can't claim that I never wrote that cheque. </td></tr>
-
-
-
-</table>\n @anchor O \n<table>
-
-<tr><td><b>O</b></td><td></td></tr>
-
-<tr><td>@anchor OAEP OAEP</td>
- <td>Optimal Asymmetric Encryption Padding -- OAEP is a method for encoding messages, and addresses a potential
- vulnerability in <A HREF="http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/index.html">PKCS#1</A>. Padding means extra
- bits concatenated with a key, password, or @ref plaintext. @ref Padding helps against dictionary attacks.</td></tr>
-
-<tr><td>@anchor OCSP OCSP</td>
- <td>@ref X509 "X.509" Internet Public Key Infrastructure Online Certificate Status Protocol -- A simple request/response
- protocol. To establish whether a given @ref certificate or list of certificates has/have been revoked, a client forms an
- OCSP request and sends this to an OCSP server. The server maintains revocation information in the form of, say,
- Certificate Revocation Lists (@ref CRL "CRL"s). The server replies to the client with a signed OCSP response, stating for
- each certificate whether the status is Good, Revoked, or Unknown. This response in turn is checked to ensure that it
- is valid, and that it is from an entity trusted for performing revocation checking.
- See:
- @li <A HREF="http://www.ietf.org/rfc/rfc2560.txt">RFC2560</A>
- -- @ref X509 "X.509" Internet @ref PKI Online Certificate Status Protocol - OCSP
- @li @ref overview_OCSP overview. </td></tr>
-
-<tr><td>@anchor OID OID</td>
- <td>Object Identifier -- A universal constant uniquely associated with an object type used in @ref ASN "ASN.1".</td></tr>
-
-<tr><td>@anchor OS OS Element</td>
- <td>A discrete, identifiable entity within a ROM file that implements a set of interfaces. Examples of
- OS Elements include independently instantiable classes within DLLs, bitmaps within an MBM file, resource
- entries within a resource file. An OS Element identifies a part of a ROM file that could in principle be
- factored out or removed if it becomes architecturally advisable.</td></tr>
-
-<tr><td>@anchor out_of_band Out Of Band</td>
- <td>A channel of communication that is distinct from the channel which we are using cryptography to try to secure,
- and which is secure on its own terms; that is, its security is not dependent on the cryptography we are using.
- A common example of an out of band channel is a motorcycle courier.
- </td></tr>
-
-
-</table>\n @anchor P \n<table>
-
-<tr><td><b>P</b></td><td></td></tr>
-
-<tr><td>@anchor Padding @anchor padding Padding</td>
- <td>Extending the size of a block of @ref plaintext to, say, a 64-bit block by addition of a regular or random pattern.
- For example, for use with @ref ECB. See:
- @li @ref rsa_padding
- @li @ref symmetric_ciphers.</td></tr>
-
-<tr><td>@anchor PKCS PKCS</td>
- <td><A HREF="http://www.rsasecurity.com/rsalabs/pkcs/index.html">Public-Key Cryptography Standards</A>.</td></tr>
-
-<tr><td><A HREF="http://www.rsasecurity.com/rsalabs/pkcs/pkcs-10/index.html">PKCS#10</A></td>
- <td>@ref PKI standard that describes how to construct @ref certificate requests.</td></tr>
-
-<tr><td>@anchor PKG PKG file</td>
- <td>A text file that defines a @ref SIS file. The PKG file is passed to the MAKESIS tool to produce the
- @ref SIS file.</td></tr>
-
-<tr><td>@anchor PKI PKI</td>
- <td>Public Key Infrastructure -- A way of modelling real-world trust relationships that enables users of
- @ref public_key_cryptography "public key cryptography" to have confidence in the ownership of the @ref public_key "public keys" they are using. A PKI consists of:
- @li a trusted third party (@ref TTP)
- @li an @ref out_of_band "out of band" means of distributing the @ref TTP's @ref public_key_certificate "public key certificate" to @ref relying_party "relying parties"
- @li a means of distributing other certificates to @ref relying_party "relying parties"
- @li arrangements for the @ref revocation and renewal of these certificates
- @li certificate management and validation software on the @ref relying_party "relying party's" computer
-
- The TTP uses its signing key pair to create certificates for other entities, which relying parties can use to
- authenticate these other entities.
-
- We can classify PKIs according to whether they are hierachical or flat. In hierachical PKIs, such as the one defined
- in the PKIX set of standards, there is a distinction between users of the PKI such as End Entities (@ref EE "EE"s) and
- @ref relying_party "relying parties", and entities responsible for issuing and distributing certificates such as @ref CA "CA"s and
- @ref RA "RA"s. In a flat PKI such as the @ref web_of_trust "web of trust" underpinning @ref PGP, there are no entities whose sole role is
- to issue certificates; instead users of the PKI certify each other. </td></tr>
-
-<tr><td>@anchor PKIX PKIX</td>
- <td>Public-Key Infrastructure (X.509) -- A profile of @ref X509 "X.509" for the internet. See:
- @li @ref Certman_X509_Certificate_Validation
- @li <A HREF="http://www.ietf.org/rfc/rfc2459.txt">RFC2459</A>
- -- Internet X.509 Public Key Infrastructure Certificate and CRL Profile.)</td></tr>
-
-<tr><td>@anchor plaintext Plaintext</td>
- <td>The output of an @ref decryption operation, or the input to a @ref encryption operation.</td></tr>
-
-<tr><td>@anchor PGP PGP</td>
- <td>Pretty Good Privacy -- A very widely-used @ref encryption and digital signing program.</td></tr>
-
-<tr><td>@anchor private_key Private Key</td>
- <td>In the context of @ref public_key_cryptography "public key cryptography", the private half of the key pair.</td></tr>
-
-<tr><td>@anchor public_key Public Key</td>
- <td>In the context of @ref public_key_cryptography "public key cryptography", the public half of the key pair.</td></tr>
-
-<tr><td>@anchor public_key_certificate Public Key Certificate</td>
- <td>A digitally signed structure including at least an identifier for an individual entity and a @ref public_key "public key", whose
- function is to bind the entity with the key. </td></tr>
-
-<tr><td>@anchor public_key_cryptography Public Key Cryptography</td>
- <td>A common application of @ref asymmetric cryptography in which one half of the key pair is kept secrect
- (the @ref private_key "private key") and the other half is published (the @ref public_key "public key"). See:
- @li @ref asymmetric_cryptography
- @li @ref Security_intro_PKC.</td></tr>
-
-
-
-</table>\n @anchor Q \n<table>
-
-<tr><td><b>Q</b></td><td></td></tr>
-
-
-
-</table>\n @anchor R \n<table>
-
-<tr><td><b>R</b></td><td></td></tr>
-
-<tr><td>@anchor RA Registration Authority</td>
- <td>An organization responsible for registering new @ref certificate users in a @ref PKI, e.g. by gathering and verifying
- information which identifies the @ref certificate applicant.</td></tr>
-
-<tr><td>@anchor revocation Revocation</td>
- <td>The term used for asserting that a @ref certificate is no longer valid: for example, because the @ref private_key "private key"
- associated with it has been compromised.</td></tr>
-
-<tr><td>@anchor relying_party Relying Party</td>
- <td>An entity who relies on the authenticity of a @ref public_key "public key".</td></tr>
-
-<tr><td>@anchor root_certificate Root Certificate</td>
- <td>The @ref certificate of a @ref TTP "trusted third party". A certificate directly trusted by a @ref relying_party "relying party"
- that is, trust in it is not established by cryptographic means, but trust in it is the prerequisite for establishing
- trust in the entity which the relying party is trying to authenticate. Trust in a root certificate must be established
- through @ref out_of_band "out of band" means. A root certificate may or may not be self signed.\n\n
- See: @ref certman_certstore_root_cert_management.</td></tr>
-
-<tr><td>@anchor RSA <A HREF="http://www.rsasecurity.com/rsalabs/rsa_algorithm/index.html">RSA</A></td>
- <td>A @ref public_key "public key" algorithm used for both @ref encryption and @ref digital_signature "digital signatures", named after its creators:
- Rivest, Shamir, and Adleman.</td></tr>
-
-
-</table>\n @anchor S \n<table>
-
-<tr><td><b>S</b></td><td></td></tr>
-
-<tr><td>@anchor secrecy Secrecy</td>
- <td>This means that access to information is controlled: for example, it means that two entities (e.g. people,
- machines, processes) are able to communicate with one another without any other entities being able to access the
- information communicated, or that an entity may store some information and be assured that only this entity will be
- able to access it.</td></tr>
-
-<tr><td>@anchor SHA SHA-1</td>
- <td>Secure Hash Algorithm 1 -- A widely used @ref hash algorithm, producing a 160-bit digest. </td></tr>
-
-<tr><td>@anchor server_authentication Server Authentication</td>
- <td>In a secure client-server protocol such as @ref TLS, the process in which the server authenticates itself to the
- client, so the client knows to whom it's talking. \n See: @ref WTLS_server_authentication "Server authentication in WTLS".</td></tr>
-
-<tr><td>@anchor SignText SignText</td>
- <td>A function defined in the @ref WMLScript Crypto API that provides application-level @ref authentication and
- @ref nonrepudiation "non-repudiation" for transactions. </td></tr>
-
-
-<tr><td>@anchor SIS SIS file</td>
- <td>A binary package file containing all the files for an installation, as well as metadata describing which
- directory to install them into, dependencies, etc..\n
- See: @ref overview_SWI overview.</td></tr>
-
-<tr><td>@anchor Stub SIS Stub file</td>
- <td>A @ref SIS file containing only the metadata, and not the files. After the installation, this file is archived
- on the device for uninstallation purposes, etc..</td></tr>
-
-<tr><td>@anchor SMIME S/MIME</td>
- <td><A HREF="http://www.ietf.org/html.charters/smime-charter.html">Secure/Multipurpose Internet Mail Extensions</A>
- -- Provides a consistent way to send and receive secure MIME data. S/MIME provides the following cryptographic
- security services for electronic messaging applications: @ref authentication, message integrity and @ref nonrepudiation "non-repudiation" of
- origin (using @ref digital_signature "digital signatures") and privacy and data security (using @ref encryption); see
- <A HREF="http://www.ietf.org/rfc/rfc2633.txt">RFC2633</A> -- S/MIME Version 3 Message Specification.
- </td></tr>
-
-<tr><td>@anchor SSL SSL</td>
- <td>Secure Sockets Layer -- A protocol for securing network connections that provides @ref authentication, @ref encryption, and
- data integrity using @ref PKI "Public Key Infrastructure" (PKI). Precursor to @ref TLS. SSL has been through three versions:
- the first two are considered insecure, and the third is almost identical to @ref TLS.</td></tr>
-
-<tr><td>@anchor stream_cipher Stream Cipher</td>
- <td>A class of symmetric algorithm that is initialised with a key, then outputs a stream of pseudorandom bits.
- This 'keystream' is typically XOR-ed with the @ref plaintext to generate the @ref ciphertext. So they encrypt a bit of
- plaintext at a time. </td></tr>
-
-<tr><td>@anchor symmetric_cryptography Symmetric Cryptography</td>
- <td>A form of cryptography in which the same key is used for @ref encryption and @ref decryption.\n\n
- Symmetric cryptography is fast, but suffers from the problem of how to distribute the key privately. @ref Asymmetric
- cryptography is an attempt to alleviate the key distribution problem, by reducing the requirement for the distributed
- key from one of privacy to one of @ref authentication. See:
- @li @ref symmetric_ciphers
- @li @ref SS_Cryptalg_symmetric_ciphers.</td></tr>
-
-
-</table>\n @anchor T \n<table>
-
-<tr><td><b>T</b></td><td></td></tr>
-
-<tr><td>@anchor TLS TLS</td>
- <td>Transport Layer Security -- A protocol that provides communications secrecy, and optionally @ref authentication,
- over the Internet TCP/IP. The protocol allows client/server applications to communicate in a way that is designed to
- prevent eavesdropping, tampering, or message forgery.
-
- In this protocol a client connects to a server; the two then perform a handshake in which they exchange a
- symmetric key by using @ref asymmetric cryptography, which is then used to encrypt their communications,
- providing the @ref secrecy element. Without the @ref authentication element, @ref secrecy is not very useful; although
- only client and server can understand the data exchanged, the client doesn't know who the server is or vice versa. TLS
- provides the capability for @ref WTLS_server_authentication "server authentication", in which the client establishes who the server is, and
- @ref client_authentication "client authentication" in which the server establishes who the client is. \n\n
- See: <A HREF="http://www.ietf.org/rfc/rfc2246.txt">RFC2246</A> --
- The TLS Protocol). TLS is the successor to the @ref SSL "Secure Sockets Layer" (SSL). (Also, see: @ref WTLS.)</td></tr>
-
-<tr><td>@anchor TTP TTP</td>
- <td>Trusted Third Party -- An entity whose @ref public_key "public key" is known to a @ref relying_party "relying party" due to its having been received
- via @ref out_of_band "out of band" means, and which is trusted to issue @ref public_key_certificate "public key certificates" for other entities not directly
- known to the relying party. A @ref CA is a type of TTP. </td></tr>
-
-
-</table>\n @anchor U \n<table>
-
-<tr><td><b>U</b></td><td></td></tr>
-
-<tr><td>@anchor URI URI</td>
- <td>Uniform Resource Identifier -- A way to identify some content on the Internet, typically through the use of an
- identifier for the scheme (e.g. HTTP) through which the content may be accessed, and an identifier for the
- content that makes sense within that scheme.
- The most common form of URI is a Web page address, which is a particular form or subset of URI called a Uniform
- Resource Locator (URL).</td></tr>
-
-
-
-</table>\n @anchor V \n<table>
-
-<tr><td><b>V</b></td><td></td></tr>
-
-
-
-</table>\n @anchor W \n<table>
-
-<tr><td><b>W</b></td><td></td></tr>
-
-<tr><td>@anchor WAP WAP</td>
- <td></td><A HREF="http://www.wapforum.org/index.htm">Wireless Application Protocol</A> -- A secure specification
- that enables users to access information instantly using devices such as mobile phones, pagers, two-way radios,
- smartphones and communicators. The WAP defines a set of protocols in transport, security, transaction, session, and
- application layers to enable the creation of advanced mobile services.</td></tr>
-
-<tr><td>@anchor web_of_trust Web of Trust</td>
- <td>The set of social relationships between users of @ref PGP that enables them to sign each others' keys, essentially
- providing a @ref PKI for this technology.</td></tr>
-
-<tr><td>@anchor WIM WIM</td>
- <td><A HREF="http://www.wmlclub.com/docs/especwap2.0/WAP-260-WIM-20010712-a.pdf">Wireless Identity Module</A>
- -- Used in performing @ref WTLS and application level security functions, and especially, to store and process
- information needed for user identification and @ref authentication. Examples of WIM implementations are a Subscriber
- Identity Module (SIM) card or an external smart card.</td></tr>
-
-<tr><td>@anchor WMLScript WMLScript Crypto API</td>
- <td>A @ref WAP Forum standard that defines cryptographic functions in WML, the scripting language used in @ref WAP.
- It defines a function for creating signed objects called @ref SignText.</td></tr>
-
-<tr><td>@anchor WTLS WTLS</td>
- <td><A HREF="http://www.wmlclub.com/docs/especwap2.0/WAP-261-WTLS-20010406-a.pdf">Wireless Transport Layer Security</A>
- -- The security layer of the @ref WAP, providing privacy, data integrity and @ref authentication for WAP services.
- It is a @ref WAP variant of @ref TLS and defines its own lightweight @ref certificate format. \n\n
- See: @ref overview_WTLS overview. </td></tr>
-
-<tr><td>@anchor WTLS_certificate WTLS certificate</td>
- <td>@ref WAP variant of @ref X509_certificate "X.509 certificates".\n\n
- See: @ref overview_WTLS overview.</td></tr>
-
-
-</table>\n @anchor X \n<table>
-
-<tr><td><b>X</b></td><td></td></tr>
-
-<tr><td>@anchor X509 X.509</td>
- <td>A widely used standard for digital certificates. See:
- @li @ref Certman_X509_Certificate_Validation
- @li <A HREF="http://www.ietf.org/rfc/rfc2459.txt">RFC2459</A>
- -- Internet @ref X509 "X.509" @ref PKI Certificate and @ref CRL Profile
- @li <A HREF="http://www.ietf.org/rfc/rfc3280.txt">RFC3280</A>
- -- Internet @ref X509 "X.509" @ref PKI Certificate and @ref CRL "Certificate Revocation List" Profile.
- </td></tr>
-
-<tr><td>@anchor X509_certificate X.509 certificate</td>
- <td>A widely used type of @ref public_key_certificate "public key certificate", part of the now largely moribund X.500 series of standards.\n\n
- An X.509 certificate is a person's/company's @ref public_key "public key" digitally signed by a trusted third party and wrapped with
- attribute data such as identifying names. A hierarchy of certificates is often used tracing back to a single root
- @ref CA_certificate "CA certificate". If a user trusts the @ref CA, then they can trust that the @ref certificate belongs to the
- person/company given within the certificate. Using the public key within the certificate, they can then verify that
- other data has originated from the certificate owner via the use of @ref digital_signature "digital signatures" created using the corresponding
- @ref private_key "private key". @ref X509 "X.509" basically defines the certificate format.</td></tr>
-
-
-
-</table>\n @anchor Y \n<table>
-
-<tr><td><b>Y</b></td><td></td></tr>
-
-
-</table>\n @anchor Z \n<table>
-
-<tr><td><b>Z</b></td><td></td></tr>
-
-<tr><td>@anchor zlib zlib</td>
- <td>zlib is designed to be a free, general-purpose, legally unencumbered (i.e., not covered by any patents) lossless
- data-compression library for use on virtually any computer hardware and operating system. zlib was written by
- Jean-loup Gailly (compression) and Mark Adler (decompression). See:
- @li <A HREF="http://www.ietf.org/rfc/rfc1950.txt">RFC1950, zlib format</A>
- @li <A HREF="http://www.ietf.org/rfc/rfc1951.txt">RFC1951, deflate format</A>
- @li <A HREF="http://www.ietf.org/rfc/rfc1952.txt">RFC1952, gzip</A>.</td></tr>
-
-</table>
-*/
--- a/cryptomgmtlibs/securitydocs/doxygen_docs/Security_intro.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-/**
-@page Security_intro Introduction to Security
-
-@li @ref Security_intro_PKC
-@li @ref Security_intro_certificates
-@li @ref Security_signatures
-
-
-*/
\ No newline at end of file
--- a/cryptomgmtlibs/securitydocs/doxygen_docs/Security_intro_PKC.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/**
-@page Security_intro_PKC Public Key Cryptography
-\n
-
-Public key (sometimes called @ref asymmetric) cryptography allows encrypted messages to be sent without the need to establish a
-shared secret key. It involves the use of two keys called a key pair: a private key and a public key. The private key is
-kept secret, and a public key is made publically available.
-
-All entities using such a system would typically possess a key pair. They will use these keys either for @ref encryption or
-@ref decryption. In any case, if one of the keys is used for @ref encryption, then only the other key can be used for @ref decryption.
-
-So, in public key cryptography, to send a message in an encrypted form to a receiver, the sender:
-@li Gets hold of the receiver's public key.
-@li Encrypts the message with the receiver's public key.
-@li Sends the encrypted message.
-
-The receiver then decrypts the message using its private key. Only the receiver, who has access to the corresponding
-private key, can decrypt it.
-
-That is the basic process used for a pure PKC system. In the real world, however, public key cryptography is typically
-used in conjunction with traditional symmetric key cryptography. This is done in order to reduce key management problems
-while at same time taking advantage of the superior speed of the latter. The method for doing this is called a digital
-envelope: a random symmetric private secret key is generated, the message is encrypted with this secret key using a
-symmetric algorithm, and then the secret key is encrypted with the receiver's public key using an @ref asymmetric algorithm.
-
-The other main use for public key cryptography is in signing (see: @ref Security_signatures).
-
-While public key cryptography ensures that only the entity with access to the corresponding key will be able to read the
-message or could have signed a given message, it gives no assurance that this entity is/are actually the entity they
-claim to be. This is where certificates come in. @ref Security_intro_certificates are needed to solve the problem of
-@ref authentication.
-
-
-
-*/
\ No newline at end of file
--- a/cryptomgmtlibs/securitydocs/doxygen_docs/Security_intro_certificates.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/**
-@page Security_intro_certificates Certificates
-
-A @ref certificate binds a public key to a certain individual/entity. This is usually done using @ref digital_signature "digital signatures": if a
-@ref certificate bearing a public key and an individual's name is signed with a key pair which you already trust, then you can
-rest assure that the public key in the @ref certificate really does belong to the individual named in the @ref certificate.
-
-Different standards using public key cryptography employ different models for using certificates to establish trust.
-Such a model, encompassing data structures, rules for their use, and users of them, may be referred to as a
-@ref PKI "Public Key Infrastructure" (PKI). @ref SSL, @ref TLS and @ref SMIME "S/MIME" all use @ref X509 "X.509" v.3 certificates, and a
-hierarchical @ref PKI in which users are certified by @ref CA "Certification Authorities" (CAs).
-
-All data which appear in the interface between the Symbian OS and the rest of the world need a transport encoding, and it
-is in this form that they are sent and received. The transport encoding for @ref X509 "X.509" data structures is @ref DER encoded
-@ref ASN "ASN.1".
-
-@section certification_authorities Certification Authorities
-
-@ref CA "Certification Authorities" (CAs) are trusted third parties which perform the following functions in the @ref PKIX public
-key infrastructure:
-
-@li provide trusted 'root' certificates to users (@ref EE "End Entities"), by supplying them with the @ref CA's public key
-@li certifying End Entities: checking that they are who they say they are, and generating certificates for them. The
-certified End Entity is the \b subject of the @ref certificate: the @ref CA is the \b issuer
-@li supporting @ref certificate revocation and revocation checking: if an End Entity suspects that their key has been
-compromised, they contact the Certification Authority which issued it. @ref CA "CA"s publish lists of revoked certificates
-(known as @ref CRL "Certificate Revocation Lists") at regular intervals, which End Entities can use to check that
-certificates sent to them have not been revoked
-@li publishing certificates: the most likely place for this is an LDAP directory, since @ref X509_certificate "X.509 certificates" identify
-their subjects and issuers by describing a path through an X.500 directory
-
-
-*/
\ No newline at end of file
--- a/cryptomgmtlibs/securitydocs/doxygen_docs/Security_intro_signatures.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-/**
-@page Security_signatures Digital signatures
-
-A digital signature is used to verify that a message (or data) actually came from the sender (the one who signed the
-message) and that it has not been tampered with.
-
-A signature is formed by producing a fixed-length digest (@ref hash) of the message using a hash algorithm, which is then
-encrypted using the sender's private key. This signature and the message are then sent to the recipient.
-
-The receiver can then verify the signature as follows: a @ref hash is produced of the sender's message (using the hashing
-algorithm sent with the signature); also, using the sender's public key, their signature is decrypted into a @ref hash.
-These two hashes are compared: if they are the same, it is more or less certain that the public key used for the
-@ref decryption corresponds to the private key used to create the signature, thus data integrity is validated.
-
-
-*/
\ No newline at end of file
--- a/cryptomgmtlibs/securitydocs/ocsp.txt Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-How to use OSCP
-===============
-
-Note: The actual code snippets are indented.
-
-Include ocsp.h in your header file.
-
- #include <ocsp.h>
-
-Link your project with ocsp.lib: add the following string to your project's .mmp
-file:
-
- LIBRARY ocsp.lib
-
-Add the following to your class declaration, which should be derived from
-CActive:
-
- COcspClient* iOcspClient;
-
-You will need to know revocation server URI. It is possible to get it from
-installer preferences. Most Software Install components accept the URI as a
-construction parameter. This is because they are started by the UI which stores
-preferences in its resource file. If you want to retrieve it yourself, you can
-use the following code (taken from InstallEngineImpl.cpp):
-
- // Open instapp's ini file
- static CDictionaryStore* OpenIniFileLC(RFs& aFs)
- {
- CApaAppFinder* appFinder=CApaScanningAppFinder::NewL(aFs);
- CleanupStack::PushL(appFinder);
- TUid instAppUid={KUidInstallAppValue};
- TFileName libName=appFinder->FindAppL(KInstallAppName,instAppUid);
- CleanupStack::PopAndDestroy(appFinder);
- TParse parser;
- User::LeaveIfError(parser.SetNoWild(KIniFileExtension,&KInstAppDriveC(),
- &libName));
- aFs.MkDirAll(parser.FullName()); // ignore the error
- CDictionaryFileStore* dict = CDictionaryFileStore::OpenLC(aFs,
- parser.FullName(),instAppUid);
- return dict;
- }
-
- // get preferences from ini file
- {
- RFs fs;
- User::LeaveIfError(fs.Connect());
- CleanupClosePushL(fs);
- CDictionaryStore* iniFile=OpenIniFileLC(fs); // see above
- User::LeaveIfNull(iniFile);
- RDictionaryReadStream readStream;
- readStream.OpenLC(*iniFile,KUidInstallPrefs);
- TInstallPrefs prefs; // this is what you need
- TRAPD(ret,readStream >> prefs); // will return KErrEof first time
- CleanupStack::PopAndDestroy(2); //readStream, iniFile
- CleanupStack::Pop(); // fs
- fs.Close();
- }
-
-If at any time you want to cancel OCSP check, call
-
- iOcspClient->CancelCheck();
-
-When ready to perform the check (the certificate chain is built), use the
-following code as a template (from JavaInstallerSecurityManager.cpp):
-
- COCSPParameters* params = COCSPParameters::NewLC();
- params->SetURIL(*iOCSPServerURI, ETrue);
- params->AddCertificatesL(*iCertChain);
-
- // Set up authorisation scheme - we've a special UID registered with the
- // certStore for the appropriate certificates
- COCSPDirectAuthorisationScheme* scheme =
- COCSPDirectAuthorisationScheme::NewLC(
- TUid::Uid(KCertStoreUIDForSWInstallOCSPSigning));
- params->AddAuthorisationSchemeL(scheme);
- CleanupStack::Pop(scheme);
-
- // Won't set validation time - this uses the response producedAt time
- // instead. This avoids us relying on an accurate time in the device.
- // Caching of old responses avoided by use of the nonce.
-
- iOcspClient = COcspClient::NewL(params);
- CleanupStack::Pop(params);
- iOcspClient->Check(iStatus);
-
-When the request completes and your class's RunL() is called, use the following
-function template to process the result:
-
- TBool accept = ETrue;
- switch (iStatus.Int())
- {
- case OCSP::KErrNoCertificates:
- // No certs in OCSP request - no proper cert chain formed.
- // Covered by check digital sig logic already, so we let it pass.
- break;
- case KErrNone:
- {
- // Check the outcome of every transaction made
- for (TInt index = 0;
- accept && index < iOcspClient->TransactionCount();
- ++index)
- {
- const TOCSPOutcome& outcome = iOcspClient->Outcome(index);
-
- // We have the OCSP response. Interpret it, asking the user
- // what questions we need to. Return determines whether we
- // continue the install
- switch (outcome.iStatus)
- {
- case OCSP::ETransportError:
- case OCSP::EClientInternalError:
- case OCSP::EMalformedRequest:
- case OCSP::EServerInternalError:
- case OCSP::ETryLater:
- case OCSP::ESignatureRequired:
- case OCSP::EClientUnauthorised:
- case OCSP::EUnknownResponseType:
- // Error: unable to obtain certificate status
- break;
- case OCSP::ENoServerSpecified:
- case OCSP::EInvalidURI:
- // Error: invalid revocation server URI
- break;
- case OCSP::EResponseSignatureValidationFailure:
- // Error: response signature validation failed
- break;
- case OCSP::EThisUpdateTooLate:
- case OCSP::EThisUpdateTooEarly:
- case OCSP::ENextUpdateTooEarly:
- case OCSP::ENonceMismatch:
- case OCSP::EMalformedResponse:
- case OCSP::EUnknownCriticalExtension:
- case OCSP::EMissingCertificates:
- // Error: invalid server response
- break;
- case OCSP::EMissingNonce:
- // Error: missing nonce
- break;
- case OCSP::ECertificateNotValidAtValidationTime:
- // Error: invalid certificate status information
- break;
- case OCSP::EValid:
- switch(outcome.iResult)
- {
- case OCSP::EGood:
- accept = ETrue;
- break;
- case OCSP::EUnknown:
- // ask user
- break;
- case OCSP::ERevoked:
- // ask user
- break;
- default:
- ASSERT(EFalse);
- }
- break;
- default:
- ASSERT(EFalse);
- break;
- }
- }
- break;
- }
- default:
- // Error: cannot obtain certificate status, ask user
- break;
- }
-
- delete iOcspClient;
- iOcspClient = NULL;
-
-OCSP check can take a long time. Therefore it is a good thing to display a
-status dialog for the user telling her that OCSP check is in progress and
-allowing her to cancel it. Both SIS and Java installers delegate this function
-to their respective UI handlers.
--- a/cryptomgmtlibs/securitydocs/security_documentation.history.xml Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<relnotes name="DEVELOPERLIBRARY">
- <purpose>
- </purpose>
-
- <defect number="DEF132732" title="Wrong 'CreateHashFuncLv2' definition in pluginentrydef.h" revision="007">
- corrected the word document section 5.b
- Changed method name from 'CreateHashFuncL' to 'CreateHashFuncLv2'
- </defect>
-
- <defect number="DEF124792" title="JMI certificate documentation needs to be updated" revision="006">
- How to configure certstore to install signed midlet is updated in the documentation
- </defect>
-
- <defect number="DEF124949" title="swicertstoretool.mmp location" revision="005">
- Changes in the documentation How-to Configure the SWI Certificate Store to update swicertstoretool.mmp location and SU flag.
- </defect>
-
- <deliverystep number="708" name="Security - Alignment of CBR and System Model components" osproject="Oghma" revision="004">
- <milestone project="GT0313" number="MS3.7"/>
- <preq number="775" title="Alignment of CBR and System Model components">
- Changed the OSD and ipr category.
- </preq>
- </deliverystep>
-
- <defect number="PDEF108896" title="Doc "How-to configure SWI cert store" is out-of-date" revision="003">
- The document(Appendix section) is changed that all four certificates are used by the Software Installer and are placed in swicertstore.
- </defect>
-
- <minorchange revision="002">
- Updated SWI daemon documentation in the SWI design doc.
- </minorchange>
-
- <minorchange revision="001">
- Updated PC Connectivity documentation in TS0013.604
- </minorchange>
-</relnotes>
--- a/cryptomgmtlibs/securitydocs/security_documentation.mrp Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +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 "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:
-#
-
-component security_documentation
-
-source \sf\os\security\cryptomgmtlibs\securitydocs\
-
-notes_source \component_defs\release.src
-
-
-ipr G
-
--- a/cryptomgmtlibs/securitytestfw/group/bld.inf Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/group/bld.inf Mon May 03 14:11:52 2010 +0300
@@ -54,7 +54,6 @@
../test/autotesting/autosimtsy.cfg /epoc32/winscw/c/autosimtsy.cfg
../test/autotesting/dummytefscript.script /epoc32/winscw/c/dummytefscript.script
-../test/autotesting/testMakesis.pl /epoc32/winscw/c/tswi/testmakesis.pl
../test/autotesting/panicscan.pl /epoc32/winscw/c/tswi/panicscan.pl
../test/autotesting/panicscan_authserver.pl /epoc32/winscw/c/tswi/panicscan_authserver.pl
../test/autotesting/checklocationofcertificates.pl /epoc32/winscw/c/checklocationofcertificates.pl
@@ -75,62 +74,37 @@
../test/autotesting/testsecurity_sdp.bat /epoc32/winscw/c/autohardware/testsecurity_sdp.bat
../test/autotesting/testsecurity_sdp_auth.bat /epoc32/winscw/c/autohardware/testsecurity_sdp_auth.bat
../test/autotesting/testsecurity_sdp_newrom.bat /epoc32/winscw/c/autohardware/testsecurity_sdp_newrom.bat
- ../test/autotesting/testsecurity_9.4_mcs.bat /epoc32/winscw/c/autohardware/testsecurity_9.4_mcs.bat
- ../test/autotesting/testsecurity_9.4_mcs_vfuture.bat /epoc32/winscw/c/autohardware/testsecurity_9.4_mcs_vfuture.bat
- ../test/autotesting/testsecurity_9.4_nonmcs.bat /epoc32/winscw/c/autohardware/testsecurity_9.4_nonmcs.bat
- ../test/autotesting/runcertman_9.5.bat /epoc32/winscw/c/autohardware/runcertman_9.5.bat
-
- ../test/autotesting/testsecurity_9.5_mcs.bat /epoc32/winscw/c/autohardware/testsecurity_9.5_mcs.bat
- ../test/autotesting/testsecurity_9.6_mcs.bat /epoc32/winscw/c/autohardware/testsecurity_9.6_mcs.bat
- ../test/autotesting/testsecurity_9.5_nonmcs.bat /epoc32/winscw/c/autohardware/testsecurity_9.5_nonmcs.bat
- ../test/autotesting/testsecurity_9.6_nonmcs.bat /epoc32/winscw/c/autohardware/testsecurity_9.6_nonmcs.bat
- ../test/autotesting/switextshell_nonmcs.bat /epoc32/winscw/c/autohardware/switextshell_nonmcs.bat
-
-#ifdef SYMBIAN_JAVA_NOT_INCLUDED
- ../test/autotesting/testsecurity_9.6_crypto.bat /epoc32/winscw/c/autohardware/testsecurity_9.6_crypto.bat
-#else
- ../test/autotesting/runjavamidletinstaller_9.4.bat /epoc32/winscw/c/autohardware/runjavamidletinstaller_9.4.bat
- ../test/autotesting/testsecurity_9.4_java.bat /epoc32/winscw/c/autohardware/testsecurity_9.4_java.bat
- ../test/autotesting/testsecurityonlyjava.bat /epoc32/winscw/c/autohardware/testsecurityonlyjava.bat
-#endif
+ ../test/autotesting/runcertman.bat /epoc32/winscw/c/autohardware/runcertman.bat
#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
../test/autotesting/runcrypto_wmdrm.bat /epoc32/winscw/c/autohardware/runcrypto_wmdrm.bat
../test/autotesting/runfiletokens_disableauth_with_wmdrm.bat /epoc32/winscw/c/autohardware/runfiletokens_disableauth_with_wmdrm.bat
#endif
-#ifdef SYMBIAN_CRYPTOSPI
- ../test/autotesting/runcrypto_9.5.bat /epoc32/winscw/c/autohardware/runcrypto_9.5.bat
- ../test/autotesting/runhardwarecrypto.bat /epoc32/winscw/c/autohardware/runhardwarecrypto.bat
-#else
- ../test/autotesting/runcrypto_9.4.bat /epoc32/winscw/c/autohardware/runcrypto_9.4.bat
-#endif
- ../test/autotesting/runcryptotokens_9.4.bat /epoc32/winscw/c/autohardware/runcryptotokens_9.4.bat
- ../test/autotesting/runasnpkcs_9.4.bat /epoc32/winscw/c/autohardware/runasnpkcs_9.4.bat
+
+../test/autotesting/runcrypto.bat /epoc32/winscw/c/autohardware/runcrypto.bat
+../test/autotesting/runhardwarecrypto.bat /epoc32/winscw/c/autohardware/runhardwarecrypto.bat
+../test/autotesting/runcryptotokens.bat /epoc32/winscw/c/autohardware/runcryptotokens.bat
+../test/autotesting/runasnpkcs.bat /epoc32/winscw/c/autohardware/runasnpkcs.bat
+
#ifdef SYMBIAN_AUTH_SERVER
../test/autotesting/runfiletokens_useauth.bat /epoc32/winscw/c/autohardware/runfiletokens_useauth.bat
../test/autotesting/runfiletokens_disableauth.bat /epoc32/winscw/c/autohardware/runfiletokens_disableauth.bat
+ ../test/autotesting/runauthtests.bat /epoc32/winscw/c/autohardware/runauthtests.bat
+ ../test/autotesting/runauthtests_macroenabled.bat /epoc32/winscw/c/autohardware/runauthtests_macroenabled.bat
#else
- ../test/autotesting/runfiletokens_9.4.bat /epoc32/winscw/c/autohardware/runfiletokens_9.4.bat
+ ../test/autotesting/runfiletokens.bat /epoc32/winscw/c/autohardware/runfiletokens.bat
#endif // SYMBIAN_AUTH_SERVER
- ../test/autotesting/runsisinstaller_9.4.bat /epoc32/winscw/c/autohardware/runsisinstaller_9.4.bat
-
- ../test/autotesting/runswiromtests_9.6.bat /epoc32/winscw/c/autohardware/runswiromtests_9.6.bat
- ../test/autotesting/runswiromtests_9.5.bat /epoc32/winscw/c/autohardware/runswiromtests_9.5.bat
+../test/autotesting/runupstests.bat /epoc32/winscw/c/autohardware/runupstests.bat
+../test/autotesting/runpkcs12tests.bat /epoc32/winscw/c/autohardware/runpkcs12tests.bat
-../test/autotesting/runswiromtests_9.4_mcs.bat /epoc32/winscw/c/autohardware/runswiromtests_9.4_mcs.bat
-../test/autotesting/runauthtests.bat /epoc32/winscw/c/autohardware/runauthtests.bat
-../test/autotesting/runauthtests_macroenabled.bat /epoc32/winscw/c/autohardware/runauthtests_macroenabled.bat
-../test/autotesting/runupstests_9.4.bat /epoc32/winscw/c/autohardware/runupstests_9.4.bat
-../test/autotesting/runpkcs12tests_9.4.bat /epoc32/winscw/c/autohardware/runpkcs12tests_9.4.bat
-../test/autotesting/runusiftests.bat /epoc32/winscw/c/autohardware/runusiftests.bat
../test/autotesting/runcommonutilstests.bat /epoc32/winscw/c/autohardware/runcommonutilstests.bat
../test/autotesting/testsecurityperformance_cryptalg.bat /epoc32/winscw/c/autohardware/testsecurityperformance_cryptalg.bat
../test/autotesting/testsecurityperformance_crypto.bat /epoc32/winscw/c/autohardware/testsecurityperformance_crypto.bat
-../test/autotesting/runcaftests_9.5.bat /epoc32/winscw/c/autohardware/runcaftests_9.5.bat
-../test/autotesting/runcaftests_9.6.bat /epoc32/winscw/c/autohardware/runcaftests_9.6.bat
+../test/autotesting/runcaftests.bat /epoc32/winscw/c/autohardware/runcaftests.bat
+
#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
../test/autotesting/runcaftests_wmdrm.bat /epoc32/winscw/c/autohardware/runcaftests_wmdrm.bat
--- a/cryptomgmtlibs/securitytestfw/inc/SecurityTests.iby Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/inc/SecurityTests.iby Mon May 03 14:11:52 2010 +0300
@@ -24,7 +24,6 @@
// Save build details in ROM
data=\buildid.txt \buildid.txt
-define ZDRIVE \epoc32\winscw\c
// This should be included in the Techview.oby file
// All test data and scripts gets copied to the root of ROM drive.
@@ -38,146 +37,65 @@
PlatSecEnforceSysBin ON
PlatSecProcessIsolation ON
}
+
#include "setcap.iby"
-#include "testutil.iby"
+
#include "testexecute.iby"
#include "t_testhandler.iby"
-#include "xml.iby" // Needed for security tests
+#include "testutil.iby"
+//#include "xml.iby" // Needed for security tests
#include "securityframeworktestserver.iby"
+
+
+#if defined SYMBIAN_KEYSTORE_USE_AUTH_SERVER || defined SDP_ROM1
+
+ #include "ups.iby"
+ #include "tups.iby"
+ #include "asnpkcstests.iby"
+ #include "certmantests.iby"
+ #include "tpkcs7server.iby"
+ #include "tpkcs12integrationserver.iby"
+ #include "ctframeworktests.iby"
+#else
+ #include "streamingcaf.iby"
+ // iby files for caf
+ #include "caf.iby"
+ #include "caftest.iby"
+ #include "reccafconfig.iby"
+ #include "rta.iby"
+ #include "rtatest.iby"
+ #include "cryptotests.iby"
+ #include "tscaf.iby"
+ #include "randomtests.iby"
+ #include "hashtests.iby"
+
+ #ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
+ #include "mtputils.iby"
+ #include "mtputilstest.iby"
+ #include "refcafhelper.iby"
+ #endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
+
+#endif
+
+
// Common utils libraries
#include "securitycommonutils.iby"
-// Common utils libraries test
-#include "installtestframework.iby"
-#include "securitytestframework.iby"
-
-#include "streamingcaf.iby"
-
-#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
-#include "mtputils.iby"
-#endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
-
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- //Universal Software Install Framework production
- #include "scr.iby" // Software Component Registry
- #include "sif.iby" // Software Install Framework
- #include "sts.iby" // Software Transaction Services
- #include "sifrefinstaller.iby" // Sif Reference Installer
-#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-
-#ifdef __SECURITY_NORMAL_SWICERTSTORE__
-
- #ifdef __SECURITY_ONLYJAVA__
-
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- #include "sisinstallertest.iby"
- #include "JavaMIDletInstallerTest.iby"
- #include "rtatest.iby"
- #include "recjar.iby"
- #endif
- #elif __SECURITY_NORMAL__
-
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- #include "sisinstallertest.iby"
- #endif
-
- #include "tsistestdata.iby"
+#include "securitytestframework.iby"
+#include "secutiltests.iby"
- ECOM_PLUGIN(tsecdlg.dll, 10204789.rsc)
-
- #include "tups.iby"
- #include "ups.iby"
- // iby files for caf
- #include "caf.iby"
- #include "caftest.iby"
- #include "reccafconfig.iby"
- #include "rta.iby"
- #include "rtatest.iby"
- #include "tpkcs12integrationserver.iby"
- // Dependency
- file=ABI_DIR\BUILD_DIR\pkcs7.dll System\Libs\pkcs7.dll
-
- #include "tscaf.iby"
-
- #ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
- #include "mtputilstest.iby"
- #endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
-
- #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- //Universal Software Install Framework tests
- #include "tscr.iby"
- #include "tsif.iby"
- #include "tsts.iby"
- #include "tsifrefinstaller.iby"
- #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-
-
-
-
-
-
- // Extra test data
- #include "tswi.iby"
- #include "tswiconsole.iby"
- #include "tsissignedtestdata.iby"
- #include "secutiltests.iby"
-
- #endif
+//filetokens and authserver run in both the images.
+#include "filetokenstests.iby"
-
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- // Jar/Jad recogniser needed for CAF tests
- #include "recjar.iby"
- #endif
-
-#elif __SECURITY_MANDATORY_SWICERTSTORE__
- // Temp
- #include "cryptodeps.iby"
-
- #include "randomtests.iby"
- #include "hashtests.iby"
- #include "certmantests.iby"
- #include "ctframeworktests.iby"
- #include "tpkcs7server.iby"
- #include "filetokenstests.iby"
- #include "asnpkcstests.iby"
- #include "tsiscorrupttestdata.iby"
- // uncomment authserver tests when authserver gets released
- #ifdef SYMBIAN_AUTH_SERVER
- #include "tAuthSvr.iby"
- #endif // SYMBIAN_AUTH_SERVER
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- // Jar Download Reference Filter - sets user agent
- ECOM_PLUGIN(midletuaheaderfilter.dll,10200a88.rsc)
- #endif
-
- // Extra test data
- #include "tswi.iby"
- #include "tswiconsole.iby"
- #include "tsissignedtestdata.iby"
- #include "secutiltests.iby"
-#elif __SECURITY_JAVA__
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- #include "JavaMIDletInstallerTest.iby"
- #endif
-
- #include "cryptotests.iby"
- #include "randomtests.iby"
- #include "hashtests.iby"
- #include "rtatest.iby"
- #include "rta.iby"
-#endif
-
-
-//***********
-// REMOVE ME WHEN AUTHSERVER IS ADDED TO MAIN BUILD
-//***********
#ifdef SYMBIAN_AUTH_SERVER
+ #include "tAuthSvr.iby"
#include "authserver.iby"
#include "pinplugin.iby"
#endif // SYMBIAN_AUTH_SERVER
+
+define ZDRIVE \epoc32\winscw\c
// This is the bat file to run the security tests automatically
// comms configuration (and configuration using sim.tsy)
data = ZDRIVE\auto.cfg \auto.cfg
@@ -189,113 +107,83 @@
data = ZDRIVE\autohardware\hosts \hosts
-
#ifdef __AUTO_HARDWARE_TESTS__
data = ZDRIVE\autohardware\autoexec.bat \autoexec.bat
#endif
-#ifdef __SECURITY_NORMAL_SWICERTSTORE__
-
- #ifdef __SECURITY_ONLYJAVA__
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- data = ZDRIVE\autohardware\runjavamidletinstaller_9.4.bat \runjavamidletinstaller.bat
- data = ZDRIVE\autohardware\runsisinstaller_9.4.bat \runsisinstaller.bat
- data = ZDRIVE\autohardware\testsecurityonlyjava.bat \testsecurity.bat
- #endif
- #elif __SECURITY_NORMAL__
- #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- data = ZDRIVE\autohardware\testsecurity_9.6_nonmcs.bat \testsecurity.bat
- data = ZDRIVE\autohardware\runswiromtests_9.6.bat \runswiromtests.bat
- data = ZDRIVE\autohardware\runusiftests.bat \runusiftests.bat
- data = ZDRIVE\autohardware\runcommonutilstests.bat \runcommonutilstests.bat
- #else
- data = ZDRIVE\autohardware\testsecurity_9.5_nonmcs.bat \testsecurity.bat
- data = ZDRIVE\autohardware\runswiromtests_9.5.bat \runswiromtests.bat
- #endif
+data = ZDRIVE\autohardware\runcertman.bat \runcertman.bat
+data = ZDRIVE\autohardware\runasnpkcs.bat \runasnpkcs.bat
+data = ZDRIVE\autohardware\runcryptotokens.bat \runcryptotokens.bat
+data = ZDRIVE\autohardware\runupstests.bat \runupstests.bat
+data = ZDRIVE\autohardware\runpkcs12tests.bat \runpkcs12tests.bat
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- data = ZDRIVE\autohardware\runsisinstaller_9.4.bat \runsisinstaller.bat
- #endif
-
-
-
- data = ZDRIVE\autohardware\runupstests_9.4.bat \runupstests.bat
- data = ZDRIVE\autohardware\runpkcs12tests_9.4.bat \runpkcs12tests.bat
-
-#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
- data = ZDRIVE\autohardware\runcaftests_wmdrm.bat \runcaftests.bat
+ data = ZDRIVE\autohardware\runcaftests_wmdrm.bat \runcaftests.bat
#else
- data = ZDRIVE\autohardware\runcaftests_9.6.bat \runcaftests.bat
+ data = ZDRIVE\autohardware\runcaftests.bat \runcaftests.bat
#endif
-#else
- data = ZDRIVE\autohardware\runcaftests_9.5.bat \runcaftests.bat
-#endif
-
- #endif
-#elif __SECURITY_MANDATORY_SWICERTSTORE__
-
- #ifdef SYMBIAN_AUTH_SERVER
- #ifdef SYMBIAN_ENABLE_POST_MARKET_AUTHENTICATION_PLUGINS
- data = ZDRIVE\autohardware\runauthtests_macroenabled.bat \runauthtests.bat
- data = ZDRIVE\autohardware\testsecurity_9.6_mcs.bat \testsecurity.bat
- #else
- data = ZDRIVE\autohardware\testsecurity_9.6_mcs.bat \testsecurity.bat
- data = ZDRIVE\autohardware\runauthtests.bat \runauthtests.bat
- #endif //SYMBIAN_ENABLE_POST_MARKET_AUTHENTICATION_PLUGINS
- #ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
- data = ZDRIVE\autohardware\runfiletokens_useauth.bat \runfiletokens.bat
- #elif SYMBIAN_AUTH_SERVER
- data = ZDRIVE\autohardware\runfiletokens_disableauth.bat \runfiletokens.bat
- #endif // SYMBIAN_KEYSTORE_USE_AUTH_SERVER
- #else
- data = ZDRIVE\autohardware\runfiletokens_9.4.bat \runfiletokens.bat
- data = ZDRIVE\autohardware\testsecurity_9.5_mcs.bat \testsecurity.bat
- #endif // SYMBIAN_AUTH_SERVER
-
- data = ZDRIVE\autohardware\runcertman_9.5.bat \runcertman.bat
- data = ZDRIVE\autohardware\runasnpkcs_9.4.bat \runasnpkcs.bat
- data = ZDRIVE\autohardware\runcryptotokens_9.4.bat \runcryptotokens.bat
- data = ZDRIVE\autohardware\runswiromtests_9.4_mcs.bat \runswiromtests.bat
-
-#elif __SECURITY_JAVA__
-
-#ifndef SYMBIAN_JAVA_NOT_INCLUDED
-
- data = ZDRIVE\autohardware\runjavamidletinstaller_9.4.bat \runjavamidletinstaller.bat
- data = ZDRIVE\autohardware\testsecurity_9.4_java.bat \testsecurity.bat
+#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
+ data = ZDRIVE\autohardware\runcrypto_wmdrm.bat \runcrypto.bat
#else
- data = ZDRIVE\autohardware\testsecurity_9.6_crypto.bat \testsecurity.bat
+ data = ZDRIVE\autohardware\runcrypto.bat \runcrypto.bat
#endif
-#ifdef SYMBIAN_CRYPTOSPI
- data = ZDRIVE\autohardware\runcrypto_9.5.bat \runcrypto.bat
-#else
- data = ZDRIVE\autohardware\runcrypto_9.4.bat \runcrypto.bat
-#endif
-#endif
+
data = ZDRIVE\autohardware\testsecurityperformance_cryptalg.bat \testsecurityperformance_cryptalg.bat
data = ZDRIVE\autohardware\testsecurityperformance_crypto.bat \testsecurityperformance_crypto.bat
+#ifdef SYMBIAN_AUTH_SERVER
+#ifdef SYMBIAN_ENABLE_POST_MARKET_AUTHENTICATION_PLUGINS
+ data = ZDRIVE\autohardware\runauthtests_macroenabled.bat \runauthtests.bat
+#else
+ data = ZDRIVE\autohardware\runauthtests.bat \runauthtests.bat
+#endif //SYMBIAN_ENABLE_POST_MARKET_AUTHENTICATION_PLUGINS
+#ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
+ data = ZDRIVE\autohardware\runfiletokens_useauth.bat \runfiletokens.bat
+#else
+ #ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
+ data = ZDRIVE\autohardware\runfiletokens_disableauth_with_wmdrm.bat \runfiletokens.bat
+ #else
+ data = ZDRIVE\autohardware\runfiletokens_disableauth.bat \runfiletokens.bat
+ #endif
+#endif // SYMBIAN_KEYSTORE_USE_AUTH_SERVER
+#else
+ data = ZDRIVE\autohardware\runfiletokens.bat \runfiletokens.bat
+#endif // SYMBIAN_AUTH_SERVER
+
+#ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
+ data = ZDRIVE\autohardware\testsecurity_sdp_auth.bat \testsecurity.bat
+#else
+#ifdef SDP_ROM1
+ data = ZDRIVE\autohardware\testsecurity_sdp_newrom.bat \testsecurity.bat
+#else
+ data = ZDRIVE\autohardware\testsecurity_sdp.bat \testsecurity.bat
+#endif
+#endif
+
+
+
+
//estor.dll is put in ROFS by deafult but we need to put it into CORE as well
//core version will be used; see DEF113303 for details
#ifdef __SECURITY_TEST_ROM__
#ifdef _INTERNAL_MMC
-ROM_IMAGE[0]{
+ROM_IMAGE[0] {
file = \epoc32\release\armv5\urel\estor.dll \sys\bin\estor.dll
}
-#elif _NAND2
+#else
+#ifdef _NAND2
ROM_IMAGE[0] {
file = \epoc32\release\armv5\urel\estor.dll \sys\bin\estor.dll
}
#endif
#endif
-
+#endif
REM ---------- Comms-Infras ----------
// ced is not included in release builds by default (in commdb.iby)
@@ -310,7 +198,6 @@
#include "thindump.iby"
#include "sntpclient.iby"
-
// *** Additional includes and configuration for SSM Requirements ***
#ifdef _SSMSTARTUPMODE
data=MULTI_LINGUIFY(RSC EPOCROOT##epoc32\data\z\private\2000d75b\startup\0\eshell private\2000d75b\startup\0\eshell)
@@ -328,5 +215,3 @@
#include "ocsptests.iby"
#endif
-
-
--- a/cryptomgmtlibs/securitytestfw/inc/SecurityTests_apr_9.5.iby Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +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:
-*
-*/
-
-#ifndef __SECURITYTESTS_IBY__
-#define __SECURITYTESTS_IBY__
-
-// We need bigger ROFS files for tests with TBAS
-rofssize=0x2100000
-
-// Save build details in ROM
-data=\buildid.txt \buildid.txt
-
-
-
-// This should be included in the Techview.oby file
-// All test data and scripts gets copied to the root of ROM drive.
-// This should be copied to the relevant directory on the C drive.
-
-// platsec.oby should be included, but a problem in rombuild prevents build with watchers disabled and PlatSecEnforceSysBin ON
-//#include "platsec.oby"
-ROM_IMAGE[0] {
-PlatSecDiagnostics ON
-PlatSecEnforcement ON
-PlatSecEnforceSysBin ON
-PlatSecProcessIsolation ON
-}
-
-#include "setcap.iby"
-
-#include "testexecute.iby"
-
-#include "xml.iby" // Needed for security tests
-
-
-#include "streamingcaf.iby"
-
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- //Universal Software Install Framework production
- #include "scr.iby" // Software Component Registry
- #include "sif.iby" // Software Install Framework
- #include "sts.iby" // Software Transaction Services
- #include "sifrefinstaller.iby" // Sif Reference Installer
-#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-
-#include "securitycommonutils.iby"
-// Common utils libraries test
-#include "installtestframework.iby"
-#include "aprrtautils.iby"
-
-#ifdef __SECURITY_NORMAL_SWICERTSTORE__
-
- #ifdef __SECURITY_ONLYJAVA__
-
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- #include "sisinstallertest.iby"
- #include "JavaMIDletInstallerTest.iby"
- #include "recjar.iby"
- #endif
- #elif __SECURITY_NORMAL__
-
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- #include "sisinstallertest.iby"
- #endif
-
- #include "tsistestdata.iby"
-
- #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- //Universal Software Install Framework tests
- #include "tscr.iby"
- #include "tsif.iby"
- #include "tsts.iby"
- #include "tsifrefinstaller.iby"
- #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-
- // Extra test data
- #include "tswi.iby"
- #include "tswiconsole.iby"
- #include "tsissignedtestdata.iby"
-
- #endif
-
-
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- // Jar/Jad recogniser needed for CAF tests
- #include "recjar.iby"
- #endif
- #include "rta.iby"
-
-
-#elif __SECURITY_MANDATORY_SWICERTSTORE__
- // SWI cert store data file, with Root5CA mandatory
- data = \epoc32\winscw\c\tswi\certstore\swicertstore_mandatory.dat resource\swicertstore.dat attrib=r
-
- #include "tsiscorrupttestdata.iby"
-
- // Extra test data
- #include "tswi.iby"
- #include "tswiconsole.iby"
- #include "tsissignedtestdata.iby"
-
-
-#elif __SECURITY_JAVA__
-
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- #include "JavaMIDletInstallerTest.iby"
- #endif
-
- #include "rta.iby"
-#endif
-
-
-define ZDRIVE \epoc32\winscw\c
-// This is the bat file to run the security tests automatically
-// comms configuration (and configuration using sim.tsy)
-data = ZDRIVE\auto.cfg \auto.cfg
-data = ZDRIVE\auto_broken.cfg \auto_broken.cfg
-data = ZDRIVE\autosimtsy.cfg \autosimtsy.cfg
-data = ZDRIVE\prompt.cfg \prompt.cfg
-
-// This the file which used to redirect the request from cam-ocsptest01 to ban-ocsptest01
-data = ZDRIVE\autohardware\hosts \hosts
-
-#ifdef __AUTO_HARDWARE_TESTS__
- data = ZDRIVE\autohardware\autoexec.bat \autoexec.bat
-#endif
-
-#ifdef __SECURITY_NORMAL_SWICERTSTORE__
-
- #ifdef __SECURITY_ONLYJAVA__
-
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- data = ZDRIVE\autohardware\runjavamidletinstaller_9.4.bat \runjavamidletinstaller.bat
- data = ZDRIVE\autohardware\runsisinstaller_9.4.bat \runsisinstaller.bat
- data = ZDRIVE\autohardware\testsecurityonlyjava.bat \testsecurity.bat
- #endif
- #elif __SECURITY_NORMAL__
- #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- data = ZDRIVE\autohardware\testsecurity_9.6_nonmcs.bat \testsecurity.bat
- data = ZDRIVE\autohardware\runswiromtests_9.6.bat \runswiromtests.bat
- data = ZDRIVE\autohardware\runusiftests.bat \runusiftests.bat
- data = ZDRIVE\autohardware\runcommonutilstests.bat \runcommonutilstests.bat
- #else
- data = ZDRIVE\autohardware\testsecurity_9.5_nonmcs.bat \testsecurity.bat
- data = ZDRIVE\autohardware\runswiromtests_9.5.bat \runswiromtests.bat
- #endif
-
- #ifndef SYMBIAN_JAVA_NOT_INCLUDED
- data = ZDRIVE\autohardware\runsisinstaller_9.4.bat \runsisinstaller.bat
- #endif
-
- #endif
-
-#elif __SECURITY_MANDATORY_SWICERTSTORE__
- data = ZDRIVE\autohardware\testsecurity_9.5_mcs.bat \testsecurity.bat
- data = ZDRIVE\autohardware\runswiromtests_9.4_mcs.bat \runswiromtests.bat
-#elif __SECURITY_JAVA__
-
-#ifndef SYMBIAN_JAVA_NOT_INCLUDED
- data = ZDRIVE\autohardware\testsecurity_9.4_java.bat \testsecurity.bat
- data = ZDRIVE\autohardware\runjavamidletinstaller_9.4.bat \runjavamidletinstaller.bat
-#endif
-
-#endif
-
-
-//estor.dll is put in ROFS by deafult but we need to put it into CORE as well
-//core version will be used; see DEF113303 for details
-#ifdef __SECURITY_TEST_ROM__
-#ifdef _NAND2
-ROM_IMAGE[0] {
-file = \epoc32\release\armv5\urel\estor.dll \sys\bin\estor.dll
-}
-#endif
-#endif
-
-
-REM ---------- Comms-Infras ----------
-// ced is not included in release builds by default (in commdb.iby)
-// so we include it explicitly here if _DEBUG is NOT defined
-file=ABI_DIR\BUILD_DIR\ced.exe System\Libs\ced.exe
-data=EPOCROOT##epoc32\data\z\system\data\meshpreface1.cfg system\data\meshpreface1.cfg
-
-file=ABI_DIR\BUILD_DIR\ceddump.exe System\Programs\ceddump.exe
-
-file=ABI_DIR\BUILD_DIR\RUNTESTS.EXE System\Programs\RUNTESTS.EXE
-
-#include "thindump.iby"
-#include "sntpclient.iby"
-
-// *** Additional includes and configuration for SSM Requirements ***
-#ifdef _SSMSTARTUPMODE
-data=MULTI_LINGUIFY(RSC EPOCROOT##epoc32\data\z\private\2000d75b\startup\0\eshell private\2000d75b\startup\0\eshell)
-
-// Addition IBY's required
-#include "aplp.iby"
-#include "amastart.iby"
-#include "shma.iby"
-#include "ssrefplugins.iby"
-#endif
-
-
-#endif
--- a/cryptomgmtlibs/securitytestfw/inc/SecurityTests_sdp_9.5.iby Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +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:
-*
-*/
-
-#ifndef __SECURITYTESTS_IBY__
-#define __SECURITYTESTS_IBY__
-
-// We need bigger ROFS files for tests with TBAS
-rofssize=0x2100000
-
-// Save build details in ROM
-data=\buildid.txt \buildid.txt
-
-
-// This should be included in the Techview.oby file
-// All test data and scripts gets copied to the root of ROM drive.
-// This should be copied to the relevant directory on the C drive.
-
-// platsec.oby should be included, but a problem in rombuild prevents build with watchers disabled and PlatSecEnforceSysBin ON
-//#include "platsec.oby"
-ROM_IMAGE[0] {
-PlatSecDiagnostics ON
-PlatSecEnforcement ON
-PlatSecEnforceSysBin ON
-PlatSecProcessIsolation ON
-}
-
-#include "setcap.iby"
-
-#include "testexecute.iby"
-#include "t_testhandler.iby"
-#include "testutil.iby"
-//#include "xml.iby" // Needed for security tests
-
-#include "securityframeworktestserver.iby"
-
-
-#if defined SYMBIAN_KEYSTORE_USE_AUTH_SERVER || defined SDP_ROM1
-
- #include "ups.iby"
- #include "tups.iby"
- #include "asnpkcstests.iby"
- #include "certmantests.iby"
- #include "tpkcs7server.iby"
- #include "tpkcs12integrationserver.iby"
- #include "ctframeworktests.iby"
- #include "cryptotests.iby"
-#else
- #include "streamingcaf.iby"
- // iby files for caf
- #include "caf.iby"
- #include "caftest.iby"
- #include "reccafconfig.iby"
- #include "rta.iby"
- #include "rtatest.iby"
- #include "cryptotests.iby"
- #include "tscaf.iby"
- #include "randomtests.iby"
- #include "hashtests.iby"
-
- #ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
- #include "mtputils.iby"
- #include "mtputilstest.iby"
- #include "refcafhelper.iby"
- #endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
-
-#endif
-
-
-// Common utils libraries
-#include "securitycommonutils.iby"
-#include "securitytestframework.iby"
-#include "secutiltests.iby"
-
-//filetokens and authserver run in both the images.
-#include "filetokenstests.iby"
-
-
-#ifdef SYMBIAN_AUTH_SERVER
- #include "tAuthSvr.iby"
- #include "authserver.iby"
- #include "pinplugin.iby"
-#endif // SYMBIAN_AUTH_SERVER
-
-
-define ZDRIVE \epoc32\winscw\c
-// This is the bat file to run the security tests automatically
-// comms configuration (and configuration using sim.tsy)
-data = ZDRIVE\auto.cfg \auto.cfg
-data = ZDRIVE\auto_broken.cfg \auto_broken.cfg
-data = ZDRIVE\autosimtsy.cfg \autosimtsy.cfg
-data = ZDRIVE\prompt.cfg \prompt.cfg
-
-// This the file which used to redirect the request from cam-ocsptest01 to ban-ocsptest01
-data = ZDRIVE\autohardware\hosts \hosts
-
-
-#ifdef __AUTO_HARDWARE_TESTS__
- data = ZDRIVE\autohardware\autoexec.bat \autoexec.bat
-#endif
-
-
-data = ZDRIVE\autohardware\runcertman_9.5.bat \runcertman.bat
-data = ZDRIVE\autohardware\runasnpkcs_9.4.bat \runasnpkcs.bat
-data = ZDRIVE\autohardware\runcryptotokens_9.4.bat \runcryptotokens.bat
-data = ZDRIVE\autohardware\runupstests_9.4.bat \runupstests.bat
-data = ZDRIVE\autohardware\runpkcs12tests_9.4.bat \runpkcs12tests.bat
-
-#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
-#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
- data = ZDRIVE\autohardware\runcaftests_wmdrm.bat \runcaftests.bat
-#else
- data = ZDRIVE\autohardware\runcaftests_9.6.bat \runcaftests.bat
-#endif
-
-#else
- data = ZDRIVE\autohardware\runcaftests_9.5.bat \runcaftests.bat
-#endif
-
-#ifdef SYMBIAN_CRYPTOSPI
- #ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
- #ifdef __SECURITY_MANDATORY_SWICERTSTORE__
- data = ZDRIVE\autohardware\runhardwarecrypto.bat \runcrypto.bat
- #else
- data = ZDRIVE\autohardware\runcrypto_wmdrm.bat \runcrypto.bat
- #endif
- #else
- #ifdef __SECURITY_MANDATORY_SWICERTSTORE__
- data = ZDRIVE\autohardware\runhardwarecrypto.bat \runcrypto.bat
- #else
- data = ZDRIVE\autohardware\runcrypto_9.5.bat \runcrypto.bat
- #endif
- #endif
-#else
- data = ZDRIVE\autohardware\runcrypto_9.4.bat \runcrypto.bat
-#endif
-
-
-
-data = ZDRIVE\autohardware\testsecurityperformance_cryptalg.bat \testsecurityperformance_cryptalg.bat
-data = ZDRIVE\autohardware\testsecurityperformance_crypto.bat \testsecurityperformance_crypto.bat
-
-#ifdef SYMBIAN_AUTH_SERVER
-#ifdef SYMBIAN_ENABLE_POST_MARKET_AUTHENTICATION_PLUGINS
- data = ZDRIVE\autohardware\runauthtests_macroenabled.bat \runauthtests.bat
-#else
- data = ZDRIVE\autohardware\runauthtests.bat \runauthtests.bat
-#endif //SYMBIAN_ENABLE_POST_MARKET_AUTHENTICATION_PLUGINS
-#ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
- data = ZDRIVE\autohardware\runfiletokens_useauth.bat \runfiletokens.bat
-#else
- #ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
- data = ZDRIVE\autohardware\runfiletokens_disableauth_with_wmdrm.bat \runfiletokens.bat
- #else
- data = ZDRIVE\autohardware\runfiletokens_disableauth.bat \runfiletokens.bat
- #endif
-#endif // SYMBIAN_KEYSTORE_USE_AUTH_SERVER
-#else
- data = ZDRIVE\autohardware\runfiletokens_9.4.bat \runfiletokens.bat
-#endif // SYMBIAN_AUTH_SERVER
-
-#ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
- data = ZDRIVE\autohardware\testsecurity_sdp_auth.bat \testsecurity.bat
-#else
-#ifdef SDP_ROM1
- data = ZDRIVE\autohardware\testsecurity_sdp_newrom.bat \testsecurity.bat
-#else
- data = ZDRIVE\autohardware\testsecurity_sdp.bat \testsecurity.bat
-#endif
-#endif
-
-
-
-
-//estor.dll is put in ROFS by deafult but we need to put it into CORE as well
-//core version will be used; see DEF113303 for details
-#ifdef __SECURITY_TEST_ROM__
-#ifdef _INTERNAL_MMC
-ROM_IMAGE[0] {
-file = \epoc32\release\armv5\urel\estor.dll \sys\bin\estor.dll
-}
-#else
-#ifdef _NAND2
-ROM_IMAGE[0] {
-file = \epoc32\release\armv5\urel\estor.dll \sys\bin\estor.dll
-}
-#endif
-#endif
-#endif
-
-REM ---------- Comms-Infras ----------
-// ced is not included in release builds by default (in commdb.iby)
-// so we include it explicitly here if _DEBUG is NOT defined
-file=ABI_DIR\BUILD_DIR\ced.exe System\Libs\ced.exe
-data=EPOCROOT##epoc32\data\z\system\data\meshpreface1.cfg system\data\meshpreface1.cfg
-
-file=ABI_DIR\BUILD_DIR\ceddump.exe System\Programs\ceddump.exe
-
-file=ABI_DIR\BUILD_DIR\RUNTESTS.EXE System\Programs\RUNTESTS.EXE
-
-#include "thindump.iby"
-#include "sntpclient.iby"
-
-// *** Additional includes and configuration for SSM Requirements ***
-#ifdef _SSMSTARTUPMODE
-data=MULTI_LINGUIFY(RSC EPOCROOT##epoc32\data\z\private\2000d75b\startup\0\eshell private\2000d75b\startup\0\eshell)
-
-// Addition IBY's required
-#include "aplp.iby"
-#include "amastart.iby"
-#include "shma.iby"
-#include "ssrefplugins.iby"
-#endif
-
-
-// DEF139848 fix - Forward Propogation from Symtb9.1 - Illegal dependency from OCSP to HTTP.
-#include "ocsp.iby"
-#include "ocsptests.iby"
-
-#endif
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/apr_bld.inf Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2008-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:
-* BLD.INF
-* Builds for the apr subsystem
-* This is the bld.inf file for building the secuirity subsystem. It works for
-* both beech and cedar, using the appropriate macros (if defined) to determine
-* what gets built.
-*
-*/
-
-
-/**
- @file
-*/
-
-#ifndef TOOLS2
-// Disable everything except sistools and security_tools for TOOLS2 target
-
-#include "installtestframework/group/bld.inf"
-
-#include "installconfig/group/bld.inf"
-
-#include "swi/group/bld.inf"
-#include "swi/devicetools/group/bld.inf"
-#include "swi/pctools/group/bld.inf"
-
-
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-// SCR must be built before SIF, because SIF depends on the SCR
-#include "usif/scr/group/bld.inf"
-#include "usif/sif/group/bld.inf"
-#include "usif/sts/group/bld.inf"
-#include "usif/examples/installer/group/bld.inf"
-#include "usif/examples/appmanager/group/bld.inf"
-#endif
-
-#endif //TOOLS2
-
-// Only the SISTOOLS (makesis/signsis) and certapp build with TOOLS2
-#include "swi/sistools/group/bld.inf"
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/runasnpkcs.bat Mon May 03 14:11:52 2010 +0300
@@ -0,0 +1,25 @@
+@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:
+@rem
+md c:\tkeystore
+md c:\tkeystore\data
+copy /s z:\tkeystore\data\ c:\tkeystore\data\
+copy z:\tasnpkcstests.script c:\tasnpkcstests.script
+tasnpkcs c:\tasnpkcstests.script c:\logs\testexecute\tasnpkcstests.htm
+move c:\logs\testexecute\tasnpkcstests.htm e:\testresults\tasnpkcstests.htm
+del c:\tasnpkcstests.script
+del /s c:\tkeystore\data\
+attrib c:\*.* -r
+del c:\*.*
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runasnpkcs_9.4.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +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:
-@rem
-md c:\tkeystore
-md c:\tkeystore\data
-copy /s z:\tkeystore\data\ c:\tkeystore\data\
-copy z:\tasnpkcstests.script c:\tasnpkcstests.script
-tasnpkcs c:\tasnpkcstests.script c:\logs\testexecute\tasnpkcstests.htm
-move c:\logs\testexecute\tasnpkcstests.htm e:\testresults\tasnpkcstests.htm
-del c:\tasnpkcstests.script
-del /s c:\tkeystore\data\
-attrib c:\*.* -r
-del c:\*.*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/runcaftests.bat Mon May 03 14:11:52 2010 +0300
@@ -0,0 +1,56 @@
+@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:
+@rem
+
+md c:\tcaf
+copy /s z:\tcaf\* c:\tcaf
+testexecute c:\tcaf\tcaf.script
+move c:\logs\testexecute\tcaf.htm e:\testresults\tcaf.htm
+del c:\tcaf\*.*
+
+md c:\tcaf
+copy /s z:\tcaf\* c:\tcaf
+testexecute c:\tcaf\tcafnodrmcap.script
+move c:\logs\testexecute\tcafnodrmcap.htm e:\testresults\tcafnodrmcap.htm
+del c:\tcaf\*.*
+
+md c:\tcaf
+copy /s z:\tcaf\* c:\tcaf
+testexecute c:\tcaf\drmfileperformance_armv5.script
+move c:\logs\testexecute\drmfileperformance_armv5.htm e:\testresults\drmfileperformance_armv5.htm
+del c:\tcaf\*.*
+
+md c:\rta
+copy /s z:\rta\* c:\rta
+testexecute c:\rta\rta.script
+move c:\logs\testexecute\rta.htm e:\testresults\rta.htm
+del c:\rta\*.*
+
+md c:\tcaf
+md c:\tcaf\tscaf
+copy /s z:\tcaf\tscaf\* c:\tcaf\tscaf
+testexecute c:\tcaf\tscaf\tscaf.script
+move c:\logs\testexecute\tscaf.htm e:\testresults\tscaf.htm
+
+md c:\rta
+copy /s z:\rta\* c:\rta
+testexecute c:\rta\rta_64bit.script
+move c:\logs\testexecute\rta_64bit.htm e:\testresults\rta_64bit.htm
+del c:\rta\*.*
+
+md c:\tcaf
+copy /s z:\tcaf\* c:\tcaf
+testexecute c:\tcaf\consumerstep_64bit.script
+move c:\logs\testexecute\consumerstep_64bit.htm e:\testresults\consumerstep_64bit.htm
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runcaftests_9.4.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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:
-@rem
-
-md c:\tcaf
-copy /s z:\tcaf\* c:\tcaf
-testexecute c:\tcaf\tcaf.script
-move c:\logs\testexecute\tcaf.htm e:\testresults\tcaf.htm
-del c:\tcaf\*.*
-
-md c:\rta
-copy /s z:\rta\* c:\rta
-testexecute c:\rta\rta.script
-move c:\logs\testexecute\rta.htm e:\testresults\rta.htm
-del c:\rta\*.*
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runcaftests_9.5.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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:
-@rem
-
-md c:\tcaf
-copy /s z:\tcaf\* c:\tcaf
-testexecute c:\tcaf\tcaf.script
-move c:\logs\testexecute\tcaf.htm e:\testresults\tcaf.htm
-del c:\tcaf\*.*
-
-md c:\tcaf
-copy /s z:\tcaf\* c:\tcaf
-testexecute c:\tcaf\tcafnodrmcap.script
-move c:\logs\testexecute\tcafnodrmcap.htm e:\testresults\tcafnodrmcap.htm
-del c:\tcaf\*.*
-
-md c:\tcaf
-copy /s z:\tcaf\* c:\tcaf
-testexecute c:\tcaf\drmfileperformance_armv5.script
-move c:\logs\testexecute\drmfileperformance_armv5.htm e:\testresults\drmfileperformance_armv5.htm
-del c:\tcaf\*.*
-
-md c:\rta
-copy /s z:\rta\* c:\rta
-testexecute c:\rta\rta.script
-move c:\logs\testexecute\rta.htm e:\testresults\rta.htm
-del c:\rta\*.*
-
-md c:\tcaf
-md c:\tcaf\tscaf
-copy /s z:\tcaf\tscaf\* c:\tcaf\tscaf
-testexecute c:\tcaf\tscaf\tscaf.script
-move c:\logs\testexecute\tscaf.htm e:\testresults\tscaf.htm
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runcaftests_9.6.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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:
-@rem
-
-md c:\tcaf
-copy /s z:\tcaf\* c:\tcaf
-testexecute c:\tcaf\tcaf.script
-move c:\logs\testexecute\tcaf.htm e:\testresults\tcaf.htm
-del c:\tcaf\*.*
-
-md c:\tcaf
-copy /s z:\tcaf\* c:\tcaf
-testexecute c:\tcaf\drmfileperformance_armv5.script
-move c:\logs\testexecute\drmfileperformance_armv5.htm e:\testresults\drmfileperformance_armv5.htm
-del c:\tcaf\*.*
-
-md c:\rta
-copy /s z:\rta\* c:\rta
-testexecute c:\rta\rta.script
-move c:\logs\testexecute\rta.htm e:\testresults\rta.htm
-del c:\rta\*.*
-
-md c:\tcaf
-md c:\tcaf\tscaf
-copy /s z:\tcaf\tscaf\* c:\tcaf\tscaf
-testexecute c:\tcaf\tscaf\tscaf.script
-move c:\logs\testexecute\tscaf.htm e:\testresults\tscaf.htm
-
-md c:\rta
-copy /s z:\rta\* c:\rta
-testexecute c:\rta\rta_64bit.script
-move c:\logs\testexecute\rta_64bit.htm e:\testresults\rta_64bit.htm
-del c:\rta\*.*
-
-md c:\tcaf
-copy /s z:\tcaf\* c:\tcaf
-testexecute c:\tcaf\consumerstep_64bit.script
-move c:\logs\testexecute\consumerstep_64bit.htm e:\testresults\consumerstep_64bit.htm
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runcaftests_wmdrm.bat Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/runcaftests_wmdrm.bat Mon May 03 14:11:52 2010 +0300
@@ -22,6 +22,12 @@
md c:\tcaf
copy /s z:\tcaf\* c:\tcaf
+testexecute c:\tcaf\tcafnodrmcap.script
+move c:\logs\testexecute\tcafnodrmcap.htm e:\testresults\tcafnodrmcap.htm
+del c:\tcaf\*.*
+
+md c:\tcaf
+copy /s z:\tcaf\* c:\tcaf
testexecute c:\tcaf\drmfileperformance_armv5.script
move c:\logs\testexecute\drmfileperformance_armv5.htm e:\testresults\drmfileperformance_armv5.htm
del c:\tcaf\*.*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/runcertman.bat Mon May 03 14:11:52 2010 +0300
@@ -0,0 +1,218 @@
+@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:
+@rem
+copy /s z:\tpkcs7\ c:\tpkcs7\
+testexecute c:\tpkcs7\tpkcs7_v2.script
+move c:\logs\testexecute\tpkcs7_v2.htm e:\testresults\tpkcs7_v2.htm
+testexecute c:\tpkcs7\tcms.script
+move c:\logs\testexecute\tcms.htm e:\testresults\tcms.htm
+testexecute c:\tpkcs7\tinteg_cms.script
+move c:\logs\testexecute\tinteg_cms.htm e:\testresults\tinteg_cms.htm
+del /s c:\tpkcs7\
+
+rem TCERTSTORE
+rem copy tcertstore test data
+copy /s z:\tcertstore\ c:\tcertstore\
+copy z:\certappmanager.txt c:\certappmanager.txt
+copy /s z:\unifiedcertstore2\ c:\unifiedcertstore2\
+copy z:\tcertstore\data\TestKeyStore.txt c:\system\data\testkeystore.txt
+del c:\system\data\cacerts.dat
+
+del c:\system\data\certclients.dat
+t_certstore c:\tcertstore\scripts\t_certstore_sha2.script c:\testresults\t_certstore_sha2.htm
+move c:\testresults\t_certstore_sha2.htm e:\testresults\t_certstore_sha2.htm
+
+rem run tcertstore tests
+t_certstore c:\tcertstore\scripts\unifiedcertstore1-conf1.script c:\logs\testexecute\unifiedcertstore1-conf1.htm
+move c:\logs\testexecute\unifiedcertstore1-conf1.htm e:\testresults\unifiedcertstore1-conf1.htm
+
+del c:\system\data\cacerts.dat
+del c:\system\data\certclients.dat
+t_certstore c:\tcertstore\scripts\unifiedcertstore2-conf1.script c:\logs\testexecute\unifiedcertstore2-conf1.htm
+move c:\logs\testexecute\unifiedcertstore2-conf1.htm e:\testresults\unifiedcertstore2-conf1.htm
+
+del c:\system\data\cacerts.dat
+t_certstore c:\tcertstore\scripts\unifiedcertstore3-conf1.script c:\logs\testexecute\unifiedcertstore3-conf1.htm
+move c:\logs\testexecute\unifiedcertstore3-conf1.htm e:\testresults\unifiedcertstore3-conf1.htm
+
+del c:\system\data\cacerts.dat
+t_certstore c:\tcertstore\scripts\dsa.script c:\logs\testexecute\tcertstore-dsa.htm
+move c:\logs\testexecute\tcertstore-dsa.htm e:\testresults\tcertstore-dsa.htm
+
+del c:\system\data\cacerts.dat
+t_certstore c:\tcertstore\scripts\reload.script c:\logs\testexecute\tcertstore-reload.htm
+move c:\logs\testexecute\tcertstore-reload.htm e:\testresults\tcertstore-reload.htm
+
+del c:\system\data\cacerts.dat
+t_certstore c:\tcertstore\scripts\apipolicing.script c:\logs\testexecute\tcertstore-apipolicing.htm
+move c:\logs\testexecute\tcertstore-apipolicing.htm e:\testresults\tcertstore-apipolicing.htm
+
+del c:\system\data\cacerts.dat
+t_certstore c:\tcertstore\scripts\filecertstore_errors.script c:\logs\testexecute\tcertstore-errors.htm
+move c:\logs\testexecute\tcertstore-errors.htm e:\testresults\tcertstore-errors.htm
+
+del c:\system\data\cacerts.dat
+t_certstore c:\tcertstore\scripts\swicertstore1.script c:\logs\testexecute\swicertstore1.htm
+move c:\logs\testexecute\swicertstore1.htm e:\testresults\swicertstore1.htm
+
+t_certstore c:\tcertstore\scripts\swicertstore4.script c:\logs\testexecute\swicertstore4.htm
+move c:\logs\testexecute\swicertstore4.htm e:\testresults\swicertstore4.htm
+
+del c:\system\data\cacerts.dat
+t_certstore c:\tcertstore\scripts\wri-swicertstore1.script c:\logs\testexecute\wri-swicertstore1.htm
+move c:\logs\testexecute\wri-swicertstore1.htm e:\testresults\wri-swicertstore1.htm
+
+del c:\system\data\cacerts.dat
+
+REM Composite Certstore Configuration CR1393
+del c:\private\101f72a6\cacerts.dat
+del c:\private\101f72a6\certclients.dat
+t_certstore c:\tcertstore\multiple_certstore\scripts\tfilecertstore14.script c:\logs\testexecute\tfilecertstore14.htm
+move c:\logs\testexecute\tfilecertstore14.htm e:\testresults\tfilecertstore14.htm
+
+del c:\private\101f72a6\cacerts.dat
+del c:\private\101f72a6\certclients.dat
+
+rem deleting data on c: to save room and leave slots in root folder
+del /s c:\unifiedcertstore2\
+del /s c:\tcertstore\
+del c:\certappmanager.txt
+attrib c:\*.* -r
+del c:\*.*
+
+rem TOCSP
+rem copy tocsp test data
+copy /s z:\system\tocsp\ c:\system\tocsp\
+del c:\system\data\cacerts.dat
+
+rem run tocsp tests
+tocsp c:\system\tocsp\scripts\OPENSSL.script c:\logs\testexecute\TOCSP_openssl.htm
+del /s c:\system\tocsp\
+copy /s z:\system\tocsp\ c:\system\tocsp\
+
+
+tocsp c:\system\tocsp\scripts\XCERT-LOCAL.script c:\logs\testexecute\xcert_local.htm
+del /s c:\system\tocsp\
+copy /s z:\system\tocsp\ c:\system\tocsp\
+
+
+tocsp c:\system\tocsp\scripts\OPENSSL-LOCAL.script c:\logs\testexecute\xcert_openssl_local.htm
+del /s c:\system\tocsp\
+copy /s z:\system\tocsp\ c:\system\tocsp\
+
+tocsp c:\system\tocsp\scripts\error.script c:\logs\testexecute\ocsp_error.htm
+
+TOCSP c:\SYSTEM\TOCSP\SCRIPTS\DefaultPolicy.script c:\logs\testexecute\TOCSP_DefaultPolicy.htm
+
+rem copy test results to mmc card
+move c:\logs\testexecute\TOCSP_openssl.htm e:\testresults\TOCSP_openssl.htm
+move c:\logs\testexecute\xcert_local.htm e:\testresults\xcert_local.htm
+move c:\logs\testexecute\xcert_openssl_local.htm e:\testresults\xcert_openssl_local.htm
+move c:\logs\testexecute\ocsp_error.htm e:\testresults\ocsp_error.htm
+move c:\logs\testexecute\TOCSP_DefaultPolicy.htm e:\testresults\TOCSP_DefaultPolicy.htm
+
+rem deleting data on c: to save room and leave slots in root folder
+del /s c:\system\tocsp\
+attrib c:\*.* -r
+del c:\*.*
+
+rem TX509
+rem copy tx509 test data
+copy /s z:\tx509\ c:\tx509\
+
+rem run tx509 tests
+tx509 \TX509\SCRIPTS\TX509.script c:\logs\testexecute\tx509.htm
+rem copy results to mmc card
+move c:\logs\testexecute\tx509.htm e:\testresults\tx509.htm
+rem run tx509 distinguished name tests
+tx509 \tx509\scripts\tx509-dnames.script c:\logs\testexecute\tx509_dnames.htm
+rem copy results to mmc card
+move c:\logs\testexecute\tx509_dnames.htm e:\testresults\tx509_dnames.htm
+rem run tx509 dev certs tests
+tx509 \TX509\SCRIPTS\TX509_DEV_CERTS.script c:\logs\testexecute\tx509_dev_certs.htm
+rem copy results to mmc card
+move c:\logs\testexecute\tx509_dev_certs.htm e:\testresults\tx509_dev_certs.htm
+rem tidy up
+del /s c:\tx509\
+attrib c:\*.* -r
+del c:\*.*
+
+rem TASN1
+rem run tasn1 tests
+copy /s z:\tasn1\ c:\tasn1\
+tasn1 c:\tasn1\scripts\tasn1.script c:\logs\testexecute\tasn1_log.htm
+rem copy test results to mmc card
+move c:\logs\testexecute\tasn1_log.htm e:\testresults\TASN1_log.htm
+del /s c:\tasn1\
+
+
+rem TWTLSCERT
+rem copy twtlscert test data
+copy /s z:\twtlscert\ c:\twtlscert\
+
+rem run twtlscert tests
+twtlscert c:\twtlscert\scripts\twtlscert.script c:\logs\testexecute\twtlscert.htm
+twtlscert c:\twtlscert\scripts\twtlscert1.script c:\logs\testexecute\twtlscert1.htm
+twtlscert c:\twtlscert\scripts\twtlscert2.script c:\logs\testexecute\twtlscert2.htm
+twtlscert c:\twtlscert\scripts\twtlscert3.script c:\logs\testexecute\twtlscert3.htm
+
+rem copy test results to mmc card
+move c:\logs\testexecute\twtlscert.htm e:\testresults\twtlscert.htm
+move c:\logs\testexecute\twtlscert1.htm e:\testresults\twtlscert1.htm
+move c:\logs\testexecute\twtlscert2.htm e:\testresults\twtlscert2.htm
+move c:\logs\testexecute\twtlscert3.htm e:\testresults\twtlscert3.htm
+
+del /s c:\twtlscert\
+attrib c:\*.* -r
+del c:\*.*
+
+rem TPKIXCERT
+rem copy tpkixcert test data
+copy /s z:\tpkixcert\ c:\tpkixcert\
+copy /s z:\pkixtestdata\ c:\pkixtestdata\
+
+rem run tpkixcert tests
+tpkixcert c:\tpkixcert\scripts\tpkixtest_part1.script c:\logs\testexecute\tpkixtest1.htm
+tpkixcert c:\tpkixcert\scripts\tpkixtest_part2.script c:\logs\testexecute\tpkixtest2.htm
+tpkixcert c:\tpkixcert\scripts\cancel1.script c:\logs\testexecute\cancel1.htm
+
+rem copy test results to mmc card
+move c:\logs\testexecute\tpkixtest1.htm e:\testresults\tpkixtest1.htm
+move c:\logs\testexecute\tpkixtest2.htm e:\testresults\tpkixtest2.htm
+move c:\logs\testexecute\cancel1.htm e:\testresults\tpkixcancel1.htm
+
+attrib c:\*.* -r
+del c:\*.*
+
+REM tpkcs10_v2 - Uses TEF
+copy /s z:\tpkcs10\ c:\tpkcs10\
+testexecute c:\tpkcs10\scripts\tpkcs10_v2.script
+move c:\logs\testexecute\tpkcs10_v2.htm e:\testresults\tpkcs10_v2.htm
+del /s c:\tpkcs10
+
+REM tpkixcert_tef
+copy /s z:\tpkixcert_tef\ c:\tpkixcert_tef\
+testexecute c:\tpkixcert_tef\scripts\tpkixcert_tef.script
+move c:\logs\testexecute\tpkixcert_tef.htm e:\testresults\tpkixcert_tef.htm
+del /s c:\tpkixcert_tef
+
+attrib c:\*.* -r
+del c:\*.*
+
+del c:\system\data\cacerts.dat
+del c:\system\data\certclients.dat
+
+
+
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runcertman_9.4.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +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:
-@rem
-copy /s z:\tpkcs7\ c:\tpkcs7\
-testexecute c:\tpkcs7\tpkcs7_v2.script
-move c:\logs\testexecute\tpkcs7_v2.htm e:\testresults\tpkcs7_v2.htm
-testexecute c:\tpkcs7\tcms.script
-move c:\logs\testexecute\tcms.htm e:\testresults\tcms.htm
-testexecute c:\tpkcs7\tinteg_cms.script
-move c:\logs\testexecute\tinteg_cms.htm e:\testresults\tinteg_cms.htm
-del /s c:\tpkcs7\
-
-rem TCERTSTORE
-rem copy tcertstore test data
-copy /s z:\tcertstore\ c:\tcertstore\
-copy z:\certappmanager.txt c:\certappmanager.txt
-copy /s z:\unifiedcertstore2\ c:\unifiedcertstore2\
-copy z:\tcertstore\data\TestKeyStore.txt c:\system\data\testkeystore.txt
-del c:\system\data\cacerts.dat
-
-rem run tcertstore tests
-t_certstore c:\tcertstore\scripts\unifiedcertstore1-conf1.txt c:\testresults\unifiedcertstore1-conf1.txt
-move c:\testresults\unifiedcertstore1-conf1.txt e:\testresults\unifiedcertstore1-conf1.txt
-
-del c:\system\data\cacerts.dat
-del c:\system\data\certclients.dat
-t_certstore c:\tcertstore\scripts\unifiedcertstore2-conf1.txt c:\testresults\unifiedcertstore2-conf1.txt
-move c:\testresults\unifiedcertstore2-conf1.txt e:\testresults\unifiedcertstore2-conf1.txt
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\unifiedcertstore3-conf1.txt c:\testresults\unifiedcertstore3-conf1.txt
-move c:\testresults\unifiedcertstore3-conf1.txt e:\testresults\unifiedcertstore3-conf1.txt
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\dsa.txt c:\testresults\tcertstore-dsa.txt
-move c:\testresults\tcertstore-dsa.txt e:\testresults\tcertstore-dsa.txt
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\reload.txt c:\testresults\tcertstore-reload.txt
-move c:\testresults\tcerstore-reload.txt e:\testresults\tcertstore-reload.txt
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\apipolicing.txt c:\testresults\tcertstore-apipolicing.txt
-move c:\testresults\tcertstore-apipolicing.txt e:\testresults\tcertstore-apipolicing.txt
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\filecertstore_errors.txt c:\testresults\tcertstore-errors.txt
-move c:\testresults\tcertstore-errors.txt e:\testresults\tcertstore-errors.txt
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\swicertstore1.txt c:\testresults\swicertstore.txt
-move c:\testresults\swicertstore.txt e:\testresults\swicertstore.txt
-
-t_certstore c:\tcertstore\scripts\swicertstore4.txt c:\testresults\swicertstore4.txt
-move c:\testresults\swicertstore4.txt e:\testresults\swicertstore4.txt
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\wri-swicertstore1.txt c:\testresults\wri-swicertstore.txt
-move c:\testresults\wri-swicertstore.txt e:\testresults\wri-swicertstore.txt
-
-del c:\system\data\cacerts.dat
-
-
-rem deleting data on c: to save room and leave slots in root folder
-del /s c:\unifiedcertstore2\
-del /s c:\tcertstore\
-del c:\certappmanager.txt
-attrib c:\*.* -r
-del c:\*.*
-
-rem TOCSP
-rem copy tocsp test data
-copy /s z:\system\tocsp\ c:\system\tocsp\
-del c:\system\data\cacerts.dat
-
-rem run tocsp tests
-tocsp c:\system\tocsp\scripts\openssl.txt c:\testresults\tocsp_openssl.log
-del /s c:\system\tocsp\
-copy /s z:\system\tocsp\ c:\system\tocsp\
-
-
-tocsp c:\system\tocsp\scripts\xcert-local.txt c:\testresults\tocsp_xcert_local.log
-del /s c:\system\tocsp\
-copy /s z:\system\tocsp\ c:\system\tocsp\
-
-
-tocsp c:\system\tocsp\scripts\openssl-local.txt c:\testresults\tocsp_openssl_local.log
-del /s c:\system\tocsp\
-copy /s z:\system\tocsp\ c:\system\tocsp\
-
-tocsp c:\system\tocsp\scripts\error.txt c:\testresults\tocsp_error.log
-
-tocsp c:\system\tocsp\scripts\defaultpolicy.txt c:\testresults\tocsp_defaultpolicy.log
-
-tocsp c:\system\tocsp\scripts\httpinterface.txt c:\testresults\tocsp_httpinterface.log
-
-rem copy test results to mmc card
-move c:\testresults\tocsp_openssl.log e:\testresults\tocsp_openssl.log
-move c:\testresults\tocsp_xcert_local.log e:\testresults\tocsp_xcert_local.log
-move c:\testresults\tocsp_openssl_local.log e:\testresults\tocsp_openssl_local.log
-move c:\testresults\tocsp_error.log e:\testresults\tocsp_error.log
-move c:\testresults\tocsp_defaultpolicy.log e:\testresults\tocsp_defaultpolicy.log
-move c:\testresults\tocsp_httpinterface.log e:\testresults\tocsp_httpinterface.log
-
-rem deleting data on c: to save room and leave slots in root folder
-del /s c:\system\tocsp\
-attrib c:\*.* -r
-del c:\*.*
-
-REM Test the JMI CenRep's production version initialization file
-tjmicenrep
-move c:\jmicenreptest.log e:\testresults\jmicenreptest.log
-
-rem TX509
-rem copy tx509 test data
-copy /s z:\tx509\ c:\tx509\
-
-rem run tx509 tests
-tx509 \TX509\SCRIPTS\TX509.TXT c:\testresults\tx509.log
-rem copy results to mmc card
-move c:\testresults\tx509.log e:\testresults\tx509.log
-rem run tx509 dev certs tests
-tx509 \TX509\SCRIPTS\TX509_DEV_CERTS.TXT c:\testresults\tx509_dev_certs.log
-rem copy results to mmc card
-move c:\testresults\tx509_dev_certs.log e:\testresults\tx509_dev_certs.log
-rem tidy up
-del /s c:\tx509\
-attrib c:\*.* -r
-del c:\*.*
-
-rem TASN1
-rem run tasn1 tests
-copy /s z:\tasn1\ c:\tasn1\
-tasn1 c:\tasn1\scripts\tasn1.txt c:\testresults\tasn1_log.txt
-rem copy test results to mmc card
-move c:\testresults\tasn1_log.txt e:\testresults\TASN1_log.txt
-del /s c:\tasn1\
-
-
-rem TWTLSCERT
-rem copy twtlscert test data
-copy /s z:\twtlscert\ c:\twtlscert\
-
-rem run twtlscert tests
-twtlscert c:\twtlscert\scripts\twtlscert.txt c:\testresults\twtlscert.log
-twtlscert c:\twtlscert\scripts\twtlscert1.txt c:\testresults\twtlscert1.log
-twtlscert c:\twtlscert\scripts\twtlscert2.txt c:\testresults\twtlscert2.log
-twtlscert c:\twtlscert\scripts\twtlscert3.txt c:\testresults\twtlscert3.log
-
-rem copy test results to mmc card
-move c:\testresults\twtlscert.log e:\testresults\twtlscert.log
-move c:\testresults\twtlscert1.log e:\testresults\twtlscert1.log
-move c:\testresults\twtlscert2.log e:\testresults\twtlscert2.log
-move c:\testresults\twtlscert3.log e:\testresults\twtlscert3.log
-
-del /s c:\twtlscert\
-attrib c:\*.* -r
-del c:\*.*
-
-rem TPKIXCERT
-rem copy tpkixcert test data
-copy /s z:\tpkixcert\ c:\tpkixcert\
-copy /s z:\pkixtestdata\ c:\pkixtestdata\
-
-rem run tpkixcert tests
-tpkixcert c:\tpkixcert\scripts\tpkixtest_part1.txt c:\testresults\tpkixtest1.txt
-tpkixcert c:\tpkixcert\scripts\tpkixtest_part2.txt c:\testresults\tpkixtest2.txt
-tpkixcert c:\tpkixcert\scripts\cancel1.txt c:\testresults\cancel1.txt
-
-rem copy test results to mmc card
-move c:\testresults\tpkixtest1.txt e:\testresults\tpkixtest1.txt
-move c:\testresults\tpkixtest2.txt e:\testresults\tpkixtest2.txt
-move c:\testresults\cancel1.txt e:\testresults\tpkixcancel1.txt
-
-attrib c:\*.* -r
-del c:\*.*
-
-REM tpkcs10_v2 - Uses TEF
-copy /s z:\tpkcs10\ c:\tpkcs10\
-testexecute c:\tpkcs10\scripts\tpkcs10_v2.script
-move c:\logs\testexecute\tpkcs10_v2.htm e:\testresults\tpkcs10_v2.htm
-del /s c:\tpkcs10
-attrib c:\*.* -r
-del c:\*.*
-
-del c:\system\data\cacerts.dat
-del c:\system\data\certclients.dat
-
-
-
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runcertman_9.5.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +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:
-@rem
-copy /s z:\tpkcs7\ c:\tpkcs7\
-testexecute c:\tpkcs7\tpkcs7_v2.script
-move c:\logs\testexecute\tpkcs7_v2.htm e:\testresults\tpkcs7_v2.htm
-testexecute c:\tpkcs7\tcms.script
-move c:\logs\testexecute\tcms.htm e:\testresults\tcms.htm
-testexecute c:\tpkcs7\tinteg_cms.script
-move c:\logs\testexecute\tinteg_cms.htm e:\testresults\tinteg_cms.htm
-del /s c:\tpkcs7\
-
-rem TCERTSTORE
-rem copy tcertstore test data
-copy /s z:\tcertstore\ c:\tcertstore\
-copy z:\certappmanager.txt c:\certappmanager.txt
-copy /s z:\unifiedcertstore2\ c:\unifiedcertstore2\
-copy z:\tcertstore\data\TestKeyStore.txt c:\system\data\testkeystore.txt
-del c:\system\data\cacerts.dat
-
-del c:\system\data\certclients.dat
-t_certstore c:\tcertstore\scripts\t_certstore_sha2.script c:\testresults\t_certstore_sha2.htm
-move c:\testresults\t_certstore_sha2.htm e:\testresults\t_certstore_sha2.htm
-
-rem run tcertstore tests
-t_certstore c:\tcertstore\scripts\unifiedcertstore1-conf1.script c:\logs\testexecute\unifiedcertstore1-conf1.htm
-move c:\logs\testexecute\unifiedcertstore1-conf1.htm e:\testresults\unifiedcertstore1-conf1.htm
-
-del c:\system\data\cacerts.dat
-del c:\system\data\certclients.dat
-t_certstore c:\tcertstore\scripts\unifiedcertstore2-conf1.script c:\logs\testexecute\unifiedcertstore2-conf1.htm
-move c:\logs\testexecute\unifiedcertstore2-conf1.htm e:\testresults\unifiedcertstore2-conf1.htm
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\unifiedcertstore3-conf1.script c:\logs\testexecute\unifiedcertstore3-conf1.htm
-move c:\logs\testexecute\unifiedcertstore3-conf1.htm e:\testresults\unifiedcertstore3-conf1.htm
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\dsa.script c:\logs\testexecute\tcertstore-dsa.htm
-move c:\logs\testexecute\tcertstore-dsa.htm e:\testresults\tcertstore-dsa.htm
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\reload.script c:\logs\testexecute\tcertstore-reload.htm
-move c:\logs\testexecute\tcertstore-reload.htm e:\testresults\tcertstore-reload.htm
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\apipolicing.script c:\logs\testexecute\tcertstore-apipolicing.htm
-move c:\logs\testexecute\tcertstore-apipolicing.htm e:\testresults\tcertstore-apipolicing.htm
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\filecertstore_errors.script c:\logs\testexecute\tcertstore-errors.htm
-move c:\logs\testexecute\tcertstore-errors.htm e:\testresults\tcertstore-errors.htm
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\swicertstore1.script c:\logs\testexecute\swicertstore1.htm
-move c:\logs\testexecute\swicertstore1.htm e:\testresults\swicertstore1.htm
-
-t_certstore c:\tcertstore\scripts\swicertstore4.script c:\logs\testexecute\swicertstore4.htm
-move c:\logs\testexecute\swicertstore4.htm e:\testresults\swicertstore4.htm
-
-del c:\system\data\cacerts.dat
-t_certstore c:\tcertstore\scripts\wri-swicertstore1.script c:\logs\testexecute\wri-swicertstore1.htm
-move c:\logs\testexecute\wri-swicertstore1.htm e:\testresults\wri-swicertstore1.htm
-
-del c:\system\data\cacerts.dat
-
-REM Composite Certstore Configuration CR1393
-del c:\private\101f72a6\cacerts.dat
-del c:\private\101f72a6\certclients.dat
-t_certstore c:\tcertstore\multiple_certstore\scripts\tfilecertstore14.script c:\logs\testexecute\tfilecertstore14.htm
-move c:\logs\testexecute\tfilecertstore14.htm e:\testresults\tfilecertstore14.htm
-
-del c:\private\101f72a6\cacerts.dat
-del c:\private\101f72a6\certclients.dat
-
-rem deleting data on c: to save room and leave slots in root folder
-del /s c:\unifiedcertstore2\
-del /s c:\tcertstore\
-del c:\certappmanager.txt
-attrib c:\*.* -r
-del c:\*.*
-
-rem TOCSP
-rem copy tocsp test data
-copy /s z:\system\tocsp\ c:\system\tocsp\
-del c:\system\data\cacerts.dat
-
-rem run tocsp tests
-tocsp c:\system\tocsp\scripts\OPENSSL.script c:\logs\testexecute\TOCSP_openssl.htm
-del /s c:\system\tocsp\
-copy /s z:\system\tocsp\ c:\system\tocsp\
-
-
-tocsp c:\system\tocsp\scripts\XCERT-LOCAL.script c:\logs\testexecute\xcert_local.htm
-del /s c:\system\tocsp\
-copy /s z:\system\tocsp\ c:\system\tocsp\
-
-
-tocsp c:\system\tocsp\scripts\OPENSSL-LOCAL.script c:\logs\testexecute\xcert_openssl_local.htm
-del /s c:\system\tocsp\
-copy /s z:\system\tocsp\ c:\system\tocsp\
-
-tocsp c:\system\tocsp\scripts\error.script c:\logs\testexecute\ocsp_error.htm
-
-TOCSP c:\SYSTEM\TOCSP\SCRIPTS\DefaultPolicy.script c:\logs\testexecute\TOCSP_DefaultPolicy.htm
-
-rem copy test results to mmc card
-move c:\logs\testexecute\TOCSP_openssl.htm e:\testresults\TOCSP_openssl.htm
-move c:\logs\testexecute\xcert_local.htm e:\testresults\xcert_local.htm
-move c:\logs\testexecute\xcert_openssl_local.htm e:\testresults\xcert_openssl_local.htm
-move c:\logs\testexecute\ocsp_error.htm e:\testresults\ocsp_error.htm
-move c:\logs\testexecute\TOCSP_DefaultPolicy.htm e:\testresults\TOCSP_DefaultPolicy.htm
-
-rem deleting data on c: to save room and leave slots in root folder
-del /s c:\system\tocsp\
-attrib c:\*.* -r
-del c:\*.*
-
-rem TX509
-rem copy tx509 test data
-copy /s z:\tx509\ c:\tx509\
-
-rem run tx509 tests
-tx509 \TX509\SCRIPTS\TX509.script c:\logs\testexecute\tx509.htm
-rem copy results to mmc card
-move c:\logs\testexecute\tx509.htm e:\testresults\tx509.htm
-rem run tx509 distinguished name tests
-tx509 \tx509\scripts\tx509-dnames.script c:\logs\testexecute\tx509_dnames.htm
-rem copy results to mmc card
-move c:\logs\testexecute\tx509_dnames.htm e:\testresults\tx509_dnames.htm
-rem run tx509 dev certs tests
-tx509 \TX509\SCRIPTS\TX509_DEV_CERTS.script c:\logs\testexecute\tx509_dev_certs.htm
-rem copy results to mmc card
-move c:\logs\testexecute\tx509_dev_certs.htm e:\testresults\tx509_dev_certs.htm
-rem tidy up
-del /s c:\tx509\
-attrib c:\*.* -r
-del c:\*.*
-
-rem TASN1
-rem run tasn1 tests
-copy /s z:\tasn1\ c:\tasn1\
-tasn1 c:\tasn1\scripts\tasn1.script c:\logs\testexecute\tasn1_log.htm
-rem copy test results to mmc card
-move c:\logs\testexecute\tasn1_log.htm e:\testresults\TASN1_log.htm
-del /s c:\tasn1\
-
-
-rem TWTLSCERT
-rem copy twtlscert test data
-copy /s z:\twtlscert\ c:\twtlscert\
-
-rem run twtlscert tests
-twtlscert c:\twtlscert\scripts\twtlscert.script c:\logs\testexecute\twtlscert.htm
-twtlscert c:\twtlscert\scripts\twtlscert1.script c:\logs\testexecute\twtlscert1.htm
-twtlscert c:\twtlscert\scripts\twtlscert2.script c:\logs\testexecute\twtlscert2.htm
-twtlscert c:\twtlscert\scripts\twtlscert3.script c:\logs\testexecute\twtlscert3.htm
-
-rem copy test results to mmc card
-move c:\logs\testexecute\twtlscert.htm e:\testresults\twtlscert.htm
-move c:\logs\testexecute\twtlscert1.htm e:\testresults\twtlscert1.htm
-move c:\logs\testexecute\twtlscert2.htm e:\testresults\twtlscert2.htm
-move c:\logs\testexecute\twtlscert3.htm e:\testresults\twtlscert3.htm
-
-del /s c:\twtlscert\
-attrib c:\*.* -r
-del c:\*.*
-
-rem TPKIXCERT
-rem copy tpkixcert test data
-copy /s z:\tpkixcert\ c:\tpkixcert\
-copy /s z:\pkixtestdata\ c:\pkixtestdata\
-
-rem run tpkixcert tests
-tpkixcert c:\tpkixcert\scripts\tpkixtest_part1.script c:\logs\testexecute\tpkixtest1.htm
-tpkixcert c:\tpkixcert\scripts\tpkixtest_part2.script c:\logs\testexecute\tpkixtest2.htm
-tpkixcert c:\tpkixcert\scripts\cancel1.script c:\logs\testexecute\cancel1.htm
-
-rem copy test results to mmc card
-move c:\logs\testexecute\tpkixtest1.htm e:\testresults\tpkixtest1.htm
-move c:\logs\testexecute\tpkixtest2.htm e:\testresults\tpkixtest2.htm
-move c:\logs\testexecute\cancel1.htm e:\testresults\tpkixcancel1.htm
-
-attrib c:\*.* -r
-del c:\*.*
-
-REM tpkcs10_v2 - Uses TEF
-copy /s z:\tpkcs10\ c:\tpkcs10\
-testexecute c:\tpkcs10\scripts\tpkcs10_v2.script
-move c:\logs\testexecute\tpkcs10_v2.htm e:\testresults\tpkcs10_v2.htm
-del /s c:\tpkcs10
-
-REM tpkixcert_tef
-copy /s z:\tpkixcert_tef\ c:\tpkixcert_tef\
-testexecute c:\tpkixcert_tef\scripts\tpkixcert_tef.script
-move c:\logs\testexecute\tpkixcert_tef.htm e:\testresults\tpkixcert_tef.htm
-del /s c:\tpkixcert_tef
-
-attrib c:\*.* -r
-del c:\*.*
-
-del c:\system\data\cacerts.dat
-del c:\system\data\certclients.dat
-
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/runcrypto.bat Mon May 03 14:11:52 2010 +0300
@@ -0,0 +1,149 @@
+@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:
+@rem
+
+REM hash
+copy /s z:\thash\ c:\thash\
+thash
+move c:\hashlog.txt c:\testresults\
+move c:\testresults\hashlog.txt e:\testresults\hashlog.txt
+del /s c:\thash\
+
+REM random
+t_random
+move c:\t_random.log c:\testresults\
+move c:\testresults\t_random.log e:\testresults\t_random.log
+
+REM padding - uses testexecute framework
+copy /s z:\tpadding\ c:\tpadding\
+testexecute c:\tpadding\tpadding.script
+move c:\logs\testexecute\tpadding.htm e:\testresults\tpadding.htm
+del /s c:\tpadding\
+
+REM new cryptospi tests
+copy /s z:\testdata\tcryptospi\ c:\testdata\tcryptospi\
+testexecute z:\testdata\tcryptospi\scripts\tcryptospi.script
+move c:\logs\testexecute\tcryptospi.htm e:\testresults\tcryptospi.htm
+del /s c:\testdata\tcryptospi\
+
+REM crypto, asymmetric
+
+REM tasymmetric z:\tasymmetric\asymmetricPerformance.txt c:\testresults\asymmetricPerformance.log
+
+tasymmetric z:\tasymmetric\tasymmetrictests.script c:\logs\testexecute\tasymmetrictests.htm
+move c:\logs\testexecute\tasymmetrictests.htm e:\testresults\tasymmetrictests.htm
+
+REM crypto, symmetric
+
+tsymmetric z:\tsymmetric\tsymmetrictests.script c:\logs\testexecute\tsymmetrictests.htm
+move c:\logs\testexecute\tsymmetrictests.htm e:\testresults\tsymmetrictests.htm
+
+tsymmetric z:\tsymmetric\AESECBVectorsScript.script c:\logs\testexecute\AESECBVectorsScript.htm
+move c:\logs\testexecute\AESECBVectorsScript.htm e:\testresults\AESECBVectorsScript.htm
+
+tsymmetric z:\tsymmetric\AESECB_KAT_VT.script c:\logs\testexecute\AESECB_KAT_VT.htm
+move c:\logs\testexecute\AESECB_KAT_VT.htm e:\testresults\AESECB_KAT_VT.htm
+
+tsymmetric z:\tsymmetric\AESECB_KAT_VK.script c:\logs\testexecute\AESECB_KAT_VK.htm
+move c:\logs\testexecute\AESECB_KAT_VK.htm e:\testresults\AESECB_KAT_VK.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloEncryptECB128.script c:\logs\testexecute\AESMonteCarloEncryptECB128.htm
+move c:\logs\testexecute\AESMonteCarloEncryptECB128.htm e:\testresults\AESMonteCarloEncryptECB128.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloEncryptECB192.script c:\logs\testexecute\AESMonteCarloEncryptECB192.htm
+move c:\logs\testexecute\AESMonteCarloEncryptECB192.htm e:\testresults\AESMonteCarloEncryptECB192.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloEncryptECB256.script c:\logs\testexecute\AESMonteCarloEncryptECB256.htm
+move c:\logs\testexecute\AESMonteCarloEncryptECB256.htm e:\testresults\AESMonteCarloEncryptECB256.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloDecryptECB128.script c:\logs\testexecute\AESMonteCarloDecryptECB128.htm
+move c:\logs\testexecute\AESMonteCarloDecryptECB128.htm e:\testresults\AESMonteCarloDecryptECB128.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloDecryptECB192.script c:\logs\testexecute\AESMonteCarloDecryptECB192.htm
+move c:\logs\testexecute\AESMonteCarloDecryptECB192.htm e:\testresults\AESMonteCarloDecryptECB192.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloDecryptECB256.script c:\logs\testexecute\AESMonteCarloDecryptECB256.htm
+move c:\logs\testexecute\AESMonteCarloDecryptECB256.htm e:\testresults\AESMonteCarloDecryptECB256.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloEncryptCBC128.script c:\logs\testexecute\AESMonteCarloEncryptCBC128.htm
+move c:\logs\testexecute\AESMonteCarloEncryptCBC128.htm e:\testresults\AESMonteCarloEncryptCBC128.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloEncryptCBC192A.script c:\logs\testexecute\AESMonteCarloEncryptCBC192A.htm
+move c:\logs\testexecute\AESMonteCarloEncryptCBC192A.htm e:\testresults\AESMonteCarloEncryptCBC192A.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloEncryptCBC192B.script c:\logs\testexecute\AESMonteCarloEncryptCBC192B.htm
+move c:\logs\testexecute\AESMonteCarloEncryptCBC192B.htm e:\testresults\AESMonteCarloEncryptCBC192B.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloEncryptCBC256.script c:\logs\testexecute\AESMonteCarloEncryptCBC256.htm
+move c:\logs\testexecute\AESMonteCarloEncryptCBC256.htm e:\testresults\AESMonteCarloEncryptCBC256.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloDecryptCBC128.script c:\logs\testexecute\AESMonteCarloDecryptCBC128.htm
+move c:\logs\testexecute\AESMonteCarloDecryptCBC128.htm e:\testresults\AESMonteCarloDecryptCBC128.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloDecryptCBC192.script c:\logs\testexecute\AESMonteCarloDecryptCBC192.htm
+move c:\logs\testexecute\AESMonteCarloDecryptCBC192.htm e:\testresults\AESMonteCarloDecryptCBC192.htm
+
+tsymmetric z:\tsymmetric\AESMonteCarloDecryptCBC256.script c:\logs\testexecute\AESMonteCarloDecryptCBC256.htm
+move c:\logs\testexecute\AESMonteCarloDecryptCBC256.htm e:\testresults\AESMonteCarloDecryptCBC256.htm
+
+
+
+REM crypto, bigint
+
+tbigint z:\tbigint\tconstructiontests.script c:\logs\testexecute\tconstruction.htm
+move c:\logs\testexecute\tconstruction.htm e:\testresults\tconstruction.htm
+
+tbigint z:\tbigint\tbasicmathstests.script c:\logs\testexecute\tbasicmaths.htm
+move c:\logs\testexecute\tbasicmaths.htm e:\testresults\tbasicmaths.htm
+
+tbigint z:\tbigint\tmontgomerytests.script c:\logs\testexecute\tmontgomery.htm
+move c:\logs\testexecute\tmontgomery.htm e:\testresults\tmontgomery.htm
+
+REM tbigint z:\tbigint\tperformancetests.script c:\logs\testexecute\tperformance.htm
+REM move c:\logs\testexecute\tperformance.htm e:\testresults\tperformance.htm
+
+tbigint z:\tbigint\tprimetests.script c:\logs\testexecute\tprime.htm
+move c:\logs\testexecute\tprime.htm e:\testresults\tprime.htm
+
+REM tbigint z:\tbigint\tprimetests2.script c:\logs\testexecute\tprime2.htm
+REM move c:\logs\testexecute\tprime2.htm e:\testresults\tprime2.htm
+
+tbigint z:\tbigint\tprimefailuretests.script c:\logs\testexecute\tprimefailure.htm
+move c:\logs\testexecute\tprimefailure.htm e:\testresults\tprimefailure.htm
+
+tbigint z:\tbigint\tprimegen.script c:\logs\testexecute\tprimegen.htm
+move c:\logs\testexecute\tprimegen.htm e:\testresults\tprimegen.htm
+
+
+
+REM crypto, tpkcs5kdf
+md c:\tpkcs5kdf
+
+copy z:\tpkcs12kdftests.script c:\tpkcs5kdf\tpkcs12kdftests.script
+tpkcs5kdf c:\tpkcs5kdf\tpkcs12kdftests.script c:\tpkcs5kdf\tpkcs12kdftests.htm
+move c:\tpkcs5kdf\tpkcs12kdftests.htm e:\testresults\tpkcs12kdftests.htm
+del /s c:\tpkcs5kdf\
+
+
+REM crypto, pbe
+
+md c:\tpbe
+copy z:\tpbe\*.dat c:\tpbe
+attrib c:\tpbe\strong.dat -r
+attrib c:\tpbe\weak.dat -r
+tpbe z:\tpbe\tpbetests_v2.script c:\logs\testexecute\tpbetestsv2.htm
+move c:\logs\testexecute\tpbetestsv2.htm e:\testresults\tpbetestsv2.htm
+
+del /s c:\tpbe\
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runcrypto_9.4.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +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:
-@rem
-copy /s z:\thash\ c:\thash\
-thash
-move c:\hashlog.txt c:\testresults\
-move c:\testresults\hashlog.txt e:\testresults\hashlog.txt
-
-REM random
-t_random
-move c:\t_random.log c:\testresults\
-move c:\testresults\t_random.log e:\testresults\t_random.log
-
-
-REM padding - uses testexecute framework
-copy /s z:\tpadding\ c:\tpadding\
-testexecute c:\tpadding\tpadding.script
-move c:\logs\testexecute\tpadding.htm e:\testresults\tpadding.htm
-del /s c:\tpadding\
-
-REM crypto, asymmetric
-
-tasymmetric z:\tasymmetric\tasymmetrictests.txt c:\testresults\tasymmetrictests.log
-REM tasymmetric z:\tasymmetric\asymmetricPerformance.txt c:\testresults\asymmetricPerformance.log
-
-move c:\testresults\tasymmetrictests.log e:\testresults\tasymmetrictests.log
-
-REM crypto, symmetric
-
-tsymmetric z:\tsymmetric\tsymmetrictests.txt c:\testresults\tsymmetrictests.log
-tsymmetric z:\tsymmetric\AESECBVectorsScript.txt c:\testresults\AESECBVectorsScript.log
-tsymmetric z:\tsymmetric\AESECB_KAT_VT.txt c:\testresults\AESECB_KAT_VT.log
-tsymmetric z:\tsymmetric\AESECB_KAT_VK.txt c:\testresults\AESECB_KAT_VK.log
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptECB128.txt c:\testresults\AESMonteCarloEncryptECB128.log
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptECB192.txt c:\testresults\AESMonteCarloEncryptECB192.log
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptECB256.txt c:\testresults\AESMonteCarloEncryptECB256.log
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptECB128.txt c:\testresults\AESMonteCarloDecryptECB128.log
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptECB192.txt c:\testresults\AESMonteCarloDecryptECB192.log
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptECB256.txt c:\testresults\AESMonteCarloDecryptECB256.log
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptCBC128.txt c:\testresults\AESMonteCarloEncryptCBC128.log
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptCBC192.txt c:\testresults\AESMonteCarloEncryptCBC192.log
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptCBC256.txt c:\testresults\AESMonteCarloEncryptCBC256.log
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptCBC128.txt c:\testresults\AESMonteCarloDecryptCBC128.log
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptCBC192.txt c:\testresults\AESMonteCarloDecryptCBC192.log
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptCBC256.txt c:\testresults\AESMonteCarloDecryptCBC256.log
-
-
-rem copy logs to mmc card
-move c:\testresults\tsymmetrictests.log e:\testresults\tsymmetrictests.log
-move c:\testresults\AESECBVectorsScript.log e:\testresults\AESECBVectorsScript.log
-move c:\testresults\AESECB_KAT_VT.log e:\testresults\AESECB_KAT_VT.log
-move c:\testresults\AESECB_KAT_VK.log e:\testresults\AESECB_KAT_VK.log
-move c:\testresults\AESMonteCarloEncryptECB128.log e:\testresults\AESMonteCarloEncryptECB128.log
-move c:\testresults\AESMonteCarloEncryptECB192.log e:\testresults\AESMonteCarloEncryptECB192.log
-move c:\testresults\AESMonteCarloEncryptECB256.log e:\testresults\AESMonteCarloEncryptECB256.log
-move c:\testresults\AESMonteCarloDecryptECB128.log e:\testresults\AESMonteCarloDecryptECB128.log
-move c:\testresults\AESMonteCarloDecryptECB192.log e:\testresults\AESMonteCarloDecryptECB192.log
-move c:\testresults\AESMonteCarloDecryptECB256.log e:\testresults\AESMonteCarloDecryptECB256.log
-move c:\testresults\AESMonteCarloEncryptCBC128.log e:\testresults\AESMonteCarloEncryptCBC128.log
-move c:\testresults\AESMonteCarloEncryptCBC192.log e:\testresults\AESMonteCarloEncryptCBC192.log
-move c:\testresults\AESMonteCarloEncryptCBC256.log e:\testresults\AESMonteCarloEncryptCBC256.log
-move c:\testresults\AESMonteCarloDecryptCBC128.log e:\testresults\AESMonteCarloDecryptCBC128.log
-move c:\testresults\AESMonteCarloDecryptCBC192.log e:\testresults\AESMonteCarloDecryptCBC192.log
-move c:\testresults\AESMonteCarloDecryptCBC256.log e:\testresults\AESMonteCarloDecryptCBC256.log
-
-REM crypto, bigint
-
-tbigint z:\tbigint\tconstructiontests.txt c:\testresults\tconstruction.log
-tbigint z:\tbigint\tbasicmathstests.txt c:\testresults\tbasicmaths.log
-tbigint z:\tbigint\tmontgomerytests.txt c:\testresults\tmontgomery.log
-REM tbigint z:\tbigint\tperformancetests.txt c:\testresults\tperformance.log
-tbigint z:\tbigint\tprimetests.txt c:\testresults\tprime.log
-REM tbigint z:\tbigint\tprimetests2.txt c:\testresults\tprime2.log
-tbigint z:\tbigint\tprimefailuretests.txt c:\testresults\tprimefailure.log
-tbigint z:\tbigint\tprimegen.txt c:\testresults\tprimegen.log
-
-rem copy logs to mmc card
-move c:\testresults\tconstruction.log e:\testresults\tconstruction.log
-move c:\testresults\tbasicmaths.log e:\testresults\tbasicmaths.log
-move c:\testresults\tmontgomery.log e:\testresults\tmontgomery.log
-REM move c:\testresults\tperformance.log e:\testresults\tperformance.log
-move c:\testresults\tprime.log e:\testresults\tprime.log
-REM move c:\testresults\tprime2.log e:\testresults\tprime2.log
-move c:\testresults\tprimefailure.log e:\testresults\tprimefailure.log
-move c:\testresults\tprimegen.log e:\testresults\tprimegen.log
-
-REM crypto, tpkcs5kdf
-md c:\tpkcs5kdf
-
-copy z:\tpkcs12kdftests.txt c:\tpkcs5kdf\tpkcs12kdftests.txt
-tpkcs5kdf c:\tpkcs5kdf\tpkcs12kdftests.txt c:\tpkcs5kdf\tpkcs12kdftests.log
-copy c:\tpkcs5kdf\tpkcs12kdftests.log e:\testresults\tpkcs12kdftests.log
-del /s c:\tpkcs5kdf\
-
-REM crypto, pbe
-
-md c:\tpbe
-copy z:\tpbe\*.dat c:\tpbe
-attrib c:\tpbe\strong.dat -r
-attrib c:\tpbe\weak.dat -r
-tpbe z:\tpbe\tpbetests_v2.txt c:\testresults\tpbetestsv2.log
-move c:\testresults\tpbetestsv2.log e:\testresults\tpbetestsv2.log
-del /s c:\tpbe\
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runcrypto_9.5.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +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:
-@rem
-
-REM hash
-copy /s z:\thash\ c:\thash\
-thash
-move c:\hashlog.txt c:\testresults\
-move c:\testresults\hashlog.txt e:\testresults\hashlog.txt
-del /s c:\thash\
-
-REM random
-t_random
-move c:\t_random.log c:\testresults\
-move c:\testresults\t_random.log e:\testresults\t_random.log
-
-REM padding - uses testexecute framework
-copy /s z:\tpadding\ c:\tpadding\
-testexecute c:\tpadding\tpadding.script
-move c:\logs\testexecute\tpadding.htm e:\testresults\tpadding.htm
-del /s c:\tpadding\
-
-REM new cryptospi tests
-copy /s z:\testdata\tcryptospi\ c:\testdata\tcryptospi\
-testexecute z:\testdata\tcryptospi\scripts\tcryptospi.script
-move c:\logs\testexecute\tcryptospi.htm e:\testresults\tcryptospi.htm
-del /s c:\testdata\tcryptospi\
-
-REM crypto, asymmetric
-
-REM tasymmetric z:\tasymmetric\asymmetricPerformance.txt c:\testresults\asymmetricPerformance.log
-
-tasymmetric z:\tasymmetric\tasymmetrictests.script c:\logs\testexecute\tasymmetrictests.htm
-move c:\logs\testexecute\tasymmetrictests.htm e:\testresults\tasymmetrictests.htm
-
-REM crypto, symmetric
-
-tsymmetric z:\tsymmetric\tsymmetrictests.script c:\logs\testexecute\tsymmetrictests.htm
-move c:\logs\testexecute\tsymmetrictests.htm e:\testresults\tsymmetrictests.htm
-
-tsymmetric z:\tsymmetric\AESECBVectorsScript.script c:\logs\testexecute\AESECBVectorsScript.htm
-move c:\logs\testexecute\AESECBVectorsScript.htm e:\testresults\AESECBVectorsScript.htm
-
-tsymmetric z:\tsymmetric\AESECB_KAT_VT.script c:\logs\testexecute\AESECB_KAT_VT.htm
-move c:\logs\testexecute\AESECB_KAT_VT.htm e:\testresults\AESECB_KAT_VT.htm
-
-tsymmetric z:\tsymmetric\AESECB_KAT_VK.script c:\logs\testexecute\AESECB_KAT_VK.htm
-move c:\logs\testexecute\AESECB_KAT_VK.htm e:\testresults\AESECB_KAT_VK.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptECB128.script c:\logs\testexecute\AESMonteCarloEncryptECB128.htm
-move c:\logs\testexecute\AESMonteCarloEncryptECB128.htm e:\testresults\AESMonteCarloEncryptECB128.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptECB192.script c:\logs\testexecute\AESMonteCarloEncryptECB192.htm
-move c:\logs\testexecute\AESMonteCarloEncryptECB192.htm e:\testresults\AESMonteCarloEncryptECB192.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptECB256.script c:\logs\testexecute\AESMonteCarloEncryptECB256.htm
-move c:\logs\testexecute\AESMonteCarloEncryptECB256.htm e:\testresults\AESMonteCarloEncryptECB256.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptECB128.script c:\logs\testexecute\AESMonteCarloDecryptECB128.htm
-move c:\logs\testexecute\AESMonteCarloDecryptECB128.htm e:\testresults\AESMonteCarloDecryptECB128.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptECB192.script c:\logs\testexecute\AESMonteCarloDecryptECB192.htm
-move c:\logs\testexecute\AESMonteCarloDecryptECB192.htm e:\testresults\AESMonteCarloDecryptECB192.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptECB256.script c:\logs\testexecute\AESMonteCarloDecryptECB256.htm
-move c:\logs\testexecute\AESMonteCarloDecryptECB256.htm e:\testresults\AESMonteCarloDecryptECB256.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptCBC128.script c:\logs\testexecute\AESMonteCarloEncryptCBC128.htm
-move c:\logs\testexecute\AESMonteCarloEncryptCBC128.htm e:\testresults\AESMonteCarloEncryptCBC128.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptCBC192A.script c:\logs\testexecute\AESMonteCarloEncryptCBC192A.htm
-move c:\logs\testexecute\AESMonteCarloEncryptCBC192A.htm e:\testresults\AESMonteCarloEncryptCBC192A.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptCBC192B.script c:\logs\testexecute\AESMonteCarloEncryptCBC192B.htm
-move c:\logs\testexecute\AESMonteCarloEncryptCBC192B.htm e:\testresults\AESMonteCarloEncryptCBC192B.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloEncryptCBC256.script c:\logs\testexecute\AESMonteCarloEncryptCBC256.htm
-move c:\logs\testexecute\AESMonteCarloEncryptCBC256.htm e:\testresults\AESMonteCarloEncryptCBC256.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptCBC128.script c:\logs\testexecute\AESMonteCarloDecryptCBC128.htm
-move c:\logs\testexecute\AESMonteCarloDecryptCBC128.htm e:\testresults\AESMonteCarloDecryptCBC128.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptCBC192.script c:\logs\testexecute\AESMonteCarloDecryptCBC192.htm
-move c:\logs\testexecute\AESMonteCarloDecryptCBC192.htm e:\testresults\AESMonteCarloDecryptCBC192.htm
-
-tsymmetric z:\tsymmetric\AESMonteCarloDecryptCBC256.script c:\logs\testexecute\AESMonteCarloDecryptCBC256.htm
-move c:\logs\testexecute\AESMonteCarloDecryptCBC256.htm e:\testresults\AESMonteCarloDecryptCBC256.htm
-
-
-
-REM crypto, bigint
-
-tbigint z:\tbigint\tconstructiontests.script c:\logs\testexecute\tconstruction.htm
-move c:\logs\testexecute\tconstruction.htm e:\testresults\tconstruction.htm
-
-tbigint z:\tbigint\tbasicmathstests.script c:\logs\testexecute\tbasicmaths.htm
-move c:\logs\testexecute\tbasicmaths.htm e:\testresults\tbasicmaths.htm
-
-tbigint z:\tbigint\tmontgomerytests.script c:\logs\testexecute\tmontgomery.htm
-move c:\logs\testexecute\tmontgomery.htm e:\testresults\tmontgomery.htm
-
-REM tbigint z:\tbigint\tperformancetests.script c:\logs\testexecute\tperformance.htm
-REM move c:\logs\testexecute\tperformance.htm e:\testresults\tperformance.htm
-
-tbigint z:\tbigint\tprimetests.script c:\logs\testexecute\tprime.htm
-move c:\logs\testexecute\tprime.htm e:\testresults\tprime.htm
-
-REM tbigint z:\tbigint\tprimetests2.script c:\logs\testexecute\tprime2.htm
-REM move c:\logs\testexecute\tprime2.htm e:\testresults\tprime2.htm
-
-tbigint z:\tbigint\tprimefailuretests.script c:\logs\testexecute\tprimefailure.htm
-move c:\logs\testexecute\tprimefailure.htm e:\testresults\tprimefailure.htm
-
-tbigint z:\tbigint\tprimegen.script c:\logs\testexecute\tprimegen.htm
-move c:\logs\testexecute\tprimegen.htm e:\testresults\tprimegen.htm
-
-
-
-REM crypto, tpkcs5kdf
-md c:\tpkcs5kdf
-
-copy z:\tpkcs12kdftests.script c:\tpkcs5kdf\tpkcs12kdftests.script
-tpkcs5kdf c:\tpkcs5kdf\tpkcs12kdftests.script c:\tpkcs5kdf\tpkcs12kdftests.htm
-move c:\tpkcs5kdf\tpkcs12kdftests.htm e:\testresults\tpkcs12kdftests.htm
-del /s c:\tpkcs5kdf\
-
-
-REM crypto, pbe
-
-md c:\tpbe
-copy z:\tpbe\*.dat c:\tpbe
-attrib c:\tpbe\strong.dat -r
-attrib c:\tpbe\weak.dat -r
-tpbe z:\tpbe\tpbetests_v2.script c:\logs\testexecute\tpbetestsv2.htm
-move c:\logs\testexecute\tpbetestsv2.htm e:\testresults\tpbetestsv2.htm
-
-del /s c:\tpbe\
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/runcryptotokens.bat Mon May 03 14:11:52 2010 +0300
@@ -0,0 +1,18 @@
+@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:
+@rem
+t_ctframework
+copy c:\T_CTFrameworkLog.txt e:\testresults\T_CTFrameworkLog.txt
+move T_CTFrameworkLog.txt c:\testresults\
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runcryptotokens_9.4.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +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:
-@rem
-t_ctframework
-copy c:\T_CTFrameworkLog.txt e:\testresults\T_CTFrameworkLog.txt
-move T_CTFrameworkLog.txt c:\testresults\
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/runfiletokens.bat Mon May 03 14:11:52 2010 +0300
@@ -0,0 +1,55 @@
+@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:
+@rem
+
+copy /s z:\tkeystore\ c:\tkeystore\
+copy /s z:\tcertstore\ c:\tcertstore\
+copy /s z:\ttesttools\ c:\ttesttools\
+md c:\system\data\
+copy /s z:\system\data\test1certstore.dat c:\system\data\test1certstore.dat
+copy /s z:\system\data\test2certstore.dat c:\system\data\test2certstore.dat
+md c:\private\101f72a6\
+copy /s c:\ttesttools\data\certclients.dat c:\private\101f72a6\certclients.dat
+
+TESTEXECUTE c:\ttesttools\scripts\sec-filetokens-tools.script
+move c:\logs\testexecute\sec-filetokens-tools.htm e:\testresults\sec-filetokens-tools.htm
+
+del c:\private\101f72a6\certclients.dat
+del c:\system\data\test1certstore.dat
+
+del /s c:\ttesttools\
+del /s c:\tcertstore\
+del /s c:\tkeystore\
+
+rem TCERTAPPS
+copy /s z:\tcertapps\ c:\tcertapps\
+t_certapps c:\tcertapps\scripts\script1.script c:\testresults\tcertapps.htm
+move c:\testresults\tcertapps.htm e:\testresults\tcertapps.htm
+t_certapps c:\tcertapps\scripts\apipolicing.script c:\testresults\tcertapps-apipolicing.htm
+move c:\testresults\tcertapps-apipolicing.htm e:\testresults\tcertapps-apipolicing.htm
+del /s c:\tcertapps\
+
+
+REM t_keystore
+copy /s z:\tkeystore\ c:\tkeystore\
+t_keystore c:\tkeystore\scripts\tkeystore.script c:\testresults\tkeystore.htm
+move c:\testresults\tkeystore.htm e:\testresults\tkeystore.htm
+t_keystore c:\tkeystore\scripts\authobjects.script c:\testresults\tkeystore_authobjects.htm
+move c:\testresults\tkeystore_authobjects.htm e:\testresults\tkeystore_authobjects.htm
+t_keystore c:\tkeystore\scripts\exportscript.script c:\testresults\tkeystore_export.htm
+move c:\testresults\tkeystore_export.htm e:\testresults\tkeystore_export.htm
+t_keystore c:\tkeystore\scripts\reload.script c:\testresults\tkeystore_reload.htm
+move c:\testresults\tkeystore_reload.htm e:\testresults\tkeystore_reload.htm
+del /s c:\tkeystore\
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runfiletokens_9.4.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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:
-@rem
-
-copy /s z:\tkeystore\ c:\tkeystore\
-copy /s z:\tcertstore\ c:\tcertstore\
-copy /s z:\ttesttools\ c:\ttesttools\
-md c:\system\data\
-copy /s z:\system\data\test1certstore.dat c:\system\data\test1certstore.dat
-copy /s z:\system\data\test2certstore.dat c:\system\data\test2certstore.dat
-md c:\private\101f72a6\
-copy /s c:\ttesttools\data\certclients.dat c:\private\101f72a6\certclients.dat
-
-TESTEXECUTE c:\ttesttools\scripts\sec-filetokens-tools.script
-move c:\logs\testexecute\sec-filetokens-tools.htm e:\testresults\sec-filetokens-tools.htm
-
-del c:\private\101f72a6\certclients.dat
-del c:\system\data\test1certstore.dat
-
-del /s c:\ttesttools\
-del /s c:\tcertstore\
-del /s c:\tkeystore\
-
-rem TCERTAPPS
-copy /s z:\tcertapps\ c:\tcertapps\
-t_certapps c:\tcertapps\scripts\script1.script c:\testresults\tcertapps.htm
-move c:\testresults\tcertapps.htm e:\testresults\tcertapps.htm
-t_certapps c:\tcertapps\scripts\apipolicing.script c:\testresults\tcertapps-apipolicing.htm
-move c:\testresults\tcertapps-apipolicing.htm e:\testresults\tcertapps-apipolicing.htm
-del /s c:\tcertapps\
-
-
-REM t_keystore
-copy /s z:\tkeystore\ c:\tkeystore\
-t_keystore c:\tkeystore\scripts\tkeystore.script c:\testresults\tkeystore.htm
-move c:\testresults\tkeystore.htm e:\testresults\tkeystore.htm
-t_keystore c:\tkeystore\scripts\authobjects.script c:\testresults\tkeystore_authobjects.htm
-move c:\testresults\tkeystore_authobjects.htm e:\testresults\tkeystore_authobjects.htm
-t_keystore c:\tkeystore\scripts\exportscript.script c:\testresults\tkeystore_export.htm
-move c:\testresults\tkeystore_export.htm e:\testresults\tkeystore_export.htm
-t_keystore c:\tkeystore\scripts\reload.script c:\testresults\tkeystore_reload.htm
-move c:\testresults\tkeystore_reload.htm e:\testresults\tkeystore_reload.htm
-del /s c:\tkeystore\
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runjavamidletinstaller_9.4.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,237 +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:
-@rem
-copy /s z:\tJarDownloader\ c:\tJarDownloader\
-copy z:\certclients.dat c:\system\data\certclients.dat
-copy z:\cacerts.dat c:\system\data\cacerts.dat
-attrib c:\system\data\cacerts.dat -r
-attrib c:\system\data\certclients.dat -r
-
-rem run tJarDownloader tests
-tJarDownloader c:\tJarDownloader\Scripts\script1.txt c:\testresults\tjardownloader.log
-move c:\testresults\tjardownloader.log e:\testresults\tjardownloader.log
-del /s c:\tJarDownloader\
-del /s c:\tjartest\
-del /s c:\private\200008d1\
-
-rem ITHARNESSMIDP
-rem copy test data
-copy /s z:\midpfiles\ c:\midpfiles\
-copy /s z:\itharnessmidp\ c:\itharnessmidp\
-copy z:\javatest.txt c:\javatest.txt
-copy z:\javatest2.txt c:\javatest2.txt
-copy z:\javatest3.txt c:\javatest3.txt
-copy z:\leavetest.txt c:\leavetest.txt
-copy z:\otatests.txt c:\otatests.txt
-copy z:\javaiaptest.txt c:\javaiaptest.txt
-attrib c:\system\data\cacerts.dat -r
-attrib c:\system\data\certclients.dat -r
-copy z:\cacerts.dat c:\system\data\cacerts.dat
-copy z:\certclients.dat c:\system\data\certclients.dat
-attrib c:\system\data\cacerts.dat -r
-attrib c:\system\data\certclients.dat -r
-
-
-rem run ITHARNESSMIDP
-itharnessmidp c:\javatest.txt c:\testresults\java1.txt
-
-rem copy test results to mmc card
-move c:\testresults\java1.txt e:\testresults\java1.txt
-
-del c:\sys\install\integrityservices\E130772A2A09A5.drv
-
-rem run ITHARNESSMIDP
-itharnessmidp c:\javatest2.txt c:\testresults\java2.txt
-
-rem copy test results to mmc card
-move c:\testresults\java2.txt e:\testresults\java2.txt
-
-
-rem run ITHARNESSMIDP
-itharnessmidp c:\javatest3.txt c:\testresults\java3.txt
-
-rem copy test results to mmc card
-move c:\testresults\java3.txt e:\testresults\java3.txt
-
-rem run ITHARNESSMIDP
-itharnessmidp c:\leavetest.txt c:\testresults\leavetest.txt
-
-rem copy test results to mmc card
-move c:\testresults\leavetest.txt e:\testresults\leavetest.txt
-
-rem run ITHARNESSMIDP
-copy z:\certclients.dat c:\system\data\certclients.dat
-copy z:\cacerts.dat c:\system\data\cacerts.dat
-attrib c:\system\data\cacerts.dat -r
-attrib c:\system\data\certclients.dat -r
-itharnessmidp c:\otatests.txt c:\testresults\java4.txt
-
-rem copy test results to mmc card
-move c:\testresults\java4.txt e:\testresults\java4.txt
-
-rem run ITHARNESSMIDP
-rem copy z:\prompt.cfg c:\prompt.cfg
-rem ced -i c:\prompt.cfg
-itharnessmidp c:\javaiaptest.txt c:\testresults\java5.txt
-rem ced -i c:\auto.cfg
-
-rem copy test results to mmc card
-move c:\testresults\java5.txt e:\testresults\java5.txt
-
-rem delete midpfiles
-del /s c:\midpfiles\
-del c:\javatest.txt
-del c:\javatest2.txt
-del c:\javatest3.txt
-del c:\otatests.txt
-del c:\javaiaptest.txt
-del /s c:\private\200008d1\
-del /s c:\system\install\
-
-rem tjavafile
-rem copy scripts and data
-copy /s z:\tJavaFile\scripts\ c:\tJavaFile\scripts\
-copy /s z:\tJavaFile\data\ c:\tJavaFile\data\
-
-rem run tjavafile tests
-tJavaFile c:\tJavaFile\scripts\midpjartest.txt c:\testresults\tJavaFilejar.log
-tJavaFile c:\tJavaFile\scripts\midpjadtest.txt c:\testresults\tJavaFilejad.log
-tJavaFile c:\tJavaFile\scripts\attributestest.txt c:\testresults\tJavaFileattributes.log
-
-rem copy results to mmc card
-move c:\testresults\tJavaFilejar.log e:\testresults\tJavaFilejar.log
-move c:\testresults\tJavaFilejad.log e:\testresults\tJavaFilejad.log
-move c:\testresults\tJavaFileattributes.log e:\testresults\tJavaFileattributes.log
-
-
-rem delete tJavaFile stuff
-del /s c:\tJavaFile\
-
-REM tmidletuaheaderfilter tests - uses testexecute framework
-copy /s z:\tmidletuaheaderfilter\ c:\tmidletuaheaderfilter\
-testexecute c:\tmidletuaheaderfilter\tmidletuaheaderfilter.script
-move c:\logs\testexecute\tmidletuaheaderfilter.htm e:\testresults\tmidletuaheaderfilter.htm
-del /s c:\tmidletuaheaderfilter\
-
-rem tjavahelper
-rem copy scripts
-copy /s z:\tJavaHelper\ c:\tJavaHelper\
-copy /s z:\rta\ c:\rta\
-copy /s z:\drmdata\ c:\drmdata\
-copy /s z:\midpfiles\ c:\midpfiles\
-
-rem copy rockz.jar which is not duplicated in the ROM but also used for the tJavaInstaller test
-copy z:\tJavaFile\Data\Invalid\rockz.jar c:\midpfiles\rockz.jar
-rem copy invalid midlet data
-rem copy valid midlet data
-md c:\tJavaFile
-md c:\tJavaFile\data
-md c:\tJavaFile\data\Invalid
-md c:\tJavaFile\data\valid
-copy z:\tJavaFile\data\Invalid\kfirewithoutmidletname.jad c:\tJavaFile\data\Invalid\kfirewithoutmidletname.jad
-copy z:\tJavaFile\data\Invalid\kfirewithoutmidletname.jar c:\tJavaFile\data\Invalid\kfirewithoutmidletname.jar
-copy z:\tJavaFile\data\Invalid\kfirewithoutclassname.jad c:\tJavaFile\data\Invalid\kfirewithoutclassname.jad
-copy z:\tJavaFile\data\Invalid\kfirewithoutclassname.jar c:\tJavaFile\data\Invalid\kfirewithoutclassname.jar
-copy z:\tjavaFile\data\invalid\LongUrlinstallnotify.jad c:\tjavaFile\data\invalid\LongUrlinstallnotify.jad
-
-copy z:\tJavaFile\data\invalid\kfirewithicon2_nospaceaftercolon.jar c:\tJavaFile\data\invalid\kfirewithicon2_nospaceaftercolon.jar
-copy z:\tJavaFile\data\invalid\kfirewithicon2_invalidcharaftercolon.jar c:\tJavaFile\data\invalid\kfirewithicon2_invalidcharaftercolon.jar
-copy z:\tJavaFile\data\invalid\kfirewithicon2_novendorval.jar c:\tJavaFile\data\invalid\kfirewithicon2_novendorval.jar
-copy z:\tJavaFile\data\invalid\kfirewithicon2_noversionval.jar c:\tJavaFile\data\invalid\kfirewithicon2_noversionval.jar
-copy z:\tJavaFile\data\invalid\kfirewithicon2_nonameval.jar c:\tJavaFile\data\invalid\kfirewithicon2_nonameval.jar
-
-copy z:\tJavaFile\data\valid\kfirewithicon2_nodescriptionval.jar c:\tJavaFile\data\valid\kfirewithicon2_nodescriptionval.jar
-copy z:\tJavaFile\data\valid\kfirewithicon2_noinfourlval.jar c:\tJavaFile\data\valid\kfirewithicon2_noinfourlval.jar
-copy z:\tJavaFile\data\valid\nojarvalue.jad c:\tJavaFile\data\valid\nojarvalue.jad
-copy z:\tJavaFile\data\valid\nojarvalue.jar c:\tJavaFile\data\valid\nojarvalue.jar
-
-rem copy ocsp certs
-copy z:\cacerts.dat c:\system\data\cacerts.dat
-copy z:\certclients.dat c:\system\data\certclients.dat
-attrib c:\system\data\cacerts.dat -r
-attrib c:\system\data\certclients.dat -r
-
-rem copy files for PDEF099222
-md c:\private\102033E6
-md c:\private\102033E6\MIDlets
-md c:\private\102033E6\MIDlets\[1010fcaf]
-copy z:\tJavaFile\data\valid\mazegame.jar c:\private\102033E6\MIDlets\[1010fcaf]\mazegame.jar
-copy z:\tJavaFile\data\valid\PDEF099222_uids c:\private\102033E6\MIDlets\[1010fcaf]\uids
-md c:\system\install\
-md c:\system\install\registry
-copy z:\tJavaFile\data\valid\PDEF099222_1010FCAF.reg c:\system\install\registry\1010FCAF.reg
-
-rem run tjavahelper tests
-tJavaHelper c:\tJavaHelper\Scripts\MIDPLaunchInfoTest.txt c:\testresults\MIDPLaunchInfoTest.log
-tJavaHelper c:\tJavaHelper\Scripts\tJavaInstaller.txt c:\testresults\tJavaInstaller.log
-tJavaHelper c:\tJavaHelper\Scripts\tJavaInstallerocsp.txt c:\testresults\tJavaInstallerocsp.log
-tJavaHelper c:\tJavaHelper\Scripts\tjmiocsphttpfilter.txt c:\testresults\tjmiocsphttpfilter.log
-tJavaHelper c:\tJavaHelper\Scripts\tjavarunoninstall.txt c:\testresults\tjavarunoninstall.log
-tJavaHelper c:\tJavaHelper\Scripts\tJavaDRM.txt c:\testresults\tJavaDRM.log
-
-rem NQP tests
-tJavaHelper c:\tJavaHelper\Scripts\tjmiotaex.txt c:\testresults\tjmiotaex.log
-
-rem uncomment the below line once the 'DEF100676: OOM tests failing in JMI component' is fixed
-rem tJavaHelper c:\tJavaHelper\Scripts\tjmioom.txt c:\testresults\tjmioom.log
-
-rem copy results to mmc card
-move c:\testresults\MIDPLaunchInfoTest.log e:\testresults\MIDPLaunchInfoTest.log
-move c:\testresults\tJavaInstaller.log e:\testresults\tJavaInstaller.log
-move c:\testresults\tJavaInstallerocsp.log e:\testresults\tJavaInstallerocsp.log
-move c:\testresults\tjmiocsphttpfilter.log e:\testresults\tjmiocsphttpfilter.log
-move c:\testresults\tjavarunoninstall.log e:\testresults\tjavarunoninstall.log
-move c:\testresults\tJavaDRM.log e:\testresults\tJavaDRM.log
-
-rem NQP tests
-move c:\testresults\tjmiotaex.log e:\testresults\tjmiotaex.log
-
-rem uncomment the below line once the 'DEF100676: OOM tests failing in JMI component' is fixed
-rem move c:\testresults\tjmioom.log e:\testresults\tjmioom.log
-
-del /s c:\midpfiles\
-del /s c:\itharnessmidp\
-del /s c:\tJavaFile\
-del /s c:\sys\bin\
-del /s c:\tjavahelper\
-del /s c:\system\install\
-del /s c:\private\00000000\
-del /s c:\private\10205ea5\
-del /s c:\private\102033E6\MIDlets\[1010fcaf]\
-
-rem tjavaregistry
-copy /s z:\tJavaRegistry\ c:\tJavaRegistry\
-tJavaRegistry c:\tJavaRegistry\scripts\script1.txt c:\testresults\tJavaRegistry.log
-move c:\testresults\tJavaRegistry.log e:\testresults\tJavaRegistry.log
-del /s c:\tJavaRegistry\
-
-attrib c:\*.* -r
-del c:\*.*
-
-REM TJAVAHELPERSERVER tests - uses testexecute framework
-copy /s z:\private\10204805\ c:\private\10204805\
-testexecute c:\private\10204805\scripts\tjavahelperserver.script
-move c:\logs\testexecute\tjavahelperserver.htm e:\testresults\tjavahelperserver.htm
-del /s c:\private\10204805\
-del /s c:\sys\bin\
-
-REM Run recognizer tests
-md c:\trecog
-copy /s z:\trecog\* c:\trecog
-
-testexecute z:\trecog\trecogjava.script
-move c:\logs\testexecute\trecogjava.htm e:\testresults\trecogjava.htm
-
-del c:\trecog\*.*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/runpkcs12tests.bat Mon May 03 14:11:52 2010 +0300
@@ -0,0 +1,21 @@
+@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:
+@rem
+copy /s z:\tpkcs12intg\ c:\tpkcs12intg\
+testexecute c:\tpkcs12intg\data\tpkcs12lib.script
+move c:\logs\testexecute\tpkcs12lib.htm e:\testresults\tpkcs12lib.htm
+del /s c:\tpkcs12intg
+attrib c:\*.* -r
+del c:\*.*
\ No newline at end of file
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runpkcs12tests_9.4.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +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:
-@rem
-copy /s z:\tpkcs12intg\ c:\tpkcs12intg\
-testexecute c:\tpkcs12intg\data\tpkcs12lib.script
-move c:\logs\testexecute\tpkcs12lib.htm e:\testresults\tpkcs12lib.htm
-del /s c:\tpkcs12intg
-attrib c:\*.* -r
-del c:\*.*
\ No newline at end of file
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runsisinstaller_9.4.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +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:
-@rem
-copy /s z:\tInstalledAppsRegistry\ c:\tInstalledAppsRegistry\
-md c:\System
-md c:\System\Install
-md c:\System\Install\Registry
-md e:\System
-md e:\System\Install
-md e:\System\Install\Registry
-attrib c:\tInstalledAppsRegistry\Data\0000000C.REG -r
-attrib c:\tInstalledAppsRegistry\Data\0000000D.REG -r
-copy c:\tInstalledAppsRegistry\Data\0000000C.REG c:\System\Install\Registry\
-copy c:\tInstalledAppsRegistry\Data\0000000D.REG e:\System\Install\Registry\
-del c:\tInstalledAppsRegistry\Data\0000000C.REG
-del c:\tInstalledAppsRegistry\Data\0000000D.REG
-
-rem run tinstalledappsregistry tests
-tInstalledAppsRegistry c:\tInstalledAppsRegistry\scripts\script1.txt c:\testresults\tInstalledAppsRegistry.log
-
-rem copy logs to mmc card
-move c:\testresults\tInstalledAppsRegistry.log e:\testresults\tInstalledAppsRegistry.log
-
-attrib c:\*.* -r
-del c:\*.*
-
-REM tintegritysupport
-
-REM copy /s z:\tIntegritySupport\data\ c:\tIntegritySupport\data\
-REM tIntegritySupport z:\tIntegritySupport\scripts\tisrecovery.txt c:\testresults\tisrecovery.log
-REM tIntegritySupport z:\tIntegritySupport\scripts\tisrecoveryapp.txt c:\testresults\tisrecoveryapp.log
-REM del /s c:\tIntegritySupport\data\
-
-
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runswiromtests_9.4.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,315 +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:
-@rem
-md c:\savedresults
-copy /s e:\testresults\* c:\savedresults
-
-REM Save the USB Bootloader and BATS hardware board config file
-md c:\USBLoader
-copy /s e:\usbload.zip c:\USBLoader
-copy /s e:\_hw_board_* c:\USBLoader
-
-REM Run test
-testexecute z:\tswi\tuiscriptadaptors\scripts\tsilent_h2.script
-
-REM Run test
-testexecute z:\tswi\tuiscriptadaptors\scripts\tswidaemonstub_h2.script
-
-REM Run test
-testexecute z:\tswi\tuiscriptadaptors\scripts\inc098114_h2.script
-
-md c:\tswi
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tcleanupinfrastructure.script
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tpropagation_arm.script
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\test_pa_sapropagated_notdelete.script
-
-
-REM Restore results
-md e:\testresults
-copy /s c:\savedresults e:\testresults\*
-del /s c:\savedresults\*
-
-REM Restore USB Bootloader and BATS hardware board config file
-copy c:\USBLoader\usbload.zip e:\usbload.zip
-copy c:\USBLoader\_hw_board_* e:\_hw_board_*
-del /s c:\USBLoader\*
-
-# Save Silent Install, cleanupinfrastructure and tpropagation test results
-move c:\logs\testexecute\tsilent_h2.htm e:\testresults\tsilent_h2.htm
-move c:\logs\testexecute\tswidaemonstub_h2.htm e:\testresults\tswidaemonstub_h2.htm
-move c:\logs\testexecute\inc098114_h2.htm e:\testresults\inc098114_h2.htm
-move c:\logs\testexecute\tcleanupinfrastructure.htm e:\testresults\tcleanupinfrastructure.htm
-copy c:\logs\testexecute\tpropagation_arm.htm e:\testresults\tpropagation_arm.htm
-move c:\logs\testexecute\test_pa_sapropagated_notdelete.htm e:\testresults\test_pa_sapropagated_notdelete.htm
-
-REM Run recognizer tests
-md c:\trecog
-copy /s z:\trecog\* c:\trecog
-
-testexecute z:\trecog\trecogcert.script
-move c:\logs\testexecute\trecogcert.htm e:\testresults\trecogcert.htm
-
-testexecute z:\trecog\trecogpkcs12.script
-move c:\logs\testexecute\trecogpkcs12.htm e:\testresults\trecogpkcs12.htm
-
-testexecute z:\tswi\swicaptests\scripts\swicaptests.script
-move c:\logs\testexecute\swicaptests.htm e:\testresults\swicaptests.htm
-
-testexecute z:\tswi\tsis\scripts\tsis.script
-move c:\logs\testexecute\tsis.htm e:\testresults\tsis.htm
-
-testexecute z:\tswi\tsis\scripts\tsis_signed.script
-move c:\logs\testexecute\tsis_signed.htm e:\testresults\tsis_signed.htm
-
-testexecute z:\tswi\tintegrityservices\scripts\tintegrityservices.script
-move c:\logs\testexecute\tintegrityservices.htm e:\testresults\tintegrityservices.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testuninstallation_arm_only.script
-move c:\logs\testexecute\testuninstallation_arm_only.htm e:\testresults\testuninstallation_arm_only.htm
-
-testexecute z:\tswi\tsishelper\scripts\tsishelper.script
-move c:\logs\testexecute\tsishelper.htm e:\testresults\tsishelper.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testwritableswicertstore.script
-move c:\logs\testexecute\testwritableswicertstore.htm e:\testresults\testwritableswicertstore.htm
-
-REM NQP Tests for DataProvider
-testexecute z:\tswi\tdataprovider\scripts\tdataprovider.script
-move c:\logs\testexecute\tdataprovider.htm e:\testresults\tdataprovider.htm
-
-md c:\private
-md c:\private\101f72a6\
-copy z:\tswi\tsis\data\certstore\* c:\private\101f72a6\
-
-attrib c:\tswi\*.* -r
-
-copy z:\auto.cfg c:\
-copy z:\auto_broken.cfg c:\
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuiscriptadaptors.script
-move c:\logs\testexecute\tuiscriptadaptors.htm e:\testresults\tuiscriptadaptors.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuninstallpkgs_h4.script
-move c:\logs\testexecute\tuninstallpkgs_h4.htm e:\testresults\tuninstallpkgs_h4.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testvids.script
-move c:\logs\testexecute\testvids.htm e:\testresults\testvids.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testasync.script
-move c:\logs\testexecute\testasync.htm e:\testresults\testasync.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrmasync.script
-move c:\logs\testexecute\testdrmasync.htm e:\testresults\testdrmasync.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuiscriptadaptorsFH.script
-move c:\logs\testexecute\tuiscriptadaptorsFH.htm e:\testresults\tuiscriptadaptorsFH.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testexpressions.script
-move c:\logs\testexecute\testexpressions.htm e:\testresults\testexpressions.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrives.script
-move c:\logs\testexecute\testdrives.htm e:\testresults\testdrives.htm
-
-copy z:\auto.cfg c:\auto.cfg
-attrib c:\auto.cfg -r
-md c:\tswi\tbackuprestore
-testexecute z:\tswi\tbackuprestore\scripts\tbackuprestore.script
-move c:\logs\testexecute\tbackuprestore.htm e:\testresults\tbackuprestore.htm
-
-testexecute z:\tswi\tbackuprestore\scripts\tbackuprestoredrive_armv5.script
-move c:\logs\testexecute\tbackuprestoredrive_armv5.htm e:\testresults\tbackuprestoredrive_armv5.htm
-
-testexecute z:\tswi\tbackuprestore\scripts\tbackuptrestore_exploratory.script
-move c:\logs\testexecute\tbackuptrestore_exploratory.htm e:\testresults\tbackuptrestore_exploratory.htm
-
-testexecute z:\tswi\trevocation\scripts\trevocation.script
-move c:\logs\testexecute\trevocation.htm e:\testresults\trevocation.htm
-
-testexecute z:\tswi\tdaemon\scripts\tdaemon.script
-move c:\logs\testexecute\tdaemon.htm e:\testresults\tdaemon.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testlocations.script
-move c:\logs\testexecute\testlocations.htm e:\testresults\testlocations.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testcancel.script
-move c:\logs\testexecute\testcancel.htm e:\testresults\testcancel.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testasynccancel.script
-move c:\logs\testexecute\testasynccancel.htm e:\testresults\testasynccancel.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testrun.script
-move c:\logs\testexecute\testrun.htm e:\testresults\testrun.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testrunft.script
-move c:\logs\testexecute\testrunft.htm e:\testresults\testrunft.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testupgrades.script
-move c:\logs\testexecute\testupgrades.htm e:\testresults\testupgrades.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testaugmentations.script
-move c:\logs\testexecute\testaugmentations.htm e:\testresults\testaugmentations.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testpreinstalled.script
-move c:\logs\testexecute\testpreinstalled.htm e:\testresults\testpreinstalled.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdependencies.script
-move c:\logs\testexecute\testdependencies.htm e:\testresults\testdependencies.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testshutdown.script
-move c:\logs\testexecute\testshutdown.htm e:\testresults\testshutdown.htm
-
-testexecute z:\tswi\tsisregistrytest\scripts\tsisregistrytest.script
-move c:\logs\testexecute\tsisregistrytest.htm e:\testresults\tsisregistrytest.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tsisstub.script
-move c:\logs\testexecute\tsisstub.htm e:\testresults\tsisstub.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrm.script
-move c:\logs\testexecute\testdrm.htm e:\testresults\testdrm.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrmFH.script
-move c:\logs\testexecute\testdrmFH.htm e:\testresults\testdrmFH.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testmulti.script
-move c:\logs\testexecute\testmulti.htm e:\testresults\testmulti.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testextension.script
-move c:\logs\testexecute\testextension.htm e:\testresults\testextension.htm
-
-REM install automated commdb using sim.tsy for tdev
-ced -i z:\autosimtsy.cfg
-
-copy z:\tswi\tdevcerts\config.txt c:\config.txt
-testexecute z:\tswi\tdevcerts\scripts\devcerts_match.script
-move c:\logs\testexecute\devcerts_match.htm e:\testresults\devcerts_match.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_mismatch.script
-move c:\logs\testexecute\devcerts_mismatch.htm e:\testresults\devcerts_mismatch.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_aggregate.script
-move c:\logs\testexecute\devcerts_aggregate.htm e:\testresults\devcerts_aggregate.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_corrupt.script
-move c:\logs\testexecute\devcerts_corrupt.htm e:\testresults\devcerts_corrupt.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_backuprestore.script
-move c:\logs\testexecute\devcerts_backuprestore.htm e:\testresults\devcerts_backuprestore.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_backup.script
-move c:\logs\testexecute\devcerts_backup.htm e:\testresults\devcerts_backup.htm
-
-attrib c:\config.txt -r
-del c:\config.txt
-copy z:\tswi\tdevcerts\config2.txt c:\config.txt
-testexecute z:\tswi\tdevcerts\scripts\devcerts_restore.script
-move c:\logs\testexecute\devcerts_restore.htm e:\testresults\devcerts_restore.htm
-attrib c:\config.txt -r
-del c:\config.txt
-
-REM restore standard automated commdb for the rest of the tests
-ced -i z:\auto.cfg
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_ocsp.script
-move c:\logs\testexecute\devcerts_ocsp.htm e:\testresults\devcerts_ocsp.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testeclipse.script
-move c:\logs\testexecute\testeclipse.htm e:\testresults\testeclipse.htm
-
-#testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialog.script
-#move c:\logs\testexecute\tuileavedialog.htm e:\testresults\tuileavedialog.htm
-
-#testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialogasync.script
-#move c:\logs\testexecute\tuileavedialogasync.htm e:\testresults\tuileavedialogasync.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testappinuse.script
-move c:\logs\testexecute\testappinuse.htm e:\testresults\testappinuse.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testVFP.script
-move c:\logs\testexecute\testVFP.htm e:\testresults\testVFP.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\switermination.script
-move c:\logs\testexecute\switermination.htm e:\testresults\switermination.htm
-
-REM Test non removable flag
-testexecute z:\tswi\tuiscriptadaptors\scripts\testnonremovable_armv5.script
-move c:\logs\testexecute\testnonremovable_armv5.htm e:\testresults\testnonremovable_armv5.htm
-
-md c:\tswi\tbackuprestore
-testexecute z:\tswi\tuiscriptadaptors\scripts\tresetdevice.script
-move c:\logs\testexecute\tresetdevice.htm e:\testresults\tresetdevice.htm
-
-REM DevInfoSupport test
-tdevinfosupport
-copy c:\swi.log e:\testresults\swi.log
-del c:\swi.log
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialog.script
-move c:\logs\testexecute\tuileavedialog.htm e:\testresults\tuileavedialog.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialogasync.script
-move c:\logs\testexecute\tuileavedialogasync.htm e:\testresults\tuileavedialogasync.htm
-
-REM SwiConsole Tests
-testexecute z:\tswi\tswiconsole\scripts\tswiconsole.script
-move c:\logs\testexecute\tswiconsole.htm e:\testresults\tswiconsole.htm
-
-REM DEF083628: Orphaned files in protected dirs can be overwritten by untrusted packages
-testexecute z:\tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script
-move c:\logs\testexecute\overwriteprivate_positive.htm e:\testresults\overwriteprivate_positive.script.htm
-
-testexecute z:\tswi\tautosigning\scripts\tautosigning.script
-copy c:\logs\testexeute\tautosigning.htm e:\testresults\tautosigning.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testasynccaps.script
-move c:\logs\testexecute\testasynccaps.htm e:\testresults\testasynccaps.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdiskfullemulator.script
-move c:\logs\testexecute\testdiskfullemulator.htm e:\testresults\testdiskfullemulator.htm
-
-del e:\BigTempFile
-
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testmandatory_HW.script
-move c:\logs\testexecute\testmandatory_hw.htm e:\testresults\testmandatory.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testsystemcaps.script
-move c:\logs\testexecute\testsystemcaps.htm e:\testresults\testsystemcaps.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testusercaps.script
-move c:\logs\testexecute\testusercaps.htm e:\testresults\testusercaps.htm
-REM Demandpaging tests
-testexecute z:\tswi\tuiscriptadaptors\scripts\tdempaging_armv5.script
-move c:\logs\testexecute\tdempaging_armv5.htm e:\testresults\tdempaging_armv5.htm
-
-REM CR0914Tests
-testexecute z:\tswi\tsisregistrytest\scripts\integritychecktest.script
-move c:\logs\testexecute\integritychecktest.htm e:\testresults\integritychecktest.htm
-
-REM NQP Tests for DataProvider
-testexecute z:\tswi\tdataprovider\scripts\tdataprovider.script
-move c:\logs\testexecute\tdataprovider.htm e:\testresults\tdataprovider.htm
-
-REM SWI Adorned filename handling tests
-testexecute.exe z:\tswi\tuiscriptadaptors\scripts\adornedfilenames.script
-copy c:\logs\testexecute\adornedfilenames.htm e:\testresults\adornedfilenames.htm
-
-del c:\temp\*.*
-attrib c:\tswi\*.* -r
-del c:\tswi\*.*
-
-attrib c:\logs\testexecute\*.* -r
-del c:\logs\testexecute\*.*
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runswiromtests_9.4_mcs.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +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:
-@rem
-
-md c:\tswi\
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testpastub.script
-move c:\logs\testexecute\testpastub.htm e:\testresults\testpastub.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testsapropagatedstub.script
-move c:\logs\testexecute\testsapropagatedstub.htm e:\testresults\testsapropagatedstub.htm
-
-testexecute z:\tswi\tsis\scripts\tsis_failure.script
-move c:\logs\testexecute\tsis_failure.htm e:\testresults\tsis_failure.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testnotargetdevices.script
-move c:\logs\testexecute\testnotargetdevices.htm e:\testresults\testnotargetdevices.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testpreinstalled_delete.script
-move c:\logs\testexecute\testpreinstalled_delete.htm e:\testresults\testpreinstalled_delete.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tsisstub_delete.script
-move c:\logs\testexecute\tsisstub_delete.htm e:\testresults\tsisstub_delete.htm
-
-REM DEF096906: Regression in SIS file functionality
-testexecute z:\tswi\tuiscriptadaptors\scripts\testuninstallation.script
-move c:\logs\testexecute\testuninstallation.htm e:\testresults\testuninstallation.htm
-
-md c:\tswi\tbackuprestore\
-md c:\drive_r\
-setsubst r: c:\drive_r\
-testexecute z:\tswi\tpathsubst\scripts\tpathsubst.script
-move c:\logs\testexecute\tpathsubst.htm e:\testresults\tpathsubst.htm
-setsubst r:
-del c:\drive_r\*.*
-
-
-REM DEF083628: Orphaned files in protected dirs can be overwritten by untrusted packages
-testexecute z:\tswi\tuiscriptadaptors\scripts\overwriteprivate.script
-move c:\logs\testexecute\overwriteprivate.htm e:\testresults\overwriteprivate.script.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\cr956_test_armv5.script
-move c:\logs\testexecute\cr956_test_armv5.htm e:\testresults\cr956_test_armv5.htm
-
-del c:\temp\*.*
-attrib c:\tswi\*.* -r
-del c:\tswi\*.*
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runswiromtests_9.5.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,330 +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:
-@rem
-md c:\savedresults
-copy /s e:\testresults\* c:\savedresults
-
-REM Save the USB Bootloader and BATS hardware board config file
-md c:\USBLoader
-copy /s e:\usbload.zip c:\USBLoader
-copy /s e:\_hw_board_* c:\USBLoader
-
-REM Run test
-testexecute z:\tswi\tuiscriptadaptors\scripts\tsilent_h2.script
-
-REM Run test
-testexecute z:\tswi\tuiscriptadaptors\scripts\tswidaemonstub_h2.script
-
-REM Run test
-testexecute z:\tswi\tuiscriptadaptors\scripts\inc098114_h2.script
-
-md c:\tswi
-md c:\tswi\tbackuprestore
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tcleanupinfrastructure.script
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tpropagation_arm.script
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\test_pa_sapropagated_notdelete.script
-
-REM Restore results
-md e:\testresults
-copy /s c:\savedresults e:\testresults\*
-del /s c:\savedresults\*
-
-REM Restore USB Bootloader and BATS hardware board config file
-copy c:\USBLoader\usbload.zip e:\usbload.zip
-copy c:\USBLoader\_hw_board_* e:\_hw_board_*
-del /s c:\USBLoader\*
-
-# Save Silent Install, cleanupinfrastructure and tpropagation test results
-move c:\logs\testexecute\tsilent_h2.htm e:\testresults\tsilent_h2.htm
-move c:\logs\testexecute\inc098114_h2.htm e:\testresults\inc098114_h2.htm
-move c:\logs\testexecute\tcleanupinfrastructure.htm e:\testresults\tcleanupinfrastructure.htm
-move c:\logs\testexecute\tpropagation_arm.htm e:\testresults\tpropagation_arm.htm
-move c:\logs\testexecute\test_pa_sapropagated_notdelete.htm e:\testresults\test_pa_sapropagated_notdelete.htm
-
-REM Run recognizer tests
-md c:\trecog
-copy /s z:\trecog\* c:\trecog
-
-testexecute z:\trecog\trecogcert.script
-move c:\logs\testexecute\trecogcert.htm e:\testresults\trecogcert.htm
-
-testexecute z:\trecog\trecogpkcs12.script
-move c:\logs\testexecute\trecogpkcs12.htm e:\testresults\trecogpkcs12.htm
-
-testexecute z:\tswi\swicaptests\scripts\swicaptests.script
-move c:\logs\testexecute\swicaptests.htm e:\testresults\swicaptests.htm
-
-testexecute z:\tswi\tsis\scripts\tsis.script
-move c:\logs\testexecute\tsis.htm e:\testresults\tsis.htm
-
-testexecute z:\tswi\tsis\scripts\tsis_signed.script
-move c:\logs\testexecute\tsis_signed.htm e:\testresults\tsis_signed.htm
-
-testexecute z:\tswi\tintegrityservices\scripts\tintegrityservices.script
-move c:\logs\testexecute\tintegrityservices.htm e:\testresults\tintegrityservices.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testuninstallation_arm_only.script
-move c:\logs\testexecute\testuninstallation_arm_only.htm e:\testresults\testuninstallation_arm_only.htm
-
-testexecute z:\tswi\tsishelper\scripts\tsishelper.script
-move c:\logs\testexecute\tsishelper.htm e:\testresults\tsishelper.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testwritableswicertstore.script
-move c:\logs\testexecute\testwritableswicertstore.htm e:\testresults\testwritableswicertstore.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testrucert.script
-move c:\logs\testexecute\testrucert.htm e:\testresults\testrucert.htm
-
-
-REM NQP Tests for DataProvider
-testexecute z:\tswi\tdataprovider\scripts\tdataprovider.script
-move c:\logs\testexecute\tdataprovider.htm e:\testresults\tdataprovider.htm
-
-md c:\private
-md c:\private\101f72a6\
-copy z:\tswi\tsis\data\certstore\* c:\private\101f72a6\
-
-attrib c:\tswi\*.* -r
-
-copy z:\auto.cfg c:\
-copy z:\auto_broken.cfg c:\
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuiscriptadaptors.script
-move c:\logs\testexecute\tuiscriptadaptors.htm e:\testresults\tuiscriptadaptors.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuninstallpkgs_h4.script
-move c:\logs\testexecute\tuninstallpkgs_h4.htm e:\testresults\tuninstallpkgs_h4.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testvids.script
-move c:\logs\testexecute\testvids.htm e:\testresults\testvids.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testasync.script
-move c:\logs\testexecute\testasync.htm e:\testresults\testasync.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrmasync.script
-move c:\logs\testexecute\testdrmasync.htm e:\testresults\testdrmasync.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuiscriptadaptorsFH.script
-move c:\logs\testexecute\tuiscriptadaptorsFH.htm e:\testresults\tuiscriptadaptorsFH.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testexpressions.script
-move c:\logs\testexecute\testexpressions.htm e:\testresults\testexpressions.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrives.script
-move c:\logs\testexecute\testdrives.htm e:\testresults\testdrives.htm
-
-copy z:\auto.cfg c:\auto.cfg
-attrib c:\auto.cfg -r
-
-testexecute z:\tswi\trevocation\scripts\trevocation.script
-move c:\logs\testexecute\trevocation.htm e:\testresults\trevocation.htm
-
-testexecute z:\tswi\tdaemon\scripts\tdaemon.script
-move c:\logs\testexecute\tdaemon.htm e:\testresults\tdaemon.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testlocations.script
-move c:\logs\testexecute\testlocations.htm e:\testresults\testlocations.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testcancel.script
-move c:\logs\testexecute\testcancel.htm e:\testresults\testcancel.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testasynccancel.script
-move c:\logs\testexecute\testasynccancel.htm e:\testresults\testasynccancel.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testrun.script
-move c:\logs\testexecute\testrun.htm e:\testresults\testrun.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testrunft.script
-move c:\logs\testexecute\testrunft.htm e:\testresults\testrunft.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testupgrades.script
-move c:\logs\testexecute\testupgrades.htm e:\testresults\testupgrades.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testaugmentations.script
-move c:\logs\testexecute\testaugmentations.htm e:\testresults\testaugmentations.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testpreinstalled.script
-move c:\logs\testexecute\testpreinstalled.htm e:\testresults\testpreinstalled.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdependencies.script
-move c:\logs\testexecute\testdependencies.htm e:\testresults\testdependencies.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testshutdown.script
-move c:\logs\testexecute\testshutdown.htm e:\testresults\testshutdown.htm
-
-testexecute z:\tswi\tsisregistrytest\scripts\tsisregistrytest.script
-move c:\logs\testexecute\tsisregistrytest.htm e:\testresults\tsisregistrytest.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tsisstub.script
-move c:\logs\testexecute\tsisstub.htm e:\testresults\tsisstub.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrm.script
-move c:\logs\testexecute\testdrm.htm e:\testresults\testdrm.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrmFH.script
-move c:\logs\testexecute\testdrmFH.htm e:\testresults\testdrmFH.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testmulti.script
-move c:\logs\testexecute\testmulti.htm e:\testresults\testmulti.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testextension.script
-move c:\logs\testexecute\testextension.htm e:\testresults\testextension.htm
-
-REM install automated commdb using sim.tsy for tdev
-ced -i z:\autosimtsy.cfg
-
-copy z:\tswi\tdevcerts\config.txt c:\config.txt
-testexecute z:\tswi\tdevcerts\scripts\devcerts_match.script
-move c:\logs\testexecute\devcerts_match.htm e:\testresults\devcerts_match.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_mismatch.script
-move c:\logs\testexecute\devcerts_mismatch.htm e:\testresults\devcerts_mismatch.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_aggregate.script
-move c:\logs\testexecute\devcerts_aggregate.htm e:\testresults\devcerts_aggregate.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_corrupt.script
-move c:\logs\testexecute\devcerts_corrupt.htm e:\testresults\devcerts_corrupt.htm
-
-md c:\tswi\tbackuprestore
-testexecute z:\tswi\tdevcerts\scripts\devcerts_backuprestore.script
-move c:\logs\testexecute\devcerts_backuprestore.htm e:\testresults\devcerts_backuprestore.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_backup.script
-move c:\logs\testexecute\devcerts_backup.htm e:\testresults\devcerts_backup.htm
-
-attrib c:\config.txt -r
-del c:\config.txt
-copy z:\tswi\tdevcerts\config2.txt c:\config.txt
-testexecute z:\tswi\tdevcerts\scripts\devcerts_restore.script
-move c:\logs\testexecute\devcerts_restore.htm e:\testresults\devcerts_restore.htm
-attrib c:\config.txt -r
-del c:\config.txt
-
-REM restore standard automated commdb for the rest of the tests
-ced -i z:\auto.cfg
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_ocsp.script
-move c:\logs\testexecute\devcerts_ocsp.htm e:\testresults\devcerts_ocsp.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testeclipse.script
-move c:\logs\testexecute\testeclipse.htm e:\testresults\testeclipse.htm
-
-#testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialog.script
-#move c:\logs\testexecute\tuileavedialog.htm e:\testresults\tuileavedialog.htm
-
-#testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialogasync.script
-#move c:\logs\testexecute\tuileavedialogasync.htm e:\testresults\tuileavedialogasync.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testappinuse.script
-move c:\logs\testexecute\testappinuse.htm e:\testresults\testappinuse.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testVFP.script
-move c:\logs\testexecute\testVFP.htm e:\testresults\testVFP.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\switermination.script
-move c:\logs\testexecute\switermination.htm e:\testresults\switermination.htm
-
-REM Test non removable flag
-testexecute z:\tswi\tuiscriptadaptors\scripts\testnonremovable.script
-move c:\logs\testexecute\testnonremovable.htm e:\testresults\testnonremovable.htm
-
-md c:\tswi\tbackuprestore
-testexecute z:\tswi\tuiscriptadaptors\scripts\tresetdevice.script
-move c:\logs\testexecute\tresetdevice.htm e:\testresults\tresetdevice.htm
-
-REM DevInfoSupport test
-tdevinfosupport
-copy c:\swi.log e:\testresults\swi.log
-del c:\swi.log
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialog.script
-move c:\logs\testexecute\tuileavedialog.htm e:\testresults\tuileavedialog.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialogasync.script
-move c:\logs\testexecute\tuileavedialogasync.htm e:\testresults\tuileavedialogasync.htm
-
-REM SwiConsole Tests
-testexecute z:\tswi\tswiconsole\scripts\tswiconsole.script
-move c:\logs\testexecute\tswiconsole.htm e:\testresults\tswiconsole.htm
-
-REM DEF083628: Orphaned files in protected dirs can be overwritten by untrusted packages
-testexecute z:\tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script
-move c:\logs\testexecute\overwriteprivate_positive.htm e:\testresults\overwriteprivate_positive.script.htm
-
-testexecute z:\tswi\tautosigning\scripts\tautosigning.script
-move c:\logs\testexecute\tautosigning.htm e:\testresults\tautosigning.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testasynccaps.script
-move c:\logs\testexecute\testasynccaps.htm e:\testresults\testasynccaps.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdiskfullemulator.script
-move c:\logs\testexecute\testdiskfullemulator.htm e:\testresults\testdiskfullemulator.htm
-
-del e:\BigTempFile
-
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testmandatory_HW.script
-move c:\logs\testexecute\testmandatory_hw.htm e:\testresults\testmandatory.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testsystemcaps.script
-move c:\logs\testexecute\testsystemcaps.htm e:\testresults\testsystemcaps.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testusercaps.script
-move c:\logs\testexecute\testusercaps.htm e:\testresults\testusercaps.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testusercaps_nousergrantcaps_hw.script
-move c:\logs\testexecute\testusercaps_nousergrantcaps_hw.htm e:\testresults\testusercaps_nousergrantcaps_hw.htm
-
-REM Demandpaging tests
-testexecute z:\tswi\tuiscriptadaptors\scripts\tdempaging_armv5.script
-move c:\logs\testexecute\tdempaging_armv5.htm e:\testresults\tdempaging_armv5.htm
-
-REM CR0914Tests
-testexecute z:\tswi\tsisregistrytest\scripts\integritychecktest.script
-move c:\logs\testexecute\integritychecktest.htm e:\testresults\integritychecktest.htm
-
-REM NQP Tests for DataProvider
-testexecute z:\tswi\tdataprovider\scripts\tdataprovider.script
-move c:\logs\testexecute\tdataprovider.htm e:\testresults\tdataprovider.htm
-
-REM SWI Observer Tests
-testexecute z:\tswi\tswiobserver\scripts\testswiobserver.script
-copy c:\logs\testexecute\testswiobserver.htm e:\testresults\testswiobserver.htm
-
-REM SWI Adorned filename handling tests
-testexecute.exe z:\tswi\tuiscriptadaptors\scripts\adornedfilenames.script
-copy c:\logs\testexecute\adornedfilenames.htm e:\testresults\adornedfilenames.htm
-
-REM Backup/restore tests
-md c:\tswi\tbackuprestore
-
-testexecute z:\tswi\tbackuprestore\scripts\tbackuptrestore_exploratory.script
-move c:\logs\testexecute\tbackuptrestore_exploratory.htm e:\testresults\tbackuptrestore_exploratory.htm
-
-testexecute z:\tswi\tbackuprestore\scripts\tbackuprestore.script
-move c:\logs\testexecute\tbackuprestore.htm e:\testresults\tbackuprestore.htm
-
-testexecute z:\tswi\tbackuprestore\scripts\tbackuprestoredrive_armv5.script
-move c:\logs\testexecute\tbackuprestoredrive_armv5.htm e:\testresults\tbackuprestoredrive_armv5.htm
-
-del c:\temp\*.*
-attrib c:\tswi\*.* -r
-del c:\tswi\*.*
-
-attrib c:\logs\testexecute\*.* -r
-del c:\logs\testexecute\*.*
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runswiromtests_9.6.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,334 +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:
-@rem
-md c:\savedresults
-copy /s e:\testresults\* c:\savedresults
-
-REM Save the USB Bootloader and BATS hardware board config file
-md c:\USBLoader
-copy /s e:\usbload.zip c:\USBLoader
-copy /s e:\_hw_board_* c:\USBLoader
-
-REM Run test
-testexecute z:\tswi\tuiscriptadaptors\scripts\tsilent_h2.script
-
-REM Run test
-testexecute z:\tswi\tuiscriptadaptors\scripts\tswidaemonstub_h2.script
-
-REM Run test
-testexecute z:\tswi\tuiscriptadaptors\scripts\inc098114_h2.script
-
-md c:\tswi
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tcleanupinfrastructure.script
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tpropagation_arm.script
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\test_pa_sapropagated_notdelete.script
-
-REM Restore results
-md e:\testresults
-copy /s c:\savedresults e:\testresults\*
-del /s c:\savedresults\*
-
-REM Restore USB Bootloader and BATS hardware board config file
-copy c:\USBLoader\usbload.zip e:\usbload.zip
-copy c:\USBLoader\_hw_board_* e:\_hw_board_*
-del /s c:\USBLoader\*
-
-# Save Silent Install, cleanupinfrastructure and tpropagation test results
-move c:\logs\testexecute\tsilent_h2.htm e:\testresults\tsilent_h2.htm
-move c:\logs\testexecute\tswidaemonstub_h2.htm e:\testresults\tswidaemonstub_h2.htm
-move c:\logs\testexecute\inc098114_h2.htm e:\testresults\inc098114_h2.htm
-move c:\logs\testexecute\tcleanupinfrastructure.htm e:\testresults\tcleanupinfrastructure.htm
-move c:\logs\testexecute\tpropagation_arm.htm e:\testresults\tpropagation_arm.htm
-move c:\logs\testexecute\test_pa_sapropagated_notdelete.htm e:\testresults\test_pa_sapropagated_notdelete.htm
-
-REM Run recognizer tests
-md c:\trecog
-copy /s z:\trecog\* c:\trecog
-
-testexecute z:\trecog\trecogcert.script
-move c:\logs\testexecute\trecogcert.htm e:\testresults\trecogcert.htm
-
-testexecute z:\trecog\trecogpkcs12.script
-move c:\logs\testexecute\trecogpkcs12.htm e:\testresults\trecogpkcs12.htm
-
-testexecute z:\tswi\swicaptests\scripts\swicaptests.script
-move c:\logs\testexecute\swicaptests.htm e:\testresults\swicaptests.htm
-
-testexecute z:\tswi\tsis\scripts\tsis.script
-move c:\logs\testexecute\tsis.htm e:\testresults\tsis.htm
-
-testexecute z:\tswi\tsis\scripts\tsis_signed.script
-move c:\logs\testexecute\tsis_signed.htm e:\testresults\tsis_signed.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testuninstallation_arm_only.script
-move c:\logs\testexecute\testuninstallation_arm_only.htm e:\testresults\testuninstallation_arm_only.htm
-
-testexecute z:\tswi\tsishelper\scripts\tsishelper.script
-move c:\logs\testexecute\tsishelper.htm e:\testresults\tsishelper.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testwritableswicertstore.script
-move c:\logs\testexecute\testwritableswicertstore.htm e:\testresults\testwritableswicertstore.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testrucert.script
-move c:\logs\testexecute\testrucert.htm e:\testresults\testrucert.htm
-
-
-REM NQP Tests for DataProvider
-testexecute z:\tswi\tdataprovider\scripts\tdataprovider.script
-move c:\logs\testexecute\tdataprovider.htm e:\testresults\tdataprovider.htm
-
-md c:\private
-md c:\private\101f72a6\
-copy z:\tswi\tsis\data\certstore\* c:\private\101f72a6\
-
-attrib c:\tswi\*.* -r
-
-copy z:\auto.cfg c:\
-copy z:\auto_broken.cfg c:\
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuiscriptadaptors.script
-move c:\logs\testexecute\tuiscriptadaptors.htm e:\testresults\tuiscriptadaptors.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuninstallpkgs_h4.script
-move c:\logs\testexecute\tuninstallpkgs_h4.htm e:\testresults\tuninstallpkgs_h4.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testvids.script
-move c:\logs\testexecute\testvids.htm e:\testresults\testvids.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testasync.script
-move c:\logs\testexecute\testasync.htm e:\testresults\testasync.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrmasync.script
-move c:\logs\testexecute\testdrmasync.htm e:\testresults\testdrmasync.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuiscriptadaptorsFH.script
-move c:\logs\testexecute\tuiscriptadaptorsFH.htm e:\testresults\tuiscriptadaptorsFH.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testexpressions.script
-move c:\logs\testexecute\testexpressions.htm e:\testresults\testexpressions.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrives.script
-move c:\logs\testexecute\testdrives.htm e:\testresults\testdrives.htm
-
-copy z:\auto.cfg c:\auto.cfg
-attrib c:\auto.cfg -r
-md c:\tswi\tbackuprestore
-testexecute z:\tswi\tbackuprestore\scripts\tbackuprestore.script
-move c:\logs\testexecute\tbackuprestore.htm e:\testresults\tbackuprestore.htm
-
-testexecute z:\tswi\tbackuprestore\scripts\tbackuprestoredrive_armv5.script
-move c:\logs\testexecute\tbackuprestoredrive_armv5.htm e:\testresults\tbackuprestoredrive_armv5.htm
-
-testexecute z:\tswi\tbackuprestore\scripts\tbackuptrestore_exploratory.script
-move c:\logs\testexecute\tbackuptrestore_exploratory.htm e:\testresults\tbackuptrestore_exploratory.htm
-
-testexecute z:\tswi\trevocation\scripts\trevocation.script
-move c:\logs\testexecute\trevocation.htm e:\testresults\trevocation.htm
-
-testexecute z:\tswi\tdaemon\scripts\tdaemon.script
-move c:\logs\testexecute\tdaemon.htm e:\testresults\tdaemon.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testlocations.script
-move c:\logs\testexecute\testlocations.htm e:\testresults\testlocations.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testcancel.script
-move c:\logs\testexecute\testcancel.htm e:\testresults\testcancel.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testrun.script
-move c:\logs\testexecute\testrun.htm e:\testresults\testrun.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testrunft.script
-move c:\logs\testexecute\testrunft.htm e:\testresults\testrunft.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testupgrades.script
-move c:\logs\testexecute\testupgrades.htm e:\testresults\testupgrades.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testaugmentations.script
-move c:\logs\testexecute\testaugmentations.htm e:\testresults\testaugmentations.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testpreinstalled.script
-move c:\logs\testexecute\testpreinstalled.htm e:\testresults\testpreinstalled.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdependencies.script
-move c:\logs\testexecute\testdependencies.htm e:\testresults\testdependencies.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testshutdown.script
-move c:\logs\testexecute\testshutdown.htm e:\testresults\testshutdown.htm
-
-testexecute z:\tswi\tsisregistrytest\scripts\tsisregistrytest.script
-move c:\logs\testexecute\tsisregistrytest.htm e:\testresults\tsisregistrytest.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tsisstub.script
-move c:\logs\testexecute\tsisstub.htm e:\testresults\tsisstub.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrm.script
-move c:\logs\testexecute\testdrm.htm e:\testresults\testdrm.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdrmFH.script
-move c:\logs\testexecute\testdrmFH.htm e:\testresults\testdrmFH.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testmulti.script
-move c:\logs\testexecute\testmulti.htm e:\testresults\testmulti.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testextension.script
-move c:\logs\testexecute\testextension.htm e:\testresults\testextension.htm
-
-REM install automated commdb using sim.tsy for tdev
-ced -i z:\autosimtsy.cfg
-
-copy z:\tswi\tdevcerts\config.txt c:\config.txt
-testexecute z:\tswi\tdevcerts\scripts\devcerts_match.script
-move c:\logs\testexecute\devcerts_match.htm e:\testresults\devcerts_match.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_mismatch.script
-move c:\logs\testexecute\devcerts_mismatch.htm e:\testresults\devcerts_mismatch.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_aggregate.script
-move c:\logs\testexecute\devcerts_aggregate.htm e:\testresults\devcerts_aggregate.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_corrupt.script
-move c:\logs\testexecute\devcerts_corrupt.htm e:\testresults\devcerts_corrupt.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_backuprestore.script
-move c:\logs\testexecute\devcerts_backuprestore.htm e:\testresults\devcerts_backuprestore.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_backup.script
-move c:\logs\testexecute\devcerts_backup.htm e:\testresults\devcerts_backup.htm
-
-attrib c:\config.txt -r
-del c:\config.txt
-copy z:\tswi\tdevcerts\config2.txt c:\config.txt
-testexecute z:\tswi\tdevcerts\scripts\devcerts_restore.script
-move c:\logs\testexecute\devcerts_restore.htm e:\testresults\devcerts_restore.htm
-attrib c:\config.txt -r
-del c:\config.txt
-
-REM restore standard automated commdb for the rest of the tests
-ced -i z:\auto.cfg
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tswiregcompfields.script
-move c:\logs\testexecute\tswiregcompfields.htm e:\testresults\tswiregcompfields.htm
-
-testexecute z:\tswi\tdevcerts\scripts\devcerts_ocsp.script
-move c:\logs\testexecute\devcerts_ocsp.htm e:\testresults\devcerts_ocsp.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testeclipse.script
-move c:\logs\testexecute\testeclipse.htm e:\testresults\testeclipse.htm
-
-#testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialog.script
-#move c:\logs\testexecute\tuileavedialog.htm e:\testresults\tuileavedialog.htm
-
-#testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialogasync.script
-#move c:\logs\testexecute\tuileavedialogasync.htm e:\testresults\tuileavedialogasync.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testappinuse.script
-move c:\logs\testexecute\testappinuse.htm e:\testresults\testappinuse.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testVFP.script
-move c:\logs\testexecute\testVFP.htm e:\testresults\testVFP.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\switermination.script
-move c:\logs\testexecute\switermination.htm e:\testresults\switermination.htm
-
-REM Test non removable flag
-testexecute z:\tswi\tuiscriptadaptors\scripts\testnonremovable.script
-move c:\logs\testexecute\testnonremovable.htm e:\testresults\testnonremovable.htm
-
-md c:\tswi\tbackuprestore
-testexecute z:\tswi\tuiscriptadaptors\scripts\tresetdevice.script
-move c:\logs\testexecute\tresetdevice.htm e:\testresults\tresetdevice.htm
-
-REM Demandpaging tests
-testexecute z:\tswi\tuiscriptadaptors\scripts\tdempaging_armv5.script
-move c:\logs\testexecute\tdempaging_armv5.htm e:\testresults\tdempaging_armv5.htm
-
-REM DevInfoSupport test
-tdevinfosupport
-copy c:\swi.log e:\testresults\swi.log
-del c:\swi.log
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialog.script
-move c:\logs\testexecute\tuileavedialog.htm e:\testresults\tuileavedialog.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\tuileavedialogasync.script
-move c:\logs\testexecute\tuileavedialogasync.htm e:\testresults\tuileavedialogasync.htm
-
-REM SwiConsole Tests
-testexecute z:\tswi\tswiconsole\scripts\tswiconsole.script
-move c:\logs\testexecute\tswiconsole.htm e:\testresults\tswiconsole.htm
-
-REM DEF083628: Orphaned files in protected dirs can be overwritten by untrusted packages
-testexecute z:\tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script
-move c:\logs\testexecute\overwriteprivate_positive.htm e:\testresults\overwriteprivate_positive.script.htm
-
-REM SWI Observer Tests
-testexecute z:\tswi\tswiobserver\scripts\testswiobserver.script
-copy c:\logs\testexecute\testswiobserver.htm e:\testresults\testswiobserver.htm
-
-testexecute z:\tswi\tautosigning\scripts\tautosigning.script
-copy c:\logs\testexeute\tautosigning.htm e:\testresults\tautosigning.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testasynccaps.script
-move c:\logs\testexecute\testasynccaps.htm e:\testresults\testasynccaps.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testdiskfullemulator.script
-move c:\logs\testexecute\testdiskfullemulator.htm e:\testresults\testdiskfullemulator.htm
-
-del e:\BigTempFile
-
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testmandatory_HW.script
-move c:\logs\testexecute\testmandatory_hw.htm e:\testresults\testmandatory.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testsystemcaps.script
-move c:\logs\testexecute\testsystemcaps.htm e:\testresults\testsystemcaps.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testusercaps.script
-move c:\logs\testexecute\testusercaps.htm e:\testresults\testusercaps.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testusercaps_nousergrantcaps_hw.script
-move c:\logs\testexecute\testusercaps_nousergrantcaps_hw.htm e:\testresults\testusercaps_nousergrantcaps_hw.htm
-
-testexecute z:\tswi\tuiscriptadaptors\scripts\testasynccancel.script
-move c:\logs\testexecute\testasynccancel.htm e:\testresults\testasynccancel.htm
-
-REM CR0914Tests
-testexecute z:\tswi\tsisregistrytest\scripts\integritychecktest.script
-move c:\logs\testexecute\integritychecktest.htm e:\testresults\integritychecktest.htm
-
-REM NQP Tests for DataProvider
-testexecute z:\tswi\tdataprovider\scripts\tdataprovider.script
-move c:\logs\testexecute\tdataprovider.htm e:\testresults\tdataprovider.htm
-
-REM SWI Adorned filename handling tests
-testexecute.exe z:\tswi\tuiscriptadaptors\scripts\adornedfilenames.script
-copy c:\logs\testexecute\adornedfilenames.htm e:\testresults\adornedfilenames.htm
-
-REM Tests for Post manufacture installation of a Layered Execution Environment
-testexecute z:\tswi\tuiscriptadaptors\scripts\tswtype.script
-move c:\logs\testexecute\tswtype.htm e:\testresults\tswtype.htm
-
-REM SISREgistry performance tests are run last as they modify the registry directly and can impact later tests
-testexecute z:\tswi\tsisregistrytest\scripts\tsisregistry_performance.script
-move c:\logs\testexecute\tsisregistry_performance.htm e:\testresults\tsisregistry_performance.htm
-
-del c:\temp\*.*
-attrib c:\tswi\*.* -r
-del c:\tswi\*.*
-
-attrib c:\logs\testexecute\*.* -r
-del c:\logs\testexecute\*.*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/runupstests.bat Mon May 03 14:11:52 2010 +0300
@@ -0,0 +1,50 @@
+@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:
+@rem
+
+md e:\testresults\
+testexecute z:\tups\tupsdb\scripts\tupsdb.script
+move c:\logs\testexecute\tupsdb.htm e:\testresults\tupsdb.htm
+
+testexecute z:\tups\tupsdb\scripts\tupsdbperformance.script
+move c:\logs\testexecute\tupsdbperformance.htm e:\testresults\tupsdbperformance.htm
+
+rem UPS policy library unit tests
+testexecute z:\tups\tpolicies\scripts\tpolicycache.script
+move c:\logs\testexecute\tpolicycache.htm e:\testresults\tpolicycache.htm
+testexecute z:\tups\tpolicies\scripts\tpolicyreader.script
+move c:\logs\testexecute\tpolicyreader.htm e:\testresults\tpolicyreader.htm
+testexecute z:\tups\tpolicies\scripts\tserviceconfig.script
+move c:\logs\testexecute\tserviceconfig.htm e:\testresults\tserviceconfig.htm
+
+rem ups integration tests
+rem Creates temporary folder for backup and restore tests.
+md c:\tswi
+md c:\tswi\tbackuprestore
+
+testexecute z:\tups\integ\scripts\tups_integ.script
+move c:\logs\testexecute\tups_integ.htm e:\testresults\tups_integ.htm
+
+tmsgapp.exe
+move c:\tmsgapp.log e:\testresults\tmsgapp.log
+del c:\tmsgapp.log
+
+attrib c:\logs\testexecute\*.* -r
+del c:\logs\testexecute\*.*
+
+rem Deletes temporary folder for backup and restore tests.
+attrib c:\tswi\*.* -r
+del c:\tswi\*.*
+
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runupstests_9.4.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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:
-@rem
-
-md e:\testresults\
-testexecute z:\tups\tupsdb\scripts\tupsdb.script
-move c:\logs\testexecute\tupsdb.htm e:\testresults\tupsdb.htm
-
-testexecute z:\tups\tupsdb\scripts\tupsdbperformance.script
-move c:\logs\testexecute\tupsdbperformance.htm e:\testresults\tupsdbperformance.htm
-
-rem UPS policy library unit tests
-testexecute z:\tups\tpolicies\scripts\tpolicycache.script
-move c:\logs\testexecute\tpolicycache.htm e:\testresults\tpolicycache.htm
-testexecute z:\tups\tpolicies\scripts\tpolicyreader.script
-move c:\logs\testexecute\tpolicyreader.htm e:\testresults\tpolicyreader.htm
-testexecute z:\tups\tpolicies\scripts\tserviceconfig.script
-move c:\logs\testexecute\tserviceconfig.htm e:\testresults\tserviceconfig.htm
-
-rem ups integration tests
-rem Creates temporary folder for backup and restore tests.
-md c:\tswi
-md c:\tswi\tbackuprestore
-
-testexecute z:\tups\integ\scripts\tups_integ.script
-move c:\logs\testexecute\tups_integ.htm e:\testresults\tups_integ.htm
-
-tmsgapp.exe
-move c:\tmsgapp.log e:\testresults\tmsgapp.log
-del c:\tmsgapp.log
-
-attrib c:\logs\testexecute\*.* -r
-del c:\logs\testexecute\*.*
-
-rem Deletes temporary folder for backup and restore tests.
-attrib c:\tswi\*.* -r
-del c:\tswi\*.*
-
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/runusiftests.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +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:
-@rem
-
-REM run SIF tests
-testexecute z:\tusif\tsif\tsif.script
-move c:\logs\testexecute\tsif.htm e:\testresults\tsif.htm
-
-testexecute z:\tusif\tsifintegration\tsifintegration.script
-move c:\logs\testexecute\tsifintegration.htm e:\testresults\tsifintegration.htm
-
-testexecute z:\tusif\tsifrefinstaller\tsifrefinstaller.script
-move c:\logs\testexecute\tsifrefinstaller.htm e:\testresults\tsifrefinstaller.htm
-
-REM run integration tests for Post manufacture installation of a Layered Execution Environment
-testexecute z:\tusif\tswtype\tsifswtypeintegration.script
-move c:\logs\testexecute\tsifswtypeintegration.htm e:\testresults\tsifswtypeintegration.htm
-
-REM run SCR tests
-testexecute z:\tusif\tscr\tscr.script
-move c:\logs\testexecute\tscr.htm e:\testresults\tscr.htm
-
-testexecute z:\tusif\tscr\tscr_performance.script
-move c:\logs\testexecute\tscr_performance.htm e:\testresults\tscr_performance.htm
-
-REM run STS tests
-testexecute z:\tusif\tsts\tsts.script
-move c:\logs\testexecute\tsts.htm e:\testresults\tsts.htm
-
-testexecute z:\tusif\tsts\tintegrityservices\scripts\tsts_tintegrityservices.script
-move c:\logs\testexecute\tsts_tintegrityservices.htm e:\testresults\tsts_tintegrityservices.htm
-
-testexecute z:\tusif\tsts\tsts_rollbackall.script
-move c:\logs\testexecute\tsts_rollbackall.htm e:\testresults\tsts_rollbackall.htm
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/sdp_bld.inf Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/sdp_bld.inf Mon May 03 14:11:52 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testMakesis.pl Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2850 +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:
-# Perl script that creates PKG files and test MAKESIS tools with different ranges
-#
-
-#
-
-
-$logFile = "/epoc32/winscw/c/makesis_test.txt";
-$makesisExeLocation = "/epoc32/tools/makesis";
-$dumpsisExeLocation = "/epoc32/tools/dumpsis";
-
-sub GetTmpFilesCount()
-{
- # get a number of temp files
- if ($^O =~ /^MSWIN32$/i)
- {
- my $dirname = "$ENV{'TEMP'}";
- opendir ( DIR, "$dirname" ) or die ( "Can't open dir: $dirname" ); #!
- my @List = readdir DIR;
- closedir DIR;
-
- my @TmpFiles = grep( /^~SI.*.tmp/ , @List );
- }
- else
- {
- my $dirname = "/tmp/";
- opendir ( DIR, "$dirname" ) or die ( "Can't open dir: $dirname" ); #!
- my @List = readdir DIR;
- closedir DIR;
-
- my @TmpFiles = grep( /tmp*/ , @List );
- }
-
- my $TmpCountBefore = @TmpFiles;
-
- return $TmpCountBefore;
-}
-
-#
-#Function to write log into file
-#
-sub WriteLog {
- my ($log) = @_;
- #public $logfile;
-
- unless( open($fh, ">> $logFile")) {
- printf STDERR "Can\'t open $logfile:$!\n";
- return;
- }
- printf $fh $log;
- printf $log;
- close $fh;
-}
-
-
-#
-# Function to create a file (test.txt or any PKG)
-#
-sub CreateFile {
- my ($filename, $contents) = @_;
-
- unless (open($fh, "> $filename")) {
- printf STDERR "Can't open $filename: $!\n";
- return;
- }
- print $fh $contents;
- close $fh;
-
-
-}
-
-#
-# Function to check the log file of the makesis result
-#
-sub CheckLog {
- my ($pkgfile) = @_[0];
- my ($expectedLog) = @_[1];
-
- $logMsg = sprintf "Expected Log: %s\n", $expectedLog;
- WriteLog( $logMsg);
-
- unless (open($resultlog, "$pkgfile.log")) {
- printf STDERR "Can't open $pkgfile.log: $!\n";
- return 0;
- }
-
- foreach $line (<$resultlog>) {
- if ( $line =~ m/\Q$expectedLog\E/i) {
- close($resultlog);
- return 1;
- }
- }
- close($resultlog);
- return 0;
-}
-
-#
-# Run MAKESIS with prepared pkg file, log and administrate its result
-#
-sub MakeSISFile {
-
- my ($pkgfile) = @_[0];
- my ($expectedResult) = @_[1];
- my ($expectedLog) = @_[2];
- $pkgfile =~ s/\.pkg//;
-
- if($pkgfile ne "testinterpretflag") {
- @retval = system("$makesisExeLocation -v $pkgfile.pkg $pkgfile-tmp.sis > $pkgfile.log");
- }
- else {
- @retval = system("$makesisExeLocation -v -c $pkgfile.pkg $pkgfile-tmp.sis > $pkgfile.log");
- }
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
-
- $NumberOfTests++;
-
- if( $? == $expectedResult ) {
- if(CheckLog($pkgfile, $expectedLog)) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed : Unexpected Error Log\n\n");
- }
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed : Unexpected Error Code\n\n");
- }
-
- unlink("$pkgfile-tmp.sis");
- unlink("$pkgfile.log");
- unlink("$pkgfile.pkg");
-
-}
-
-#
-# Additional test to check that stub files don't change every time
-# they are built.
-#
-sub TestSISStubFile {
-
- $teststubpkg = "teststub.pkg";
- $teststubsis = "teststub.sis";
- $comparisonsis = "comparison.sis";
- $teststublog = "teststub.log";
-
- WriteLog("Test invariant stub file\n");
-
- # Generate test PKG file contents
- $PkgFile = sprintf( $PkgFileTempl, "-1,-1,-1");
- # Create PKG file
- CreateFile($teststubpkg, $PkgFile);
-
- # Create a stub sis file
- my $result = system("$makesisExeLocation -s $teststubpkg $teststubsis > $teststublog");
-
- # Wait at least a second and generate it again
- sleep 2;
- rename($teststubsis, $comparisonsis) or
- warn "Couldn't rename $teststubsis to $comparisonsis: $!\n";
-
- my $result2 = system("$makesisExeLocation -s $teststubpkg $teststubsis > $teststublog");
-
- # Check that the files are the same and log the result
- use File::Compare;
- $NumberOfTests++;
- if (compare($teststubsis, $comparisonsis) == 0
- && $result == 0
- && $result2 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $teststublog;
- unlink $teststubpkg;
- unlink $teststubsis ;
- unlink $comparisonsis;
-}
-
-#
-# New test code for DEF083525 - makesis -vs does not create a stub sis file
-# This is based on TestSISStubFile, it builds the stub file with -s and -vs options
-# and checks the resulting files are the same. The defects was that the "s" option
-# was ignored so a stub file was not built.
-#
-sub TestDEF083525 {
-
- $teststubpkg = "teststub.pkg";
- $teststubsis = "teststub.sis";
- $comparisonsis = "comparison.sis";
- $teststublog = "teststub.log";
-
- WriteLog("Test for DEF083525 - makesis -vs does not create a stub sis file\n");
-
- # Generate test PKG file contents
- $PkgFile = sprintf( $PkgFileTempl, "-1,-1,-1");
- # Create PKG file
- CreateFile($teststubpkg, $PkgFile);
-
- # Create a stub sis file
- my $result = system("$makesisExeLocation -s $teststubpkg $teststubsis > $teststublog");
-
- # Wait at least a second and generate it again this time using the -vs options
- # This defect was that the -vs options was ignored
- sleep 2;
- rename $teststubsis, $comparisonsis;
- my $result2 = system("$makesisExeLocation -vs $teststubpkg $teststubsis > $teststublog");
-
- # Check that the files are the same and log the result
- use File::Compare;
- $NumberOfTests++;
- if (compare($teststubsis, $comparisonsis) == 0
- && $result == 0
- && $result2 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $teststublog;
- unlink $teststubpkg;
- unlink $teststubsis ;
- unlink $comparisonsis;
-}
-
-#
-# New test code for PDEF081989 - makesis parameter -d does not work any more.
-# This creates a testembedded.sis file embedding testembedding.sis. This test checks the
-# working of -d parameter where the search directory containing the embedding sis file is
-# specified with -d option.
-#
-
-sub TestPDEF081989 {
-
- $testembeddingpkg = "testembedding.pkg";
- $testembeddingsis = "testembedding.sis";
- $testembeddedpkg = "testembedded.pkg";
- $testembeddedsis = "testembedded.sis";
- $sisFileToEmbed = "/epoc32/winscw/c/";
- $outputFile = $sisFileToEmbed.$testembeddingsis;
- $testEmbedLog = "testembedded.log";
-
- WriteLog("Test for PDEF081989 - Test for successful creation of a sis file with -d option.\n");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $PkgFileTempl, "-1,-1,-1");
- # Create PKG file
- CreateFile($testembeddingpkg, $PkgFile);
-
- # Generate test PKG file contents for embedded pkg file.
- $PkgFile = sprintf( $embedContents, "-1,-1,-1");
- # Create PKG file
- CreateFile($testembeddedpkg , $PkgFile);
-
-
- # Create an embedding sis file
- my $result = system("$makesisExeLocation $testembeddingpkg $outputFile > $testEmbedLog");
-
- # Create an embedded sis file.Here the sis file embedded is situated elsewhere(in "\\epoc32\\winscw\\c\\").
- # Makesis -d option is used to specify the directory to search for sis file embedded.
- my $result1 = system("$makesisExeLocation -d$sisFileToEmbed $testembeddedpkg $testembeddedsis > $testEmbedLog");
-
- $NumberOfTests++;
- if ($result == 0 && $result1 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $testembeddingpkg;
- unlink $outputFile;
- unlink $testembeddedpkg;
- unlink $testembeddedsis;
- unlink $testEmbedLog;
-
-}
-
-#
-# Test code for DEF104895 - makesis with -d option
-# This creates a testembedded.sis file embedding testembedding.sis. This test checks the
-# working of -d parameter where the search directory(bacward slashes) containing the embedding sis file is
-# specified with -d option.
-#
-
-sub TestDEF104895 {
-
- $testembeddingpkg = "testembedding.pkg";
- $testembeddingsis = "testembedding.sis";
- $testembeddedpkg = "testembedded.pkg";
- $testembeddedsis = "testembedded.sis";
- $sisFileToEmbed = "\\epoc32\\winscw\\c\\";
- $outputFile = $sisFileToEmbed.$testembeddingsis;
- $testEmbedLog = "testembedded.log";
-
- WriteLog("Test for DEF104895 - Test for successful creation of a sis file with -d option.\n");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $PkgFileTempl, "-1,-1,-1");
- # Create PKG file
- CreateFile($testembeddingpkg, $PkgFile);
-
- # Generate test PKG file contents for embedded pkg file.
- $PkgFile = sprintf( $embedContents, "-1,-1,-1");
- # Create PKG file
- CreateFile($testembeddedpkg , $PkgFile);
-
-
- # Create an embedding sis file
- my $result = system("$makesisExeLocation $testembeddingpkg $outputFile > $testEmbedLog");
-
- # Create an embedded sis file.Here the sis file embedded is situated elsewhere(in "\\epoc32\\winscw\\c\\").
- # Makesis -d option is used to specify the directory to search for sis file embedded.
- my $result1 = system("$makesisExeLocation -d$sisFileToEmbed $testembeddedpkg $testembeddedsis > $testEmbedLog");
-
- $NumberOfTests++;
- if ($result == 0 && $result1 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $testembeddingpkg;
- unlink $outputFile;
- unlink $testembeddedpkg;
- unlink $testembeddedsis;
- unlink $testEmbedLog;
-
-}
-
-#
-# New test code for DEF107033 - makesis parameter -d does not work with language dependent files
-#
-#
-
-sub TestDEF107033() {
-
- $testlanguagepkg = "testlanguage.pkg";
- $testlanguagesis = "testlanguagesis.sis";
- $testlanguagelog = "testlanguage.log";
-
- WriteLog("Test makesis parameter -d does not work with language dependent files\n");
-
- # Generate test PKG file contents
- $PkgFile = sprintf( $PkgLanguageFileTemp);
- # Create PKG file
- CreateFile($testlanguagepkg, $PkgFile);
-
- # Create a stub sis file
- my $result = system("$makesisExeLocation -d/epoc32/winscw/c/tswi/ $testlanguagepkg $testlanguagesis > $testlanguagelog");
-
-
- $NumberOfTests++;
-
- if ($result == 0) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $testlanguagepkg;
- unlink $testlanguagesis;
- unlink $testlanguagelog ;
-
-}
-
-#
-# Test code for DEF104895 - makesis with -d option
-# This creates a testembedded.sis file embedding testembedding.sis. This test checks the
-# working of -d parameter where the search directory(bacward slashes) containing the embedding sis file is
-# specified with -d option.
-#
-
-sub TestLDEF104895 {
-
- $testembeddingpkg = "testembedding.pkg";
- $testembeddingsis = "testembedding.sis";
- $testembeddedpkg = "testembedded.pkg";
- $testembeddedsis = "testembedded.sis";
- $sisFileToEmbed = "\\\\epoc32\\\\winscw\\\\c\\\\";
- $outputFile = $sisFileToEmbed.$testembeddingsis;
- $testEmbedLog = "testembedded.log";
-
- WriteLog("Test for DEF104895 - Test for successful creation of a sis file with -d option.\n");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $PkgFileTempl, "-1,-1,-1");
- # Create PKG file
- CreateFile($testembeddingpkg, $PkgFile);
-
- # Generate test PKG file contents for embedded pkg file.
- $PkgFile = sprintf( $embedContents, "-1,-1,-1");
- # Create PKG file
- CreateFile($testembeddedpkg , $PkgFile);
-
-
- # Create an embedding sis file
- my $result = system("$makesisExeLocation $testembeddingpkg $outputFile > $testEmbedLog");
-
- # Create an embedded sis file.Here the sis file embedded is situated elsewhere(in "\\epoc32\\winscw\\c\\").
- # Makesis -d option is used to specify the directory to search for sis file embedded.
- my $result1 = system("$makesisExeLocation -d$sisFileToEmbed $testembeddedpkg $testembeddedsis > $testEmbedLog");
-
- $NumberOfTests++;
- if ($result == 0 && $result1 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $testembeddingpkg;
- unlink $outputFile;
- unlink $testembeddedpkg;
- unlink $testembeddedsis;
- unlink $testEmbedLog;
-
-}
-
-
-#
-# New test code for DEF090878 - unexpected error by makesis when processing pkg file saved in UTF8 format
-# This test uses existing utf8.pkg which contains UTF-8 encoded characters and in turn refers to utf8.txt
-#
-sub TestDEF090878 {
-
- my $path = "/epoc32/winscw/c/tswi";
- my $pkgfile = "$path/utf8";
- my $expectedResult = 0;
-
- WriteLog("Test for DEF090878 - unexpected error by makesis when processing pkg file saved in UTF8 format\n");
- WriteLog("UTF-8 encoded file: $pkgfile.pkg\n");
-
- # Do MAKESIS test
- @retval = system("$makesisExeLocation $pkgfile.pkg $pkgfile-tmp.sis > $pkgfile.log");
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
-
- $NumberOfTests++;
-
- if( $? == $expectedResult ) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink("$pkgfile-tmp.sis");
- unlink("$pkgfile.sis");
- unlink("$pkgfile.log");
-}
-
-#
-# Test code for DEF112831 - makesis crashes on .pkg containing non-existing embedded sis
-#
-
-sub TestDEF112831() {
-
- my $expectedResult = 256;
- $testmissingembeddedpkg = "missingembedded.pkg";
- $testmissingembeddedsis = "missingembedded.sis";
- $testmissingembeddedlog = "missingembedded.log";
-
- WriteLog("Test for DEF112831 - makesis crashes on .pkg containing non-existing embedded sis\n");
-
- # Generate test PKG file contents
- $PkgFile = sprintf( $missingEmbed);
- # Create PKG file
- CreateFile($testmissingembeddedpkg, $PkgFile);
-
- # Create a stub sis file
- my $result = system("$makesisExeLocation -d/epoc32/winscw/c/tswi/ $testmissingembeddedpkg $testmissingembeddedsis > $testmissingembeddedlog");
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
-
- $NumberOfTests++;
-
- if ($result == 256) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $testmissingembeddedpkg;
- unlink $testmissingembeddedsis;
- unlink $testmissingembeddedlog ;
-
-}
-
-# Windows Test
-# Test code for DEF091942
-# Test case generates a SIS from a Japanese named pkg file. Checks to see if the SIS fle generated has the same name.
-# NOTE: Does not validate the console output.
-
-sub TestDEF091942 {
-
- my $path = "\\epoc32\\winscw\\c\\tswi";
-
- $NumberOfTests++;
- WriteLog("Test for DEF091942 - makesis can not handle package files names written with japanese symbols\n");
-
- # Generate Japanese pkg
- system("WScript.exe //B //Nologo $path\\displayjpn_1.vbs");
-
- # Check to see if the sis file has been generated
- system("WScript.exe //B //Nologo $path\\displayjpn_2.vbs");
-
- if ( -f "$path\\passed.txt") {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- } else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- # Tidy up
- system("WScript.exe //B //Nologo $path\\displayjpn_3.vbs");
-}
-
-# Linux Test
-# Test code for DEF091942
-# Test case generates a SIS from a Japanese named pkg file. Checks to see if the SIS fle generated has the same name.
-# NOTE: Does not validate the console output.
-
-sub TestLDEF091942{
-
- $pkgfile = "ã‚Žã‚ã“ã‚“ã‚¡ã‚¢é¾é¾‘.pkg";
- $sisfile = "ã‚Žã‚ã“ã‚“ã‚¡ã‚¢é¾é¾‘.sis";
- $logfile = "ã‚Žã‚ã“ã‚“ã‚¡ã‚¢é¾é¾‘.log";
-
- $NumberOfTests++;
-
- my $file = "/epoc32/winscw/c/tswi/passed.txt";
-
- WriteLog("Test for DEF091942 - makesis can not handle package files names written with japanese symbols\n");
-
- # Generate test PKG file contents for japanese pkg file.
- $PkgFile = sprintf( $JAPPkgFileTempl);
- # Create PKG file
- CreateFile($pkgfile, $PkgFile);
-
- # Do MAKESIS test
- @retval = system("$makesisExeLocation -v $pkgfile > logfile");
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
-
- if(-f $sisfile){
- CreateFile($file,$TempData);
- }
-
- if( -f $file ) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink("$pkgfile.sis");
- unlink("$pkgfile.log");
- unlink("$pkgfile.pkg");
-}
-
-
-
-#
-# New test code for DEF091780 - Makesis have problems parsing IF-ENDIF block
-# test files are generated according to defect description, except that ALL files are located in current folder
-#
-sub TestDEF091780 {
-
- my $ifendif = "ifendif.pkg";
- my $expectedResult = 0;
-
- WriteLog("Test for DEF091780 - Makesis have problems parsing IF-ENDIF block\n");
-
- # Create PKG file
- CreateFile($ifendif , $ifendifContent);
- $ifendif =~ s/\.pkg//;
-
- # Create options-related files
- CreateFile('osver1J.txt', "1J");
- CreateFile('osver2J.txt', "2J");
- CreateFile('osver1F.txt', "1F");
- CreateFile('osver2F.txt', "2F");
-
- # Do MAKESIS test
- @retval = system("$makesisExeLocation $ifendif.pkg $ifendif-tmp.sis > $ifendif.log");
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
-
- $NumberOfTests++;
-
- if( $? == $expectedResult ) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- # tidy up
- unlink("$ifendif.pkg");
- unlink("$ifendif-tmp.sis");
- unlink("$ifendif.sis");
- unlink("$ifendif.log");
- unlink("osver1J.txt");
- unlink("osver2J.txt");
- unlink("osver1F.txt");
- unlink("osver2F.txt");
-}
-
-#
-# Test code for SIS files with comma at the end of the file - DEF108815
-#
-#
-sub TestEndFileComma {
-
- my $pkgName = "endFileComma.pkg";
- my $logName = "endFileComma.log";
- my $sisName = "endFileComma.sis";
- my $expectedResult = 256;
-
- WriteLog("Test for DEF108815 - makesis crashes if a trailing comma is present on an install-file \n");
-
- # Create PKG file
- CreateFile($pkgName, $endFileCommaContent);
- $ifendif =~ s/\.pkg//;
-
- # Do MAKESIS test
- @retval = system("$makesisExeLocation $pkgName $sisName > $logName");
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
-
- $NumberOfTests++;
-
- if( $? == $expectedResult ) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- # tidy up
- #unlink("$pkgName");
- unlink("$sisName");
- unlink("$logName");
-}
-
-#
-# Test code for package file containing very long destination folder name - DEF115795
-#
-#
-sub TestLongFolderName {
-
- my $pkgName = "longfolder.pkg";
- my $logName = "longfolder.log";
- my $sisName = "longfolder.sis";
- my $expectedResult = 256;
-
- WriteLog("Test for DEF115795 - SWI completes the installation despite the files not being installed \n");
-
- # Create PKG file
- CreateFile($pkgName, $longfolder);
- $ifendif =~ s/\.pkg//;
-
- # Do MAKESIS test
- @retval = system("$makesisExeLocation $pkgName $sisName > $logName");
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
-
- $NumberOfTests++;
-
- if( $? == $expectedResult ) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- # tidy up
- unlink("$pkgName");
- unlink("$sisName");
- unlink("$logName");
-}
-
-#
-# Test code for invalid version number in pkg file - DEF112718
-#
-#
-sub TestInvalidVersion1 {
-
- my $pkgName = "invalidVersion.pkg";
- my $LogFile = "invalidVersion.log";
- my $sisName = "invalidVersion.sis";
- my $ExpectedLogFile = "InvalidVersionExpected.log";
-
- WriteLog("Test for DEF112718 - Invalid version number in pkg file \n");
-
- # Create PKG file
- CreateFile($pkgName, $invalidVersion1);
-
- my $trailingData = "Created $sisName.";
- my $OutputData = "Processing $pkgName...\n$DEF112718ExpectedOutput$trailingData";
-
- # Create expected log file
- CreateFile($ExpectedLogFile ,$OutputData);
-
- # Create a sis file
- my $result = system("$makesisExeLocation $pkgName $sisName > $LogFile");
-
- use File::Compare;
- my $result1;
-
- if(compare($LogFile ,$ExpectedLogFile)== 0)
- {
- $result1 = 0;
- }
- else
- {
- $result1 = 1;
- }
- $NumberOfTests++;
-
- if ($result == 0 && $result1 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
-
- # tidy up
- unlink("$pkgName");
- unlink("$sisName");
- unlink("$logName");
- unlink ("$LogFile");
-}
-
-#
-# Test code for invalid version number in pkg file - DEF112718
-#
-#
-
-sub TestInvalidVersion2 {
-
- my $pkgName = "invalidVersion.pkg";
- my $logName = "invalidVersion.log";
- my $sisName = "invalidVersion.sis";
- my $expectedResult = 256;
-
- WriteLog("Test for DEF112718 - Invalid version number in pkg file with negative values \n");
-
- # Create PKG file
- CreateFile($pkgName, $invalidVersion2);
-
-
- # Do MAKESIS test
- @retval = system("$makesisExeLocation $pkgName $sisName > $logName");
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
-
- $NumberOfTests++;
-
- if( $? == $expectedResult ) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- # tidy up
- unlink("$pkgName");
- unlink("$sisName");
- unlink("$logName");
-}
-
-
-#
-# Test code for Preinstalled pkg files without having sourcefiles - DEF113569
-#
-#
-sub TestPreInstalledWithoutSourceFiles {
-
- my $pkgName = "preinstalledwithoutsourcefile.pkg";
- my $logName = "preinstalledwithoutsourcefile.log";
- my $sisName = "preinstalledwithoutsourcefile.sis";
- my $ExpectedLogFile = "preinstalledwithoutsourcefileExpected.log";
-
- WriteLog("Test for DEF113569 - Preinstalled pkg files without having sourcefiles \n");
-
- # Create PKG file
- CreateFile($pkgName, $PreinstalledPkgWithoutSourcefiles);
-
- my $OutputData = "Processing $pkgName...\n$DEF113569ExpectedOutput";
-
- # Create expected log file
- CreateFile($ExpectedLogFile ,$OutputData);
-
- # Do MAKESIS test
- @retval = system("$makesisExeLocation $pkgName $sisName > $logName");
-
- use File::Compare;
- my $result1;
-
- if(compare($logName ,$ExpectedLogFile)== 0)
- {
- $result1 = 0;
- }
- else
- {
- $result1 = 1;
- }
-
- $NumberOfTests++;
-
-
- if ($result == 0 && $result1 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- # tidy up
- unlink("$pkgName");
- unlink("$sisName");
- unlink("$logName");
- unlink ("$ExpectedLogFile");
-}
-
-
-# New test code for DEF091860 - Quotes missing in reversed package produced by dumpsis for IF EXIST statement.
-# This creates a DEF091860.sis file . This test checks whether the pkg file generated by dumpsis when reprocessed
-# by makesis generates a sis file successfully.
-#
-sub TestDEF091860() {
-
- $DEF091860pkg = "DEF091860.pkg";
- $DEF091860sis = "DEF091860.sis";
- $DumpsisGenPkgPath = "\/DEF091860";
- $DEF091860Log = "DEF091860.log";
-
-
- WriteLog("Test for DEF091860 - Test for successful creation of a sis file when pkg file generated from dumpsis is used.\n");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $DEF091860PkgContents, "-1,-1,-1");
- # Create PKG file
- CreateFile($DEF091860pkg, $PkgFile);
-
- # Create DEF091860.sis file
- my $result = system("$makesisExeLocation $DEF091860pkg $DEF091860sis > $DEF091860Log");
-
- WriteLog("result: $result\n");
-
- # Execute DumpSIS on the created DEF091860.sis.
- my $result1 = system("/epoc32/tools/DUMPSIS -x $DEF091860sis > $DEF091860Log");
-
- WriteLog("result1: $result1[0]\n");
-
- use Cwd;
- $dir = cwd;
- chdir $dir.$DumpsisGenPkgPath;
-
- #Regenerate DEF091860.sis from the dumpsis generated pkg file.
- $result2 = system("$makesisExeLocation $DEF091860pkg $DEF091860sis > $DEF091860Log");
- chdir $dir;
-
- WriteLog("result2: $result2\n");
-
- $NumberOfTests++;
- if ($result == 0 && $result1 == 0 && $result2 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $DEF091860pkg;
- unlink $DEF091860sis;
- unlink $DEF091860Log;
- use File::Path;
- rmtree "$dir$DumpsisGenPkgPath";
-}
-
-#
-# New test code for DEF090912 makesis shows error: file I/O fault. for PC folder with unicode (katakana) UCS2
-# NB: japanese source file is located in current folder instead of on folder tree for simplicity
-#
-sub TestDEF090912 {
-
- my $path = "\\epoc32\\winscw\\c\\tswi";
- my $ucs2 = "$path\\ucs2jpn";
- my $expectedResult = 0;
-
- WriteLog("Test for DEF090912: makesis shows error \"file I/O fault\" for PC folder with unicode (katakana) UCS2\n");
-
- # tricky thing to create file with Japanese name on any locale
- # use //B to launch script engine in batch mode
- system("WScript.exe //B //Nologo $path\\ucs2jpn.vbs");
-
- # Do MAKESIS test
- @retval = system("$makesisExeLocation $ucs2.pkg $ucs2-tmp.sis > $ucs2.log");
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
-
- $NumberOfTests++;
-
- if( $? == $expectedResult ) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- # tidy up
- unlink("$ucs2-tmp.sis");
- unlink("$ucs2.log");
- system("WScript.exe //B //Nologo $path\\rmucs2jpn.vbs");
-}
-
-
-# Linux Test
-# New test code for DEF090912 makesis shows error: file I/O fault. for PC folder with unicode (katakana) UCS2
-# NB: japanese source file is located in current folder instead of on folder tree for simplicity
-#
-sub TestLDEF090912 {
-
- my $path = "/epoc32/winscw/c/tswi";
- my $ucs2 = "$path/ﾅｿﾄ.txt";
- my $pkgfile = "$path/ucs2jpn";
- my $expectedResult = 0;
-
- WriteLog("Test for DEF090912: makesis shows error \"file I/O fault\" for PC folder with unicode (katakana) UCS2\n");
-
-
- # Create PKG file
-
- CreateFile($ucs2, $TempData);
-
- # Do MAKESIS test
- @retval = system("$makesisExeLocation -v $pkgfile.pkg > $pkgfile.log");
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
-
- $NumberOfTests++;
-
- if( $? == $expectedResult ) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- # tidy up
- unlink("$pkgfile.log");
- unlink("$pkgfile.sis");
-}
-
-
-
-
-#
-# New test code for DEF093400: Temporary files are left undeleted after MakeSIS/SignSIS call
-# NB: japanese source file is located in current folder instead of on folder tree for simplicity
-#
-
-sub TestDEF093400
-{
- WriteLog("Test for DEF093400: Temporary files are left undeleted after MakeSIS/SignSIS call\n");
-
- my $pkg = "temp.pkg";
- my $expectedResult = 0;
-
- # Create PKG file
- chmod S_IWUSR | S_IWGRP | S_IWOTH, '$pkg';
- my $temp = sprintf $PkgFileTempl, "-1,-1,-1";
- CreateFile($pkg, $temp);
- $pkg =~ s/\.pkg//;
-
- # Create options-related files
- chmod S_IWUSR | S_IWGRP | S_IWOTH, '$pkg.txt';
- CreateFile("$pkg.txt", "temp file");
- chmod S_IRUSR | S_IRGRP | S_IROTH, '$pkg.txt';
-
- my $TmpCountBefore = GetTmpFilesCount();
-
- # Do MAKESIS test
- @retval = system("$makesisExeLocation $pkg.pkg $pkg-tmp.sis > $pkg.log");
-
- my $TmpCountAfter = GetTmpFilesCount();
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
- $logMsg = sprintf "Temp Files detected - Before:%5d After:%5d\n", $TmpCountBefore, $TmpCountAfter;
- WriteLog( $logMsg);
-
- $NumberOfTests++;
-
- if( $? == $expectedResult && $TmpCountBefore == $TmpCountAfter ) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- # tidy up
- unlink("$pkg.pkg");
- unlink("$pkg-tmp.sis");
- unlink("$pkg.txt");
- unlink("$pkg.log");
-}
-
-
-#
-# New test code for DEF093156 - MAKEKEYS does not process correctly non European symbols in cmd line
-# This test checks whether the certificate and key files which have names with japanese symbols are created successfully .
-#
-sub TestDEF093156 {
-
- my $path = "\\epoc32\\winscw\\c\\tswi";
- $DEF093156Log = "DEF093156.log";
- $ResFile1="ex.txt";
- $ResFile2="ResultMakeKeys.txt";
-
- WriteLog("Test for DEF093156 - Makekeys test for successful creation of a certificate and key file with japanese symbols.\n");
-
- # create a key file and a certificate file with japanese symbols
- system("WScript.exe //B //Nologo $path\\testmakekeys.vbs > $DEF093156Log");
-
- $NumberOfTests++;
- if ( !-f $ResFile1 )
- {
- $NumberOfFailed++;
- WriteLog("Failed In Step 1\n\n");
- unlink $DEF093156Log;
- exit;
- }
-
- #Make sure that the DN in the created certificate with japanese symbols is encoded properly
- system("WScript.exe //B //Nologo $path\\testmakekeys2.vbs $path 1 > $DEF093156Log");
-
- if ( -f $ResFile2 )
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed In Step 2\n\n");
- }
-
- unlink $DEF093156Log;
- unlink $ResFile1;
- unlink $ResFile2;
-}
-
-#
-# New test code for INC092755: Makesis includes the same file to the generated SIS file if the pkg file has IF-ELSE condition block where only the destination path changes
-#
-sub TestINC092755 {
-
- WriteLog("Test for INC092755: Makesis includes the same file for IF-ELSE where only the dest path changes\n");
-
- my $path = "\\epoc32\\winscw\\c\\tswi";
- my $INC092755 = "INC092755";
-
- # Call DumpSIS to compare SIS file against expected result and number of files extracted
- WriteLog("Calling DumpSIS...\n");
- @retval = system("/epoc32/tools/DUMPSIS -x $path\\$INC092755.sis > $INC092755.log");
-
- use Cwd;
- my $dir = cwd."/$INC092755";
- opendir ( DIR, "$dir" ) or die ( "Can't open dir: $dir" ); #!
- my @List = readdir DIR;
- closedir DIR;
-
- my @files = grep( /^file[0-9]*/ , @List );
- my $fileCount = @files;
- print "Extracted: $fileCount file(s) Expected: 1 file(s)\n";
-
- $NumberOfTests++;
- if ( $fileCount == 1 )
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink("$INC092755.log");
- rmdir("$INC092755");
- unlink("$INC092755.sis");
-}
-
-#
-# New test code for CR904
-# This test checks for the successful creation of sis file when pkg file contains the parameter $ (which represents
-# system drive) in the destination file.
-#
-
-
-sub TestsysDriveparameter {
-
- $pkgFilewithsysDriveparameter = "testsysDrive.pkg";
- $sisFile = "testsysDrive.sis";
- $LogFile = "testsysDrive.log";
-
-
- WriteLog("Test for successful creation of a sis file with $ parameter specified in pkg file to represent system drive.\n");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $PkgFileTemp2, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgFilewithsysDriveparameter, $PkgFile);
-
-
- # Create an embedding sis file
- my $result = system("$makesisExeLocation $pkgFilewithsysDriveparameter $sisFile > $LogFile");
-
-
- $NumberOfTests++;
- if ($result == 0 )
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $pkgFilewithsysDriveparameter;
- unlink $sisFile;
- unlink $LogFile
-
-}
-
-
-#
-# New test code for CR1027 - SA ROM Upgrade
-# This test checks for the successful creation of sis file when PKG file contains the newly added ( as part of CR1027 )
-# ROM upgrade capability install flag RU with one of the right install types SA ( only SA, PU & SP are valid with RU).
-#
-
-sub TestSisRUWithSA {
-
- $pkgFilewithRUAndSA = "testsysRUWithSA.pkg";
- $sisFile = "testsysRUWithSA.sis";
- $LogFile = "testsysRUWithSA.log";
-
-
- WriteLog("CR1027 - Test for successful creation of a sis file with the ROM Upgrade install flag RU with the right install type SA.\n");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $PkgFileRUWithSA, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgFilewithRUAndSA, $PkgFile);
-
-
- # Create an embedding sis file
- my $result = system("$makesisExeLocation $pkgFilewithRUAndSA $sisFile > $LogFile");
-
- $NumberOfTests++;
- if ($result == 0 )
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $pkgFilewithRUAndSA;
- unlink $sisFile;
- unlink $LogFile
-}
-
-
-
-#
-# New test code for CR1027 - SA ROM Upgrade
-# This test checks for the un-successful creation of sis file when PKG file contains the newly added ( as part of CR1027 )
-# ROM upgrade capability install flag RU with the wrong install type other than SA, PU & SP (like PA & PP.).
-#
-
-sub TestSisRUWithNonSA {
-
- $pkgFilewithRUAndNonSA = "testsysRUWithNonSA.pkg";
- $sisFile = "testsysRUWithNonSA.sis";
- $LogFile = "testsysRUWithNonSA.log";
-
-
- WriteLog("CR1027 - Test for Un-successful creation of a sis file with the ROM Upgrade install flag RU with the wrong install type, anything other than SA.\n");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $PkgFileRUWithNonSA, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgFilewithRUAndNonSA, $PkgFile);
-
-
- # Create an embedding sis file
- my $result = system("$makesisExeLocation $pkgFilewithRUAndNonSA $sisFile > $LogFile");
-
-
- $NumberOfTests++;
- if ($result != 0 )
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $pkgFilewithRUAndNonSA;
- unlink $sisFile;
- unlink $LogFile
-}
-
-#
-# New test code for CR1122 - WildCard Support for ROM Stubs.
-# This test checks for the successful creation of sis file when PKG file contains the wildcard charetors(? and *) in it.
-# These packages can be upgraded (eclipsed) in much wider way as per the wildcard charector's behaviour.
-#
-
-sub TestSISWithWildCards {
-
- $pkgFilewithWildCards = "testSysWithWildCards.pkg";
- $sisFile = "testSysWithWildCards.sis";
- $LogFile = "testSysWithWildCards.log";
-
-
- WriteLog("CR1122 - Test for successful creation of a sis file for wildcarded ROM stub package file.\n");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $WildCardedpkgFile, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgFilewithWildCards, $PkgFile);
-
-
- # Create an embedding sis file
- my $result = system("$makesisExeLocation -s $pkgFilewithWildCards $sisFile > $LogFile");
-
-
- $NumberOfTests++;
- if ($result == 0 )
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $pkgFilewithWildCards;
- unlink $sisFile;
- unlink $LogFile;
-}
-
-
-#
-# New test code for CR1122 - WildCard Support for ROM Stubs.
-# This test checks for the Un-successful creation of sis file when PKG file contains the wildcard charetors(? and *) and PA install type in it.
-#
-
-sub TestSISWithWildCardsPA {
-
- $pkgFilewithWildCards = "testSysWithWildCards.pkg";
- $sisFile = "testSysWithWildCards.sis";
- $LogFile = "testSysWithWildCards.log";
-
-
- WriteLog("CR1122 - Test for un-successful creation of a SIS file for wildcarded PA package file.\n");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $WildCardedPApkgFile, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgFilewithWildCards, $PkgFile);
-
-
- # Create an embedding sis file
- my $result = system("$makesisExeLocation $pkgFilewithWildCards $sisFile > $LogFile");
-
-
- $NumberOfTests++;
- if ($result != 0 )
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $pkgFilewithWildCards;
- unlink $sisFile;
- unlink $LogFile;
-}
-
-
-#
-# New test code for CR1122 - WildCard Support for ROM Stubs.
-# This test checks for the Un-successful creation of sis file when PKG file contains the wildcard charetors(? and *) and PP install type in it.
-#
-sub TestSISWithWildCardsPP {
-
- $pkgFilewithWildCards = "testSysWithWildCards.pkg";
- $sisFile = "testSysWithWildCards.sis";
- $LogFile = "testSysWithWildCards.log";
-
-
- WriteLog("CR1122 - Test for un-successful creation of a SIS file for wildcarded PA package file.\n");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $WildCardedPPpkgFile, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgFilewithWildCards, $PkgFile);
-
-
- # Create an embedding sis file
- my $result = system("$makesisExeLocation $pkgFilewithWildCards $sisFile > $LogFile");
-
-
- $NumberOfTests++;
- if ($result != 0 )
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $pkgFilewithWildCards;
- unlink $sisFile;
- unlink $LogFile;
-}
-
-
-sub TestSingleCharFilename {
-
- $pkgFileName = "temp.pkg";
- $sisFile = "t.sis";
- $LogFile = "singleCharFilename.log";
-
- WriteLog("Test for successful creation of a sis file with a single char in its filename.\n"); #DEF108728
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $PkgFileTemp2, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgFileName, $PkgFile);
-
- # Create an embedding sis file
- my $result = system("$makesisExeLocation $pkgFileName $sisFile > $LogFile");
-
-
- $NumberOfTests++;
- if ($result == 0 )
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed with result $result\n\n");
- }
-
- unlink $pkgFileName;
- unlink $sisFile;
- unlink $LogFile
-}
-
-
-#
-# Test code for DEF111264 - Makesis should warn if wildcards are used in the \sys\bin\ directory in ROM stubs .
-# This test checks verifies that a warning is generated when a ROM Stub file contains an exe with wildcards(* or ?) specified .
-#
-
-sub TestDEF111264 {
-
- $pkgFile = "ROMStubWildCardWarning.pkg";
- $sisFile = "ROMStubWildCardWarning.sis";
- $LogFile = "ROMStubWildCardWarning.log";
- $ExpectedLogFile = "ROMStubWildCardExpected.log";
-
- WriteLog("DEF111264 - Makesis should warn if wildcards are used in the \sys\bin\ directory in ROM stubs.\n");
-
- # Generate test PKG file contents for pkg file.
- $PkgFile = sprintf( $ExeWithWildCardpkgFile, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgFile, $PkgFile);
-
- # Create expected log file
- my $trailingData = "Created $sisFile.";
- my $OutputData = "Processing $pkgFile...\n$DEF111264ExpectedOutput$trailingData";
-
- CreateFile($ExpectedLogFile ,$OutputData);
-
- # Create a sis file
- my $result = system("/epoc32/tools/makesis -s $pkgFile $sisFile > $LogFile");
-
- use File::Compare;
- my $result1;
-
- if(compare($LogFile ,$ExpectedLogFile)== 0)
- {
- $result1 = 0;
- }
- else
- {
- $result1 = 1;
- }
-
- $NumberOfTests++;
-
- if ($result == 0 && $result1 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $pkgFile;
- unlink $sisFile;
- unlink $LogFile;
- unlink $ExpectedLogFile;
-}
-
-
-#
-# Test code for DEF113349 - Attempting to embed a PP SIS file in an SA SIS file causes makesis to crash.
-# This test checks verifies that a warning is generated when attempted to embed a PP/PA SIS file in an SA SIS.
-#
-
-sub TestDEF113349 {
-
- $pkgEmbeddedFile = "EmdeddedPA.pkg";
- $sisEmbeddedFile = "EmbeddedPA.sis";
- $pkgFile = "EmdeddingPA.pkg";
- $sisFile = "EmbeddingPA.sis";
- $LogFile = "DEF113349.log";
- $ExpectedLogFile = "DEF113349Expected.log";
-
- WriteLog("DEF113349 - Attempting to embed a PP SIS file in an SA SIS file causes makesis to crash.\n");
-
- # Generate test PKG file contents for the embedded pkg file.
- $PkgFile = sprintf( $EmbeddedPApkgFile, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgEmbeddedFile, $PkgFile);
-
- # Create SIS file for the embedded package of type = PA.
- my $result = system("/epoc32/tools/makesis $pkgEmbeddedFile $sisEmbeddedFile > $LogFile");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $EmbeddingPApkgFile, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgFile , $PkgFile);
-
- # Create SIS file for the embedding package of type = SA.
- my $result1 = system("/epoc32/tools/makesis $pkgFile $sisFile > $LogFile");
-
- my $OutputData = "Processing $pkgFile...\n$DEF113349ExpectedOutput";
-
- # Create expected log file
- CreateFile($ExpectedLogFile ,$OutputData);
-
- use File::Compare;
- my $result2;
-
- if(compare($LogFile ,$ExpectedLogFile)== 0)
- {
- $result2 = 0;
- }
- else
- {
- $result2 = 1;
- }
-
- $NumberOfTests++;
-
- if ($result == 0 && $result1 == 256 && $result2 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $pkgEmbeddedFile;
- unlink $sisEmbeddedFile;
- unlink $pkgFile;
- unlink $sisFile;
- unlink $LogFile;
- unlink $ExpectedLogFile;
-}
-
-#
-# Test code for DEF113116 : It is not possible to abort an installation without causing an error.
-# This test checks for the successful creation of sis file when pkg file contains a new display text option
-# ForceAbort (FA).
-#
-
-
-sub TestDEF113116 {
-
- $pkgFile = "textoption_FA.pkg";
- $sisFile = "textoption_FA.sis";
- $LogFile = "textoption_FA.log";
- $DumpsisGenPkgPath = "\/textoption_FA";
-
- WriteLog("DEF113116 : Test MakeSIS and DumpSIS support for ForceAbort (FA) text option.\n");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $PkgFileWithFAOption, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgFile , $PkgFile);
-
- # Create sis file using MakeSIS
- my $result = system("$makesisExeLocation $pkgFile $sisFile > $LogFile");
-
- # Recreate pkg file using DumpSIS.
- my $result1 = system("$dumpsisExeLocation $sisFile > $LogFile");
-
- $NumberOfTests++;
- if ($result == 0 && $result1 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- use cwd;
- $dir = cwd;
-
- unlink $pkgFile;
- unlink $sisFile;
- unlink $LogFile;
-
- use File::Path;
- rmtree "$dir$DumpsisGenPkgPath";
-
-}
-
-#
-# Test code for Makesis -c option.
-# This test verifies that errors are reported where the SIS file being generated will not be installable by InterpretSIS.
-#
-
-sub TestInterpretsisReport {
-
- $pkgEmbeddedFile = "Emdedded.pkg";
- $sisEmbeddedFile = "Embedded.sis";
- $pkgFile = "Interpretsis.pkg";
- $sisFile = "Interpretsis.sis";
- $LogFile = "Interpretsis.log";
- $ExpectedLogFile = "InterpretsisExpected.log";
-
- WriteLog("Makesis -c\n");
-
- # Generate test PKG file contents for the embedded pkg file.
- $PkgFile = sprintf( $PkgFileTempl, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgEmbeddedFile, $PkgFile);
-
- # Create SIS file for the embedded package.
- my $result = system("/epoc32/tools/makesis $pkgEmbeddedFile $sisEmbeddedFile > $LogFile");
-
- # Generate test PKG file contents for embedding pkg file.
- $PkgFile = sprintf( $PkgFileInterpretsisVersionTemplate, "-1,-1,-1");
-
- # Create PKG file
- CreateFile($pkgFile , $PkgFile);
-
- # Create SIS file for the embedding package of type = SA.
- my $result1 = system("/epoc32/tools/makesis -c $pkgFile $sisFile > $LogFile");
-
- # Create expected log file
- my $trailingData = "Created $sisFile.";
- my $OutputData = "Processing $pkgFile...\n$InterpretsisExpectedOutput$trailingData";
-
- CreateFile($ExpectedLogFile ,$OutputData);
-
- use File::Compare;
- my $result2;
-
- if(compare($LogFile ,$ExpectedLogFile)== 0)
- {
- $result2 = 0;
- }
- else
- {
- $result2 = 1;
- }
-
- $NumberOfTests++;
-
- if ($result == 0 && $result1 == 256 && $result2 == 0)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $pkgEmbeddedFile;
- unlink $sisEmbeddedFile;
- unlink $pkgFile;
- unlink $sisFile;
- unlink $LogFile;
- unlink $ExpectedLogFile;
-}
-
-#
-# Main
-#
-# Create environment and control test flow to testing MAKESIS.EXE
-# (generate text.txt, pkg file, test makesis and check the result)
-#
-
-unlink($logFile);
-WriteLog("makesis test.\n\n");
-
-#
-# Generate test.txt this is the only one element of every PKGs.
-#
-$contents = "This is a test text.";
-CreateFile('TEST.txt', $contents);
-
-#
-# Generate HelloApp.exe this is the only one element of every PKGs.
-#
-$contents = "This is a test exe.";
-CreateFile('HelloApp.exe', $contents);
-
-#
-# Counters for results
-#
-$NumberOfTests = 0;
-$NUmberOfPassed = 0;
-$NumberOfFailed = 0;
-
-#
-# Array of contents of test pkgs and expected results
-#
-# file name, range, expected, expected log, Title
-# (from) (to) result message
-# -----------------------------------------------------------------------------------------------------------------------------------------
-@TestItems = ( ["test01.pkg", "-1,-1,-1", 0, "Generating SIS installation file...", "Range not specified 1."],
- ["test02.pkg", "-1,-1,-1 ~ -1,-1,-1", 0, "Generating SIS installation file...", "Range not specified 2."],
- ["test03.pkg", "1, 0, 0", 0, "Generating SIS installation file...", "Only from specified 1."],
- ["test04.pkg", "1,-1,-1 ~ -1,-1,-1", 0, "Generating SIS installation file...", "Only from specified 2."],
- ["test05.pkg", "1,-1,-1 ~ 2,-1,-1", 0, "Generating SIS installation file...", "Correct from and to specified."],
- ["test06.pkg", "-1,-1,-1 ~ 2,-1,-1", 0, "Generating SIS installation file...", "Only to specified."],
- ["test07.pkg", "1,-1,-1 ~ 1,-1,-1", 0, "Generating SIS installation file...", "Correct. Same Major, not minor specified."],
- ["test08.pkg", "1, 1,-1 ~ 1, 1,-1", 0, "Generating SIS installation file...", "Correct. Same Major, minor and not build specified."],
- ["test09.pkg", "1, 1,-1 ~ 1, 2,-1", 0, "Generating SIS installation file...", "Correct. Same Major and differ minor specified."],
- ["test10.pkg", "1, 1, 1 ~ 1, 1, 2", 0, "Generating SIS installation file...", "Correct. Same Major, Minor and differ build specified."],
- ["test11.pkg", "1, 1,-1 ~ 1, 1, 2", 0, "Generating SIS installation file...", "Correct. Same Major, Minor and differ build specified."],
- ["test12.pkg", "1, 1, 1 ~ 1, 1, 1", 0, "Generating SIS installation file...", "Correct. Same Major, minor and build specified."],
- ["test13.pkg", "4,-1,-1 ~ 2,-1,-1", 256, "verification failure", "Wrong range of major of from and to."],
- ["test14.pkg", "1, 2,-1 ~ 1, 1,-1", 256, "verification failure", "Wrong range of minor of from and to."],
- ["test15.pkg", "1, 2, 2 ~ 1, 2, 1", 256, "verification failure", "Wrong range of build of from and to."],
- ["test16.pkg", "1,-1,-1 ~ 2,1,1 ", 256, "invalid destination path or syntax", "exe name contains non ascii characters."],
- ["test17.pkg", "1,-1,-1 ~ 2,1,1 ", 256, "invalid destination path or syntax", "package file encoding is not supported."],
- ["testForward.pkg", "1,-1,-1 ~ 2,1,1 ", 0, "Generating SIS installation file...", "package file can have forward slash."],
- ["testFN_RI.pkg", "1,0,0 ~ 1,0,0", 0, "Generating SIS installation file...", "DEF126367: Check interaction between FN and RI."]
- );
-
-
-# For DEF92320
-# Test for filename & Dir name, should not contain symbols like |,/,<,>,:,?,*
-# Array of contents of test pkgs
-#
-# file name, symbols , expected , expected log, Title
-# result message
-# --------------------------------------------------------------------------------------------------------------------------
-@TestItems1 = ( ["test01.pkg", "*", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test02.pkg", "\"<42>\"", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test03.pkg", "?", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test05.pkg", " \"", 256, "error: unknown line", "File paths should not contain *,:,<,>"],
- ["test06.pkg", "<", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test07.pkg", ">", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test08.pkg", "|", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test11.pkg", "\"<58>\"", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test12.pkg", ":", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test13.pkg", "\"<63>\"", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test14.pkg", "\"<34>\"", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test15.pkg", "\"<62>\"", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test16.pkg", "\"<124>\"", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test17.pkg", "\"<60>\"", 256, "invalid destination path or syntax", "File paths should not contain *,:,<,>"],
- ["test18.pkg", "\"<92>\"", 0, "Generating SIS installation file...", "contain \\"],
- ["test19.pkg", "*", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test20.pkg", "\"<42>\"", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test21.pkg", "?", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test23.pkg", " \"", 256, "error: unknown line", "DIR paths should not contain *,:,<,>"],
- ["test24.pkg", "<", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test25.pkg", ">", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test26.pkg", "|", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test28.pkg", "\"<58>\"", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test29.pkg", ":", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test30.pkg", "\"<63>\"", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test31.pkg", "\"<34>\"", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test32.pkg", "\"<62>\"", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test33.pkg", "\"<124>\"", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test34.pkg", "\"<60>\"", 256, "invalid destination path or syntax", "DIR paths should not contain *,:,<,>"],
- ["test35.pkg", "\"<92>\"", 0, "Generating SIS installation file...", "DIR pcontain\\"],
- );
-
-
-
-# CR1125 - Add Package Versions to SIS File Conditionals Test Cases
-# Array of test PKG data and expected results for each test case and associated itterations
-#
-# file name, conditional statement, Expected, Expected Test Case ID
-# result log
-# ------------------------------------------------------------------------------------------------------------------------------------
-@TestItems2 = ( ["test01.pkg", "VERSION(0xE1000001,=,1,2,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A001 : A"],
- ["test02.pkg", "VERSION(0xE1000001,<>,1,2,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A001 : B"],
- ["test03.pkg", "VERSION(0xE1000001,>,1,2,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A001 : C"],
- ["test04.pkg", "VERSION(0xE1000001,>=,1,2,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A001 : D"],
- ["test05.pkg", "VERSION(0xE1000001,<,1,2,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A001 : E"],
- ["test06.pkg", "VERSION(0xE1000001,<=,1,2,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A001 : F"],
- ["test07.pkg", "VERSION(test,=,1,2,3)", 256, "Expected numeric value read alphanumeric value", "CR1125 SEC-SWI-PKGVER-A002 : A"],
- ["test08.pkg", "VERSION(0xE1000001,test,1,2,3)", 256, "Invalid Relational Operator", "CR1125 SEC-SWI-PKGVER-A002 : B"],
- ["test09.pkg", "VERSION(0xE1000001,=,test,2,3)", 256, "Expected numeric value read alphanumeric value", "CR1125 SEC-SWI-PKGVER-A002 : C"],
- ["test10.pkg", "VERSION(0xE1000001,=,1,test,3)", 256, "Expected numeric value read alphanumeric value", "CR1125 SEC-SWI-PKGVER-A002 : D"],
- ["test11.pkg", "VERSION(0xE1000001,=,1,2,test)", 256, "Expected numeric value read alphanumeric value", "CR1125 SEC-SWI-PKGVER-A002 : E"],
- ["test12.pkg", "VERSION(0xE1000001,=,-2,2,3)", 256, "Negative version components are not supported", "CR1125 SEC-SWI-PKGVER-A003 : A"],
- ["test13.pkg", "VERSION(0xE1000001,=,-1,2,3)", 256, "Wildcards are not supported", "CR1125 SEC-SWI-PKGVER-A003 : B"],
- ["test14.pkg", "VERSION(0xE1000001,=,0,2,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : C"],
- ["test15.pkg", "VERSION(0xE1000001,=,1,2,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : D"],
- ["test16.pkg", "VERSION(0xE1000001,=,126,2,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : E"],
- ["test17.pkg", "VERSION(0xE1000001,=,127,2,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : F"],
- ["test18.pkg", "VERSION(0xE1000001,=,128,2,3)", 0, "Warning : The valid version number ranges are :", "CR1125 SEC-SWI-PKGVER-A003 : G"],
- ["test19.pkg", "VERSION(0xE1000001,=,1,-2,3)", 256, "Negative version components are not supported", "CR1125 SEC-SWI-PKGVER-A003 : H"],
- ["test20.pkg", "VERSION(0xE1000001,=,1,-1,3)", 256, "Wildcards are not supported", "CR1125 SEC-SWI-PKGVER-A003 : I"],
- ["test21.pkg", "VERSION(0xE1000001,=,1,0,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : J"],
- ["test22.pkg", "VERSION(0xE1000001,=,1,1,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : K"],
- ["test23.pkg", "VERSION(0xE1000001,=,1,98,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : L"],
- ["test24.pkg", "VERSION(0xE1000001,=,1,99,3)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : M"],
- ["test25.pkg", "VERSION(0xE1000001,=,1,100,3)", 0, "Warning : The valid version number ranges are :", "CR1125 SEC-SWI-PKGVER-A003 : N"],
- ["test26.pkg", "VERSION(0xE1000001,=,1,2,-2)", 256, "Negative version components are not supported", "CR1125 SEC-SWI-PKGVER-A003 : O"],
- ["test27.pkg", "VERSION(0xE1000001,=,1,2,-1)", 256, "Wildcards are not supported", "CR1125 SEC-SWI-PKGVER-A003 : P"],
- ["test28.pkg", "VERSION(0xE1000001,=,1,2,0)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : Q"],
- ["test29.pkg", "VERSION(0xE1000001,=,1,2,1)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : R"],
- ["test30.pkg", "VERSION(0xE1000001,=,1,2,32766)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : S"],
- ["test31.pkg", "VERSION(0xE1000001,=,1,2,32767)", 0, "Generating SIS installation file...", "CR1125 SEC-SWI-PKGVER-A003 : T"],
- ["test32.pkg", "VERSION(0xE1000001,=,1,2,32768)", 0, "Warning : The valid version number ranges are :", "CR1125 SEC-SWI-PKGVER-A003 : U"],
- ["test33.pkg", "VERSION(0xE1000001,=,*,2,3)", 256, "Wildcards are not supported", "CR1125 SEC-SWI-PKGVER-A004 : A"],
- ["test34.pkg", "VERSION(0xE1000001,=,1,*,3)", 256, "Wildcards are not supported", "CR1125 SEC-SWI-PKGVER-A004 : B"],
- ["test35.pkg", "VERSION(0xE1000001,=,1,2,*)", 256, "Wildcards are not supported", "CR1125 SEC-SWI-PKGVER-A004 : C"],
- ["test36.pkg", "VERSION(0xE1000001,=,1,2,)", 256, "Expected numeric value read ", "CR1125 SEC-SWI-PKGVER-A005 : A"],
- ["test37.pkg", "VERSION(0xE1000001,=,1,)", 256, "Expected numeric value read ", "CR1125 SEC-SWI-PKGVER-A005 : B"],
- ["test38.pkg", "VERSION(0xE1000001,=,)", 256, "Expected numeric value read ", "CR1125 SEC-SWI-PKGVER-A005 : C"],
- ["test39.pkg", "VERSION(0xE1000001,)", 256, "Invalid Relational Operator", "CR1125 SEC-SWI-PKGVER-A005 : D"],
- ["test40.pkg", "VERSION()", 256, "Expected numeric value read ", "CR1125 SEC-SWI-PKGVER-A005 : E"],
- ["testinterpretflag.pkg", "VERSION(0x11113011,=,1,2,3)", 0, "SIS installation file VALID for InterpretSis", "CR1125 SEC-SWI-PKGVER-A006"],
- );
-
-
-#
-# Template string to generate PKG file
-#
-$AnotherPkgFileTempl = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"my test\"}, (0x80002233), 1, 2, 3, TYPE=SA
-;
-%%{\"Vendor\"}
-;
-;Installation name and header data
-(0x101f74aa),%s,{\"test\"}
-;
-;Made up files to install
-\"HelloApp.exe\"-\"c:\\sys\\bin\\multiÅžÑÂEÂEžÑÂEÂE”Ê.exe\"
-;
-";
-
-
-#
-# Template string to generate PKG file
-#
-$PkgFileTempl = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"test\"}, (0x101f74aa), 1, 0, 0, TYPE=SA
-;
-%%{\"Ati\"}
-;
-;Installation name and header data
-(0x101f74aa),%s,{\"test\"}
-;
-;Made up files to install
-\"TEST.txt\"-\"!:\\System\\Apps\\TEST.txt\"
-;
-
-";
-
-#
-#
-# Pkg file can have forward slashes for source and destination file
-$ForwardSlash = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"test\"}, (0x101f74aa), 1, 0, 0, TYPE=SA
-;
-%{\"Ati\"}
-;
-
-;Made up files to install
-
-\"TEST.txt\"-\"!:/Documents/InstTest/file1.txt\"
-;
-";
-
-#
-#
-# Package file contains a FileNull followed by a RunInstall. The wildcard in the FN should be allowed and
-# makesis should not be confused by the flags in the RI
-$FN_RI ="
-&EN
-#{\"Symbian Email\"}, (0x800126e5), 1, 0, 0, TYPE=SA
-%{\"Symbian\"}
-:\"Symbian\"
-
-\"\"- \"C:/private/80009b91/temp/*.*\", FN
-\"HelloApp.exe\"-\"C:/sys/bin/postinstall.exe\", FR, RI
-";
-
-#
-#
-# Pkg file can have forward slashes for source and destination file
-$ForwardSlash = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"test\"}, (0x101f74aa), 1, 0, 0, TYPE=SA
-;
-%{\"Ati\"}
-;
-
-;Made up files to install
-
-\"TEST.txt\"-\"!:/Documents/InstTest/file1.txt\"
-;
-";
-
-
-#
-# Template string to generate PKG file
-#
-$PkgFileTemp2 = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"test\"}, (0x101f74aa), 1, 0, 0, TYPE=SA
-;
-%%{\"Ati\"}
-;
-;Installation name and header data
-(0x101f74aa),%s,{\"test\"}
-;
-;Made up files to install
-\"TEST.txt\"-\"\$\:\\System\\Apps\\TEST.txt\"
-;
-";
-
-#
-# Template string to generate embedded package (testembedded.pkg).This is used for testing -d option of makesis .
-#
-$embedContents = "
-;
-; Autogenerated test install file for testing -d option.
-;
-&EN
-;
-#{\"embed\"}, (0x101f74a0), 1, 0, 0, TYPE=SA
-;
-%{\"Ati\"}
-;
-;Installation name and header data
-(0x101f74a0),%s,{\"embed\"}
-;
-;embedded sis file
-\@\"testembedding.sis\",(0x101f74aa)
-
-;Made up files to install
-\"TEST.txt\"-\"!:\\System\\Apps\\TEST.txt\"
-;
-";
-
-#
-# Template string to generate a package with 0xA0 chars (No-Break Space) inside
-#
-$ifendifContent = "
-;
-; Autogenerated test install file for testing DEF091780: Makesis have problems parsing IF-ENDIF block
-;
-
-;Languages
-&JA,FR
-
-;Header
-#{\"JA hira UCS2\",\"FR hira UCS2\" }, (0x80000003), 1, 2, 3, TYPE=SA
-%{\"AA-JA\",\"CC-FR\"}
-:\"venDor\"
-
-!({\"JAOpt1\",\"FROpt1\"},{\"JAOpt3\",\"FROpt3\"})
-
-if option1
-\xA0\xA0\xA0{\"osver1J.txt\" \"osver1F.txt\"}-\"!:\\documents\\hello.txt\";
-endif
-
-if option2
-\xA0\xA0\xA0{\"osver2J.txt\" \"osver2F.txt\"}-\"!:\\documents\\hello.txt\";
-endif
-";
-
-#
-#
-# A string to generate a package with Japanese JIS 0208-1990 encoding
-$unsupportedEncContent = "
-;Languages
-&JA
-
-;Header
-#{\"PC Japanese JIS 0208-1990 encoding\"}, (0xA2000222), 1, 2, 3, TYPE=SA
-
-%{\"Vendor\"}
-:\"Vendor\"
-
-\"TEST.txt\"-\"!:\Documents\InstTest\ñÃÂñ┘ñâ”ÂEtxt\"
-";
-
-
-#
-# Template string to generate PKG file with If Exist statement for DEF091860.
-#
-$DEF091860PkgContents = "
-;
-; PKG file designed to test conditional installation.
-; Autogenerated test install file
-;
-&EN
-;
-#{\"test\"}, (0x101f74aa), 1, 0, 0, TYPE=SA
-;
-%{\"Ati\"}
-;
-;Installation name and header data
-(0x101f74aa),%s,{\"test\"}
-;
-;Made up files to install
-\"TEST.txt\"-\"!:\\System\\Apps\\TEST.txt\"
-;
-; The file “test1.txtâ€ÂEis expected to exist.
-if exists(\"test1.txt\")
-\"TEST.txt\"-\"!:\\System\\Apps\\TEST1.txt\"
-else
-\"TEST.txt\"-\"!:\\System\\Apps\\TEST2.txt\"
-endif
-
-; The file “test2.txtâ€ÂEis not expected to exist.
-if exists(\"test2.txt\")
-\"TEST.txt\"-\"!:\\System\\Apps\\TEST3.txt\"
-else
-\"TEST.txt\"-\"!:\\System\\Apps\\TEST4.txt\"
-endif
-;
-";
-
-#
-# Template string to generate PKG file for language dependent files
-#
-$PkgLanguageFileTemp = "
-;
-;
-&EN,FR,98
-;
-#{\"Language-EN\",\"Langauge-FR\",\"Language-Zulu\"}, (0x101f74aa), 1, 0, 0, TYPE=SA
-;
-%%{\"Vendor\",\"Vendour\",\"Verkoper\"}
-;
-;
-;Made up files to install
-{\"englishfile.txt\" \"frenchfile.txt\" \"germanfile.txt\"} -\"!:\\System\\Apps\\TEST.txt\"
-;
-";
-
-
-
-# For DEF92320
-# Template string to generate PKG file,File name contain symbols like |,/,<,>,:,?,*
-#
-$PkgFileWithSymbol = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"test\"}, (0x101f74aa), 1, 2, 3, TYPE=SA
-;
-%%{\"Ati\"}
-;
-;Made up files to install
-\"TEST.txt\"-\"!:\\System\\Apps\\TEST%s.txt\"
-;
-";
-
-# For DEF92320
-# Template string to generate PKG file, DIR path contain symbols like |,/,<,>,:,?,*
-#
-$PkgFileWithSymbol1 = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"test\"}, (0x101f74aa), 1, 2, 3, TYPE=SA
-;
-%%{\"Ati\"}
-;
-;Made up files to install
-\"TEST.txt\"-\"!:\\System\\Ap%sps\\TEST.txt\"
-;
-";
-
-# For DEF115795
-# Template string to generate a package with very long destination folder
-#
-$longfolder = "
-;
-&EN
-;
-#{\"STSisapt444\"},(0x88900000),1,1,1,NOCOMPRESS,TYPE= SA
-;
-%{\"Test\"}
-;
-;
-\"TEST.txt\"-\"!:\siv1aaa\\10003a3f\\import\\apps\\siv2aa\\10003a3f\\import\\apps\\siv3aa\\10003a3f\\import\\apps\\siv4aa\\10003a3f\\import\\apps\\siv5aa\\10003a3f\\import\\apps\\siv6aa\\10003a3f\\import\\apps\\siv7aa\\10003a3f\\import\\apps\\siv8aa\\10003a3f\\import\\apps\\siv9aa\\10003a3f\\import\\apps\\siv10a\\10003a3f\\import\\apps\\siv11a\\10003a3f\\import\\appspp\\file1.txt\"
-;
-";
-
-#
-# Template string to generate a package with comma at the end
-#
-$endFileCommaContent = "
-; A simple SIS file
-
-;Languages
-&EN,FR
-
-;Header
-#{\"Simple\",\"Simple-FR\"}, (0x80000001), 4, 5, 6
-
-%{\"Simple-Vendor\",\"Simple-Vendor-FR\"}
-:\"Unique Vendor Name\"
-
-;Ordinary file to selected drive
-\"TEST.txt\"-\"!:/Documents/InstTest/file1.txt\",
-";
-
-
-# Data to write in the created file for Linux test
-$TempData = "Osver";
-
-#
-# Template string to generate PKG file
-#
-$JAPPkgFileTempl = "
-;
-; Autogenerated test install file
-;
-&JA
-;
-#{\"names large sample UTF8\"}, (0xA2000222), 1, 2, 3, TYPE=SA
-;
-%%{\"Vendor\"}
-;
-
-;Made up files to install
-\"\\epoc32\\winscw\\c\\tswi\\utf8.txt\"-\"!:\\utf8.txt\"
-;
-
-";
-
-
-#
-# Package template string to generate PKG file with RU and SA
-#
-$PkgFileRUWithSA = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"SA ROM Upgrade\"}, (0x802730A2), 1, 0, 0, TYPE=SA, RU
-;
-%%{\"Security Services\"}
-;
-;Installation name and header data
-(0x802730A2),%s,{\"SA ROM Upgrade\"}
-;
-;Made up files to install
-\"TEST.txt\"-\"\$\:\\System\\Apps\\TEST.txt\"
-;
-";
-
-#
-# Package template string to generate PKG file with RU and non SA or PU or SP
-#
-$PkgFileRUWithNonSA = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"SA ROM Upgrade\"}, (0x802730A2), 1, 0, 0, TYPE=PP, RU
-;
-%%{\"Security Services\"}
-;
-;Installation name and header data
-(0x802730A2),%s,{\"SA ROM Upgrade\"}
-;
-;Made up files to install
-\"TEST.txt\"-\"\$\:\\System\\Apps\\TEST.txt\"
-;
-";
-
-#
-# Package template string to generate PKG file with wildcards for ROM Stub.
-#
-$WildCardedpkgFile = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"Wildcard Suported ROM App\"}, (0x802730B1), 1, 2, 3
-;
-%%{\"Security Services\"}
-;
-;Installation name and header data
-(0x802730B1),%s,{\"Wildcard Suported ROM App\"}
-;
-;Made up files to install
-\"\"-\"z:\\sys\\bin\\wildcard_rom_stub_lib?.dll\"
-;
-\"\"-\"z:\\sys\\bin\\*.exe\"
-;
-
-; Misc data files for baseline eclipsing test
-\"\"-\"z:\\cr1122test\\*.txt\"
-;
-\"\"-\"z:\\cr1122etst\\wildcard_config?.cnf\"
-;
-";
-
-
-#
-# Package template string to generate PKG file with wildcards for PA package
-#
-$WildCardedPApkgFile = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"Wildcarded PA\"}, (0x802730B1), 1, 2, 3, TYPE = PA
-;
-%%{\"Security Services\"}
-;
-;Installation name and header data
-(0x802730B1),%s,{\"wildcarded PA\"}
-;
-;Made up files to install
-\"\\epoc32\\release\\<PLATFORM>\\<CONFIGURATION>\\tsaromupgradeexe.exe\"-\"c:\\sys\\bin\\*exe_PA?.exe\"
-;
-";
-
-#
-# Package template string to generate PKG file with wildcards for PP package
-#
-$WildCardedPApkgFile = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"Wildcarded PP\"}, (0x802730B1), 1, 2, 3, TYPE = PP
-;
-%%{\"Security Services\"}
-;
-;Installation name and header data
-(0x802730B1),%s,{\"Wildcarded PP\"}
-;
-;Made up files to install
-\"\\epoc32\\release\\<PLATFORM>\\<CONFIGURATION>\\tsaromupgradeexe.exe\"-\"c:\\sys\\bin\\*exe_PA?.exe\"
-;
-";
-
-#
-# Package template string to generate PKG file having wildcards specified in the executable filename.
-#
-$ExeWithWildCardpkgFile = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"Wildcard in Exe Name\"}, (0x801130c1), 1, 2, 3
-;
-%%{\"Security Services\"}
-;
-;Installation name and header data
-(0x801130c1),%s,{\"Wildcard in Exe Name\"}
-;
-;Made up files to install
-\"\"-\"z:\\sys\\bin\\wildcard_rom_stub.*\"
-;
-\"\"-\"z:\\sys\\bin\\wildcard_rom_stub?.dll\"
-;
-";
-
-#
-# Template string to generate a package with invalid version
-#
-$invalidVersion1 = "
-; A simple SIS file
-
-;Languages
-&EN,FR
-
-;Header
-#{\"Simple\",\"Simple-FR\"}, (0x80000001), 32767, 32767, 32767
-
-%{\"Simple-Vendor\",\"Simple-Vendor-FR\"}
-:\"Unique Vendor Name\"
-
-;Ordinary file to selected drive
-\"TEST.txt\"-\"!:/Documents/InstTest/file1.txt\"
-";
-
-
-#
-# Template string to generate a package with invalid version number for negative values
-#
-$invalidVersion2 = "
-; A simple SIS file
-
-;Languages
-&EN,FR
-
-;Header
-#{\"Simple\",\"Simple-FR\"}, (0x80000001), -26, -1, -3245
-
-%{\"Simple-Vendor\",\"Simple-Vendor-FR\"}
-:\"Unique Vendor Name\"
-
-;Ordinary file to selected drive
-\"TEST.txt\"-\"!:/Documents/InstTest/file1.txt\"
-";
-
-#
-# Template string to generate a pkg with an embedded sis file. The embedded sis file is missing on the computer.
-#
-$missingEmbed = "
-;
-; Pkg referencing missing embedded package.
-;
-&EN
-;
-#{\"missing embedded\"}, (0x80000001), 1, 0, 0, TYPE=SA
-;
-;missing embedded sis file
-\@\"missingembedded.sis\",(0x80000002)
-;
-";
-
-# Package template string to generate PKG file with ForceAbort (FA) text option.
-#
-$PkgFileWithFAOption = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"Force Abort Text Option\"}, (0x8072302A), 1, 0, 0, TYPE=SA
-;
-%%{\"Security Services\"}
-;
-;Installation name and header data
-(0x802730A2),%s,{\"SA ROM Upgrade\"}
-;
-;Made up files to install
-\"TEST.txt\"-\"\", FT , FA
-;
-";
-
-#
-#Test code for Preinstalled pkg files without having sourcefiles
-#
-$PreinstalledPkgWithoutSourcefiles = "
-;A preinstalled SIS file
-
-;Languages
-&EN,FR
-
-;Header
-#{\"Simple\",\"Simple-FR\"}, (0x80000001), 1, 2, 3, TYPE = PA
-
-%{\"Simple-Vendor\",\"Simple-Vendor-FR\"}
-:\"Unique Vendor Name\"
-
-;Ordinary file to selected drive
-\"\"-\"!:/Documents/InstTest/file1.txt\"
-";
-
-
-
-#
-# Template string to generate Expected output file for ROM stub file (containing exe with wildcards) created by makesis for DEF111264.
-#
-$DEF111264ExpectedOutput= "Unique vendor name not found.
-
-Warning: Executables should be included explicitly (without wildcards),to enable SID checks to work as expected.
-";
-
-#
-# Template string to generate Expected output file for Preinstalled APP package having no source files specified.
-#
-$DEF113569ExpectedOutput= " Error : Source file is missing for PreInstalled APP :
-(14) : error: file I/O fault, Source file is missing for PreInstalled APP
-";
-
-
-#
-# Template string to generate Expected output file when the version range is invalid.
-
-$DEF112718ExpectedOutput= "Warning : The valid version number ranges are : (Major: 0..127) (Minor: 0..99 ) (Build: 0..32,767).\n";
-
-#
-# Package template string to generate an embedded PKG file of type PA.
-#
-$EmbeddedPApkgFile = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"Test Embedded PA\"}, (0x01101335), 1, 1, 1, TYPE=PA
-;
-%{\"Symbian Software Ltd\"}
-:\"Symbian Software Ltd\"
-;
-;Installation name and header data
-(0x01101335),%s,{\"Test Embedded PA\"}
-;
-";
-
-#
-# Package template string to generate an embedding PKG file whose embedded pkg is of type=PA.
-#
-$EmbeddingPApkgFile = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"Test Embedding PA\"}, (0x01011243), 1, 0, 1, TYPE=SA
-;
-%{\"Symbian Software Ltd\"}
-:\"Symbian Software Ltd\"
-;
-;Installation name and header data
-(0x01011243),%s,{\"Test Embedding PA\"}
-;
-\@\"embeddedPA.sis\" , (0x01101335)
-;
-";
-
-#
-# CR1125 VERSION Condition Package template string to generate PKG files
-#
-$PkgFileCR1125VersionTemplate = "
-;
-; Auto Generated Template PKG File
-; VERSION Conditional Testing
-;
-&EN
-;
-#{\"CR1125 SEC-SWI-PKGVER\"}, (0xEA001000), 1, 0, 2, TYPE=SA
-%{\"Symbian Software Ltd.\"}
-: \"Symbian Software Ltd.\"
-;
-; Version Conditional Block
-IF %s
- {
- \"TEST.txt\"
- }-\"C:\\tswi\\tpkgver\\test_result_etrue.txt\"
-ENDIF
-;
-";
-
-#
-# Package template string to generate a PKG with features not installable by InterpretSIS
-#
-$PkgFileInterpretsisVersionTemplate = "
-;
-; Autogenerated test install file
-;
-&EN
-;
-#{\"Test Makesis -c\"}, (0x01011243), 1, 0, 1, TYPE=PP
-;
-%{\"Symbian Software Ltd\"}
-:\"Symbian Software Ltd\"
-;
-!({\"Add-on 1 (20KB)\"},{\"Add-on 2 (75KB)\"},{\"Add-on 3 (80KB)\"})
-;
-\@\"Embedded.sis\" , (0x101f74aa)
-;
-";
-
-#
-# Template string to generate Expected output file for DEF113349.
-#
-$DEF113349ExpectedOutput= "embeddedPA.sis is a stub.
-WARNING : Embedded Preinstalled Stub (PA/PP type) SIS file is not supported.
-(16) : error: SISfile error, Stub File
-";
-
-#
-#
-#
-$InterpretsisExpectedOutput= "*** SIS installation file INVALID for InterpretSis ***
-(8) : Invalid Application Type. Package type PP not supported
-(12) : User options are not supported
-(14) : Embedded SIS file will not be installed by InterpretSis
-";
-
-#
-# Do test for each elements of TestItems array
-#
-for my $Test ( @TestItems ) {
-
- # Generating PKG file contents
- if( $Test->[0] eq "test16.pkg" )
- {
- $PkgFile = sprintf( $AnotherPkgFileTempl, $Test->[1]);
- }
- elsif ( $Test->[0] eq "test17.pkg" )
- {
- $PkgFile = $unsupportedEncContent;
- }
- elsif ( $Test->[0] eq "testForward.pkg" )
- {
- $PkgFile = $ForwardSlash;
- }
- elsif ( $Test->[0] eq "testFN_RI.pkg" )
- {
- $PkgFile = $FN_RI;
- }
- else
- {
- $PkgFile = sprintf( $PkgFileTempl, $Test->[1]);
- }
-
- # Create PKG file
- CreateFile($Test->[0], $PkgFile);
-
- # Do MAKESIS test
-
- $logMsg = sprintf "%s\n (symbol:%s)\n", $Test->[4], $Test->[1];
- WriteLog($logMsg);
-
- MakeSISFile($Test->[0], $Test->[2], $Test->[3]);
-
-}
-
-#
-# Do test for each elements of TestItems1 array
-#
- $Count = 1;
-for my $Test1 ( @TestItems1 ) {
-
- # Generating PKG file contents
- if( $Count >= 19 )
- {
- $PkgFile = sprintf( $PkgFileWithSymbol1 , $Test1->[1]);
- $Count ++ ;
- }
- else
- {
- $PkgFile = sprintf( $PkgFileWithSymbol , $Test1->[1]);
- $Count++ ;
- }
-
- # Create PKG file
- CreateFile($Test1->[0], $PkgFile);
-
- # Do MAKESIS test
-
- $logMsg1 = sprintf "%s\n (Symbol:%s)\n", $Test1->[4], $Test1->[1];
- WriteLog($logMsg1);
-
- MakeSISFile($Test1->[0], $Test1->[2], $Test1->[3]);
-
-}
-
-
-#
-# Run CR1125 MakeSIS Tests (TestItems2 array)
-#
-for my $Test2 ( @TestItems2 ) {
-
- # Generating PKG file contents
- $PkgFile = sprintf( $PkgFileCR1125VersionTemplate , $Test2->[1]);
-
- # Create PKG file
- CreateFile($Test2->[0], $PkgFile);
-
- # Do MAKESIS test
- $logMsg1 = sprintf "%s\n (Condition: %s)\n", $Test2->[4], $Test2->[1];
- WriteLog($logMsg1);
-
- MakeSISFile($Test2->[0], $Test2->[2], $Test2->[3]);
-}
-
-
-#
-# Additional test to check that stub files don't change every time
-# they are built.
-#
-TestSISStubFile();
-
-#
-# Test for Test$parameter()
-#
-TestsysDriveparameter();
-
-# Call the tests for CR1027 - ROM Upgrade with SA SIS package.
-TestSisRUWithSA();
-TestSisRUWithNonSA();
-
-# Call the test for CR1122 - Wildcard support for ROM stub.
-TestSISWithWildCards();
-TestSISWithWildCardsPA();
-TestSISWithWildCardsPP();
-
-#
-# Test for DEF111264.Verifying that warnings are generated by Makesis
-# when wildcards are used in \sys\bin directory in ROM stubs.
-#
-
-TestDEF111264();
-
-#
-# Test for DEF113116.
-#
-TestDEF113116();
-
-#
-# Test for DEF083525
-#
-TestDEF083525();
-
-#
-# Test for PDEF081989.Testing the working of Makesis -d option .
-#
-
-TestPDEF081989();
-
-
-#
-# Test for DEF093400
-#
-TestDEF093400();
-
-#
-# Test for DEF090878
-#
-TestDEF090878();
-
-#
-# Test for DEF107033.Testing the working of Makesis -d option with language dependent files.
-#
-
-TestDEF107033();
-
-# Test for an output filename with a single char - DEF108728
-TestSingleCharFilename();
-
-# Test for DEF108815
-TestEndFileComma();
-
-
-# Test for DEF115795
-TestLongFolderName();
-
-# Test for DEF112718-1
-TestInvalidVersion1();
-
-# Test for DEF112718-2
-TestInvalidVersion2();
-
-# Test for DEF112831
-TestDEF112831();
-
-#
-# Test for DEF113349.
-#
-
-TestDEF113349();
-
-# Test for DEF113569
-TestPreInstalledWithoutSourceFiles();
-
-#
-# Test for Makesis -c option. Added as part of the fix for DEF126467.
-#
-TestInterpretsisReport();
-
-#
-# These tests are very specific to windows OS only
-#
-#
-
-if ($^O =~ /^MSWIN32$/i)
-{
-#
-# Test for DEF091860
-#
-TestDEF091860();
-
-#
-# Test for DEF091942.
-#
-TestDEF091942();
-
-#
-# Test for INC092755
-#
-TestINC092755();
-
-#
-# Test for DEF090912
-#
-TestDEF090912();
-
-#
-# Test for DEF093156
-#
-TestDEF093156();
-
-#
-# Test for TestDEF091780
-#
-TestDEF091780();
-
-#
-# Test for DEF104895.Testing the working of Makesis -d option with
-# embedding sis file in path containing backward slasesh.
-#
-
-TestDEF104895();
-}
-
-#
-# These tests are very specific to Linux OS only
-#
-#
-if ($^O =~ /^LINUX$/i)
-{
-
-#
-# Test for DEF091942.
-#
-TestLDEF091942();
-
-
-#
-# Test for DEF090912
-#
-TestLDEF090912();
-
-#
-# Test for DEF104895.Testing the working of Makesis -d option with
-# embedding sis file in path containing backward slasesh.
-#
-
-TestLDEF104895();
-
-}
-
-
-unlink("Test.txt");
-unlink("HelloApp.exe");
-unlink("test1.txt");
-unlink("test2.txt");
-
-#
-# Display the result
-#
-WriteLog("\n\nTests completed OK\n");
-WriteLog(sprintf "Run: %d\n", $NumberOfTests );
-WriteLog(sprintf "Passed: %d\n", $NumberOfPassed );
-WriteLog(sprintf "%d tests failed out of %d\n", $NumberOfFailed, $NumberOfTests );
-
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/test_spec.txt Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/test_spec.txt Mon May 03 14:11:52 2010 +0300
@@ -17,15 +17,15 @@
#
# WARNING - There must not be more than one test block for any of the components.
# E.g. SWI has one and only one [SWI] section in this file. Otherwise
-# \security\testframework\test\test_launcher.pl will be broken.
+# %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\test_launcher.pl will be broken.
###############################################################################
# COMPONENT ASSIGNMENT #
###############################################################################
-{9.5}=Init,Crypto,CryptoTokens,CAF2,Common,Certman,SWI,IntegrityServices,Asnpkcs,Filetokens,SisTools,SwiTools95Only,SwiTools,CryptoSpi,UPS,StreamingCAF,SecurityTools,Misc,ToolsLegacy,UptoMCL
-{9.6}=Init,Crypto,CryptoTokens,CAF2,CAF296,Common,Certman,SWI,Asnpkcs,Filetokens,FileTokens_UseAuth,SisTools,SwiTools,CryptoSpi,UPS,StreamingCAF,SecurityTools,USIF,Misc,ToolsNew,SwiDiran,AuthServer
-{future}=Init,Crypto,CryptoTokens,CAF2,CAF296,CAF2Future,Common,Certman,SWI,Asnpkcs,Filetokens,FileTokens_UseAuth,SisTools,SwiTools,CryptoSpi,UPS,AuthServer,StreamingCAF,SecurityTools,USIF,Misc,ToolsNew,SwiDiran
+{tb92SF}=Init,Crypto,CryptoTokens,CAF2,CAF296,Common,Certman,Asnpkcs,Filetokens,CryptoSpi,UPS,StreamingCAF,SecurityTools,Misc
+{tb101SF}=Init,Crypto,CryptoTokens,CAF2,CAF296,CAF2Future,Common,Certman,Asnpkcs,Filetokens,FileTokens_UseAuth,CryptoSpi,UPS,AuthServer,StreamingCAF,SecurityTools,Misc,FileTokens_HwImpl
+
###############################################################################
# TEST DEFINITION #
@@ -53,36 +53,6 @@
TESTEXECUTE, \logs\testexecute\tpaddingudeb.htm,, -Dtextshell -- \tpadding\tpaddingudeb.script, 300, UDEB,,
# CRYPTO
-tasymmetric, \tasymmetrictests.log,, -Dtextshell -- \tasymmetric\tasymmetrictests.txt \tasymmetrictests.log, 300, UDEB#UREL,,
-tsymmetric, \tsymmetrictests.log,, -Dtextshell -- \tsymmetric\tsymmetrictests.txt \tsymmetrictests.log, 300, UDEB#UREL,,
-tsymmetric, \AESECBVectorsScript.log,, -Dtextshell -- \tsymmetric\AESECBVectorsScript.txt \AESECBVectorsScript.log, 300, UDEB#UREL,,
-tsymmetric, \AESECB_KAT_VT.log,, -Dtextshell -- \tsymmetric\AESECB_KAT_VT.txt \AESECB_KAT_VT.log, 300, UDEB#UREL,,
-tsymmetric, \AESECB_KAT_VK.log,, -Dtextshell -- \tsymmetric\AESECB_KAT_VK.txt \AESECB_KAT_VK.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptECB128.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptECB128.txt \AESMonteCarloEncryptECB128.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptECB192.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptECB192.txt \AESMonteCarloEncryptECB192.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptECB256.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptECB256.txt \AESMonteCarloEncryptECB256.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptECB128.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptECB128.txt \AESMonteCarloDecryptECB128.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptECB192.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptECB192.txt \AESMonteCarloDecryptECB192.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptECB256.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptECB256.txt \AESMonteCarloDecryptECB256.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptCBC128.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptCBC128.txt \AESMonteCarloEncryptCBC128.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptCBC192.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptCBC192.txt \AESMonteCarloEncryptCBC192.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptCBC256.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptCBC256.txt \AESMonteCarloEncryptCBC256.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptCBC128.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptCBC128.txt \AESMonteCarloDecryptCBC128.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptCBC192.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptCBC192.txt \AESMonteCarloDecryptCBC192.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptCBC256.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptCBC256.txt \AESMonteCarloDecryptCBC256.log, 300, UDEB#UREL,,
-tsymmetric, \symmetricOOMtests.log,, -Dtextshell -- \tsymmetric\symmetricOOMtests.txt \symmetricOOMtests.log, 300, UDEB#UREL,,
-
-tbigint, \tconstruction.log,, -Dtextshell -- \tbigint\tconstructiontests.txt \tconstruction.log, 300, UDEB#UREL,,
-tbigint, \tbasicmaths.log,, -Dtextshell -- \tbigint\tbasicmathstests.txt \tbasicmaths.log, 1500, UDEB#UREL,,
-tbigint, \tmontgomery.log,, -Dtextshell -- \tbigint\tmontgomerytests.txt \tmontgomery.log, 300, UDEB#UREL,,
-tbigint, \tprime.log,, -Dtextshell -- \tbigint\tprimetests.txt \tprime.log, 300, UDEB#UREL,,
-tbigint, \tprime2.log,, -Dtextshell -- \tbigint\tprimetests2.txt \tprime2.log, 600, UDEB#UREL,,
-tbigint, \tprimegen.log,, -Dtextshell -- \tbigint\tprimegen.txt \tprimegen.log, 300, UDEB#UREL,,
-tbigint, \tprimefailure.log,, -Dtextshell -- \tbigint\tprimefailuretests.txt \tprimefailure.log, 300, UDEB#UREL,,
-
-tpkcs5kdf, \tpkcs12kdftests.log,, -Dtextshell -- \tpkcs5kdf\tpkcs12kdftests.txt \tpkcs12kdftests.log, 600, UDEB#UREL,,
-TPBE, \tpbetestsv2.log,, -Dtextshell -- \tpbe\tpbetests_v2.txt \tpbetestsv2.log, 3000, UDEB#UREL,,
-
# CRYPTO TMS SUPPORT
tasymmetric, \logs\testexecute\tasymmetrictests.htm,, -Dtextshell -- \tasymmetric\tasymmetrictests.script \logs\testexecute\tasymmetrictests.htm, 300, UDEB#UREL,,
tsymmetric, \logs\testexecute\tsymmetrictests.htm,, -Dtextshell -- \tsymmetric\tsymmetrictests.script \logs\testexecute\tsymmetrictests.htm, 300, UDEB#UREL,,
@@ -104,15 +74,15 @@
tsymmetric, \logs\testexecute\AESMonteCarloDecryptCBC256.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptCBC256.script \logs\testexecute\AESMonteCarloDecryptCBC256.htm, 300, UDEB#UREL,,
tsymmetric, \logs\testexecute\symmetricOOMtests.htm,, -Dtextshell -- \tsymmetric\symmetricOOMtests.script \logs\testexecute\symmetricOOMtests.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tconstruction.htm,, -Dtextshell -- \tbigint\tconstructiontests.script \logs\testexecute\tconstruction.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tbasicmaths.htm,, -Dtextshell -- \tbigint\tbasicmathstests.script \logs\testexecute\tbasicmaths.htm, 1500, UDEB#UREL,,
-tbigint, \logs\testexecute\tmontgomery.htm,, -Dtextshell -- \tbigint\tmontgomerytests.script \logs\testexecute\tmontgomery.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tprime.htm,, -Dtextshell -- \tbigint\tprimetests.script \logs\testexecute\tprime.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tprime2.htm,, -Dtextshell -- \tbigint\tprimetests2.script \logs\testexecute\tprime2.htm, 600, UDEB#UREL,,
-tbigint, \logs\testexecute\tprimegen.htm,, -Dtextshell -- \tbigint\tprimegen.script \logs\testexecute\tprimegen.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tprimefailure.htm,, -Dtextshell -- \tbigint\tprimefailuretests.script \logs\testexecute\tprimefailure.htm, 300, UDEB#UREL,,
+tbigint, \logs\testexecute\tconstruction.htm,, -Dtextshell -- \tbigint\tconstructiontests.script \logs\testexecute\tconstruction.htm, 300, UDEB#UREL,,
+tbigint, \logs\testexecute\tbasicmaths.htm,, -Dtextshell -- \tbigint\tbasicmathstests.script \logs\testexecute\tbasicmaths.htm, 1500, UDEB#UREL,,
+tbigint, \logs\testexecute\tmontgomery.htm,, -Dtextshell -- \tbigint\tmontgomerytests.script \logs\testexecute\tmontgomery.htm, 300, UDEB#UREL,,
+tbigint, \logs\testexecute\tprime.htm,, -Dtextshell -- \tbigint\tprimetests.script \logs\testexecute\tprime.htm, 300, UDEB#UREL,,
+tbigint, \logs\testexecute\tprime2.htm,, -Dtextshell -- \tbigint\tprimetests2.script \logs\testexecute\tprime2.htm, 600, UDEB#UREL,,
+tbigint, \logs\testexecute\tprimegen.htm,, -Dtextshell -- \tbigint\tprimegen.script \logs\testexecute\tprimegen.htm, 300, UDEB#UREL,,
+tbigint, \logs\testexecute\tprimefailure.htm,, -Dtextshell -- \tbigint\tprimefailuretests.script \logs\testexecute\tprimefailure.htm, 300, UDEB#UREL,,
-tpkcs5kdf, \logs\testexecute\tpkcs12kdftests.htm,, -Dtextshell -- \tpkcs5kdf\tpkcs12kdftests.script \logs\testexecute\tpkcs12kdftests.htm, 600, UDEB#UREL,,
+tpkcs5kdf, \logs\testexecute\tpkcs12kdftests.htm,, -Dtextshell -- \tpkcs5kdf\tpkcs12kdftests.script \logs\testexecute\tpkcs12kdftests.htm, 600, UDEB#UREL,,
TPBE, \logs\testexecute\tpbetestsv2.htm,, -Dtextshell -- \tpbe\tpbetests_v2.script \logs\testexecute\tpbetestsv2.htm, 3000, UDEB#UREL,,
@@ -128,7 +98,6 @@
TESTEXECUTE, \logs\testexecute\RTA.htm,, z:\RTA\RTA.script,1800, UDEB#UREL,\techview.bat,
TESTEXECUTE, \logs\testexecute\tcafnodrmcap.htm,, z:\tcaf\tcafnodrmcap.script,300, UDEB#UREL,\techview.bat,
-
[CAF296]
# Should be run v9.6 onwards
TESTEXECUTE, \logs\testexecute\RTA_64bit.htm,, z:\RTA\rta_64bit.script,1800, UDEB#UREL,\techview.bat,
@@ -140,6 +109,12 @@
TESTEXECUTE, \logs\testexecute\tmtputils.htm,, z:\tcaf\tmtputils\tmtputils.script,1800, UDEB#UREL,\techview.bat,
TESTEXECUTE, \logs\testexecute\tcafhelper.htm,, z:\tcaf\tcafhelper.script,1800, UDEB#UREL,\techview.bat,
+[StreamingCAF]
+#Streaming CAF Tests
+TESTEXECUTE, \logs\testexecute\tscaf.htm,,-Dtextshell -- z:\tcaf\tscaf\tscaf.script, 300, UDEB#UREL, ,
+TESTEXECUTE, \logs\testexecute\tscaf_oom.htm,,-Dtextshell -- z:\tcaf\tscaf\tscaf_oom.script, 300, UDEB, ,
+
+
[Common]
TESTEXECUTE, \logs\testexecute\trecogcert.htm,, \trecog\trecogcert.script, 300, UDEB#UREL,,
@@ -182,14 +157,14 @@
tJarDownloader, \tJarDownloader.log,, -Dstartupmode=1 \tJarDownloader\scripts\script1.txt \tJarDownloader.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-TESTEXECUTE, \logs\testexecute\tmidletuaheaderfilter.htm,, -Dtextshell -- \tmidletuaheaderfilter\tmidletuaheaderfilter.script, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmi.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\preparetjardownloader.bat
+TESTEXECUTE, \logs\testexecute\tmidletuaheaderfilter.htm,, -Dtextshell -- \tmidletuaheaderfilter\tmidletuaheaderfilter.script, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmi.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\preparetjardownloader.bat
ITHARNESSMIDP, \itharnessmidp-conf1.log,, \JAVATEST.TXT \itharnessmidp-conf1.log, 1600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat,
ITHARNESSMIDP, \itharnessmidp-conf2.log,, \JAVATEST2.TXT \itharnessmidp-conf2.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\backup_jmi_autodeletefiles.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\replace_jmi_autodeletefiles.bat
ITHARNESSMIDP, \itharnessmidp-conf3.log,, \JAVATEST3.TXT \itharnessmidp-conf3.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat,
ITHARNESSMIDP, \itharnessmidp-conf4.log,, \OTATests.txt \itharnessmidp-conf4.log, 1200, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_otasetup.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat revertotasetup
ITHARNESSMIDP, \leavetest.log,, \leavetest.txt \leavetest.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat auto.cfg,
-ITHARNESSMIDP, \itharnessmidp-conf5.log,, \javaiaptest.txt \itharnessmidp-conf5.log, 1200, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat prompt.cfg, %SECURITYSOURCEDIR%\testframework\test\autotesting\runced c:\auto.cfg
+ITHARNESSMIDP, \itharnessmidp-conf5.log,, \javaiaptest.txt \itharnessmidp-conf5.log, 1200, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat prompt.cfg, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\runced c:\auto.cfg
ITHARNESSMIDP, \itharnessmidp-ocsp-default.log,, \itharnessmidp\scripts\ocsp-Default.txt \itharnessmidp-ocsp-default.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat ocsp-default,
ITHARNESSMIDP, \itharnessmidp-ocsp-allWarnings.log,, \itharnessmidp\scripts\ocsp-allWarnings.txt \itharnessmidp-ocsp-allWarnings.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat ocsp-allWarnings,
@@ -215,14 +190,6 @@
#New tpkixcert tests using TEF framework
TESTEXECUTE, \logs\testexecute\tpkixcert_tef.htm,, -Dtextshell -- \tpkixcert_tef\scripts\tpkixcert_tef.script, 900, UDEB#UREL,,
-TASN1, \TASN1.log,, -Dtextshell -- \tasn1\scripts\tasn1.txt \tasn1.log, 300, UDEB#UREL,, \epoc32\winscw\c\tasn1\scripts\batchfiles\tasn1_cleanup.bat
-Tx509, \tx509.log,, -Dtextshell -- \tx509\scripts\tx509.txt \tx509.log, 300, UDEB#UREL,, \epoc32\winscw\c\tx509\scripts\batchfiles\tx509_cleanup.bat
-Tx509, \tx509_dev_certs.log,, -Dtextshell -- \tx509\scripts\tx509_dev_certs.txt \tx509_dev_certs.log, 300, UDEB#UREL,,
-Tx509, \outFileOOM1.log,, -Dtextshell -- \TX509\SCRIPTS\TX509-OOM1.TXT \outFileOOM1.log, 300, UDEB#UREL,, \epoc32\winscw\c\tx509\scripts\batchfiles\tx509_cleanup.bat
-Tx509, \outFileOOM2.log,, -Dtextshell -- \TX509\SCRIPTS\TX509-OOM2.TXT \outFileOOM2.log, 300, UDEB#UREL,,
-Tx509, \tx509_dev_certs_oom.log,, -Dtextshell -- \tx509\scripts\tx509_dev_certs_oom.txt \tx509_dev_certs_oom.log, 300, UDEB#UREL,,
-tx509, \tx509_dnames.log,, -Dtextshell -- \tx509\scripts\tx509-dnames.txt \tx509_dnames.log, 300, UDEB#UREL,,
-
# TMS SUPPORT
TASN1, \logs\testexecute\TASN1.htm,, -Dtextshell -- \tasn1\scripts\tasn1.script \logs\testexecute\tasn1.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tasn1\scripts\batchfiles\tasn1_cleanup.bat
Tx509, \logs\testexecute\tx509.htm,, -Dtextshell -- \tx509\scripts\tx509.script \logs\testexecute\tx509.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tx509\scripts\batchfiles\tx509_cleanup.bat
@@ -232,25 +199,12 @@
Tx509, \logs\testexecute\tx509_dev_certs_oom.htm,, -Dtextshell -- \tx509\scripts\tx509_dev_certs_oom.script \logs\testexecute\tx509_dev_certs_oom.htm, 300, UDEB#UREL,,
tx509, \logs\testexecute\tx509_dnames.htm,, -Dtextshell -- \tx509\scripts\tx509-dnames.script \logs\testexecute\tx509_dnames.htm, 300, UDEB#UREL,,
-TWTLSCERT, \twtlscert.log,, -Dtextshell -- \twtlscert\scripts\twtlscert.txt \twtlscert.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TWTLSCERT, \wtlstests1.log,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT1.TXT \wtlstests1.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TWTLSCERT, \wtlstests2.log,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT2.TXT \wtlstests2.log, 300, UDEB#UREL,, \epoc32\winscw\c\twtlscert\scripts\batchfiles\twtlscert_cleanup.bat
-TWTLSCERT, \wtlstests3.log,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT3.TXT \wtlstests3.log, 900, UDEB#UREL,, \epoc32\winscw\c\twtlscert\scripts\batchfiles\twtlscert_cleanup.bat
-
# TMS SUPPORT
TWTLSCERT, \logs\testexecute\twtlscert.htm,, -Dtextshell -- \twtlscert\scripts\twtlscert.script \logs\testexecute\twtlscert.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
TWTLSCERT, \logs\testexecute\wtlstests1.htm,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT1.script \logs\testexecute\wtlstests1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
TWTLSCERT, \logs\testexecute\wtlstests2.htm,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT2.script \logs\testexecute\wtlstests2.htm, 300, UDEB#UREL,, \epoc32\winscw\c\twtlscert\scripts\batchfiles\twtlscert_cleanup.bat
TWTLSCERT, \logs\testexecute\wtlstests3.htm,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT3.script \logs\testexecute\wtlstests3.htm, 900, UDEB#UREL,, \epoc32\winscw\c\twtlscert\scripts\batchfiles\twtlscert_cleanup.bat
-TPKIXCERT, \TPKIXCERT_log1.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\TPKIXTEST_part1.TXT \TPKIXCERT_log1.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_log2.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\TPKIXTEST_part2.TXT \TPKIXCERT_log2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_logcancel.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\CANCEL1.TXT \TPKIXCERT_logcancel.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_logoom1.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM1.TXT \TPKIXCERT_logoom1.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_logoom2.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM2.TXT \TPKIXCERT_logoom2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_logoom3.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM3.TXT \TPKIXCERT_logoom3.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_logoom4.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM4.TXT \TPKIXCERT_logoom4.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
# TMS SUPPORT
TPKIXCERT, \logs\testexecute\TPKIXCERT_log1.htm,, -Dtextshell -- \TPKIXCERT\SCRIPTS\TPKIXTEST_part1.script \logs\testexecute\TPKIXCERT_log1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
TPKIXCERT, \logs\testexecute\TPKIXCERT_log2.htm,, -Dtextshell -- \TPKIXCERT\SCRIPTS\TPKIXTEST_part2.script \logs\testexecute\TPKIXCERT_log2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
@@ -261,62 +215,33 @@
TPKIXCERT, \logs\testexecute\TPKIXCERT_logoom4.htm,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM4.script \logs\testexecute\TPKIXCERT_logoom4.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-tocsp, \tocsp_openssl.log,, \system\tocsp\scripts\openssl.txt \tocsp_openssl.log, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logxcert_local.log,, \system\tocsp\scripts\xcert-local.txt \tocsp_logxcert_local.log, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logopenssl_local.log,,\system\tocsp\scripts\openssl-local.txt \tocsp_logopenssl_local.log, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logerror.log,, \system\tocsp\scripts\error.txt \tocsp_logerror.log, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_defaultpolicy.log,, \system\tocsp\scripts\defaultpolicy.txt \tocsp_defaultpolicy.log, 300, UDEB, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat ocsppolicy.ini,
-tocsp, \tocsp_newpolicy.log,, \system\tocsp\scripts\newpolicy.txt \tocsp_newpolicy.log, 300, UDEB, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat newpolicy.ini, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat ocsppolicy.ini
-tocsp, \tocsp_httpinterface.log,, \system\tocsp\scripts\httpinterface.txt \tocsp_httpinterface.log, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
-
-tocsp, \tocsp_openssl.log,, -Dtextshell -- \system\tocsp\scripts\openssl.txt \tocsp_openssl.log, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logxcert_local.log,, -Dtextshell -- \system\tocsp\scripts\xcert-local.txt \tocsp_logxcert_local.log, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logopenssl_local.log,, -Dtextshell -- \system\tocsp\scripts\openssl-local.txt \tocsp_logopenssl_local.log, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logerror.log,, -Dtextshell -- \system\tocsp\scripts\error.txt \tocsp_logerror.log, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_defaultpolicy.log,, -Dtextshell -- \system\tocsp\scripts\defaultpolicy.txt \tocsp_defaultpolicy.log, 300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat ocsppolicy.ini,
-tocsp, \tocsp_newpolicy.log,, -Dtextshell -- \system\tocsp\scripts\newpolicy.txt \tocsp_newpolicy.log, 300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat newpolicy.ini, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat ocsppolicy.ini
-tocsp, \tocsp_httpinterface.log,, -Dtextshell -- \system\tocsp\scripts\httpinterface.txt \tocsp_httpinterface.log, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
-tocsp, \tocsp_logoom.log,, -Dtextshell -- \system\tocsp\scripts\xcert-oom.txt \tocsp_logoom.log, 900, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-
# TMS SUPPORT
-tocsp, \logs\testexecute\tocsp_openssl.htm,, \system\tocsp\scripts\openssl.script \logs\testexecute\tocsp_openssl.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logxcert_local.htm,, \system\tocsp\scripts\xcert-local.script \logs\testexecute\tocsp_logxcert_local.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logopenssl_local.htm,,\system\tocsp\scripts\openssl-local.script \logs\testexecute\tocsp_logopenssl_local.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logerror.htm,, \system\tocsp\scripts\error.script \logs\testexecute\tocsp_logerror.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_defaultpolicy.htm,, \system\tocsp\scripts\defaultpolicy.script \logs\testexecute\tocsp_defaultpolicy.htm, 300, UDEB, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat ocsppolicy.ini,
-tocsp, \logs\testexecute\tocsp_newpolicy.htm,, \system\tocsp\scripts\newpolicy.script \logs\testexecute\tocsp_newpolicy.htm, 300, UDEB, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat newpolicy.ini, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat ocsppolicy.ini
+tocsp, \logs\testexecute\tocsp_openssl.htm,, \system\tocsp\scripts\openssl.script \logs\testexecute\tocsp_openssl.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logxcert_local.htm,, \system\tocsp\scripts\xcert-local.script \logs\testexecute\tocsp_logxcert_local.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logopenssl_local.htm,, \system\tocsp\scripts\openssl-local.script \logs\testexecute\tocsp_logopenssl_local.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logerror.htm,, \system\tocsp\scripts\error.script \logs\testexecute\tocsp_logerror.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_defaultpolicy.htm,, \system\tocsp\scripts\defaultpolicy.script \logs\testexecute\tocsp_defaultpolicy.htm, 300, UDEB,,
+tocsp, \logs\testexecute\tocsp_newpolicy.htm,, \system\tocsp\scripts\newpolicy.script \logs\testexecute\tocsp_newpolicy.htm, 300, UDEB, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat 2002b28b-new.txt, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat 2002b28b.txt
tocsp, \logs\testexecute\tocsp_httpinterface.htm,, \system\tocsp\scripts\httpinterface.script \logs\testexecute\tocsp_httpinterface.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
-tocsp, \tocsp_openssl.htm,, -Dtextshell -- \system\tocsp\scripts\openssl.script \tocsp_openssl.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logxcert_local.htm,, -Dtextshell -- \system\tocsp\scripts\xcert-local.script \tocsp_logxcert_local.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logopenssl_local.htm,, -Dtextshell -- \system\tocsp\scripts\openssl-local.script \tocsp_logopenssl_local.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logerror.htm,, -Dtextshell -- \system\tocsp\scripts\error.script \tocsp_logerror.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_defaultpolicy.htm,, -Dtextshell -- \system\tocsp\scripts\defaultpolicy.script \tocsp_defaultpolicy.htm, 300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat ocsppolicy.ini,
-tocsp, \tocsp_newpolicy.htm,, -Dtextshell -- \system\tocsp\scripts\newpolicy.script \tocsp_newpolicy.htm, 300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat newpolicy.ini, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat ocsppolicy.ini
-tocsp, \tocsp_httpinterface.htm,, -Dtextshell -- \system\tocsp\scripts\httpinterface.script \tocsp_httpinterface.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
-tocsp, \tocsp_logoom.htm,, -Dtextshell -- \system\tocsp\scripts\xcert-oom.script \tocsp_logoom.htm, 900, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_openssl.htm,, -Dtextshell -- \system\tocsp\scripts\openssl.script \logs\testexecute\tocsp_openssl.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logxcert_local.htm,, -Dtextshell -- \system\tocsp\scripts\xcert-local.script \logs\testexecute\tocsp_logxcert_local.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logopenssl_local.htm,, -Dtextshell -- \system\tocsp\scripts\openssl-local.script \logs\testexecute\tocsp_logopenssl_local.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logerror.htm,, -Dtextshell -- \system\tocsp\scripts\error.script \logs\testexecute\tocsp_logerror.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_defaultpolicy.htm,, -Dtextshell -- \system\tocsp\scripts\defaultpolicy.script \logs\testexecute\tocsp_defaultpolicy.htm, 300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat donothing,
+tocsp, \logs\testexecute\tocsp_newpolicy.htm,, -Dtextshell -- \system\tocsp\scripts\newpolicy.script \logs\testexecute\tocsp_newpolicy.htm, 300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat 2002b28b-new.txt, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat 2002b28b.txt
+tocsp, \logs\testexecute\tocsp_httpinterface.htm,, -Dtextshell -- \system\tocsp\scripts\httpinterface.script \logs\testexecute\tocsp_httpinterface.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
+tocsp, \logs\testexecute\tocsp_logoom.htm,, -Dtextshell -- \system\tocsp\scripts\xcert-oom.script \logs\testexecute\tocsp_logoom.htm, 900, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-t_certstore, \tcertstore_conf1.1.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf1.txt \tcertstore_conf1.1.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_conf1.2.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf1.txt \tcertstore_conf1.2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_conf1.3.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf1.txt \tcertstore_conf1.3.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \t_handle_1.txt,, -Dtextshell -- \tcertstore\scripts\t_handle_1.txt \t_handle_1.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
# TMS SUPPORT
t_certstore, \logs\testexecute\tcertstore_conf1.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf1.script \logs\testexecute\tcertstore_conf1.1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
t_certstore, \logs\testexecute\tcertstore_conf1.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf1.script \logs\testexecute\tcertstore_conf1.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
t_certstore, \logs\testexecute\tcertstore_conf1.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf1.script \logs\testexecute\tcertstore_conf1.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
t_certstore, \logs\testexecute\t_handle_1.htm,, -Dtextshell -- \tcertstore\scripts\t_handle_1.script \logs\testexecute\t_handle_1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
-t_certstore, \tcertstore_oom.conf1.1.log,, -Dtextshell -- \tcertstore\scripts\oom1.txt \tcertstore_oom.conf1.1.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_oom.conf1.2.log,, -Dtextshell -- \tcertstore\scripts\oom2.txt \tcertstore_oom.conf1.2.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_oom.conf1.3.log,, -Dtextshell -- \tcertstore\scripts\oom3.txt \tcertstore_oom.conf1.3.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_cancel.conf1.1.log,, -Dtextshell -- \tcertstore\scripts\cancel1.txt \tcertstore_cancel.conf1.1.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_dsa.conf1.log,, -Dtextshell -- \tcertstore\scripts\dsa.txt \tcertstore_dsa.conf1.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_reload.log,, -Dtextshell -- \tcertstore\scripts\reload.txt \tcertstore_reload.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_apipolicing.log,, -Dtextshell -- \tcertstore\scripts\apipolicing.txt \tcertstore_apipolicing.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_errors.log,, -Dtextshell -- \tcertstore\scripts\filecertstore_errors.txt \tcertstore_errors.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
+//TEF Format
+t_certstore, \logs\testexecute\t_certstore_sha2.htm,, -Dtextshell -- \tcertstore\scripts\t_certstore_sha2.script \logs\testexecute\t_certstore_sha2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
# TMS SUPPORT
t_certstore, \logs\testexecute\tcertstore_oom.conf1.1.htm,, -Dtextshell -- \tcertstore\scripts\oom1.script \logs\testexecute\tcertstore_oom.conf1.1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
@@ -331,63 +256,39 @@
# Configuration 2
-
-t_certstore, \tcertstore_conf2.1.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.txt \tcertstore_conf2.1.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
-t_certstore, \tcertstore_conf2.2.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf2.txt \tcertstore_conf2.2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_conf2.3.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf2.txt \tcertstore_conf2.3.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
# Configuration 2 - TMS SUPPORT
-t_certstore, \logs\testexecute\tcertstore_conf2.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.script \logs\testexecute\tcertstore_conf2.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
+t_certstore, \logs\testexecute\tcertstore_conf2.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.script \logs\testexecute\tcertstore_conf2.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configuration2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
t_certstore, \logs\testexecute\tcertstore_conf2.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf2.script \logs\testexecute\tcertstore_conf2.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
t_certstore, \logs\testexecute\tcertstore_conf2.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf2.script \logs\testexecute\tcertstore_conf2.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
# Configuration 2a (asynch store)
-
-t_certstore, \tcertstore_conf2a.1.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.txt \tcertstore_conf2a.1.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration2a.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
-t_certstore, \tcertstore_conf2a.2.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf2a.txt \tcertstore_conf2a.2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_conf2a.3.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf2.txt \tcertstore_conf2a.3.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
# Configuration 2a TMS SUPPORT
-t_certstore, \logs\testexecute\tcertstore_conf2a.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.script \logs\testexecute\tcertstore_conf2a.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration2a.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
+t_certstore, \logs\testexecute\tcertstore_conf2a.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.script \logs\testexecute\tcertstore_conf2a.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configuration2a.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
t_certstore, \logs\testexecute\tcertstore_conf2a.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf2a.script \logs\testexecute\tcertstore_conf2a.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
t_certstore, \logs\testexecute\tcertstore_conf2a.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf2.script \logs\testexecute\tcertstore_conf2a.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
# Configuration 3
-
-t_certstore, \tcertstore_conf3.1.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf3.txt \tcertstore_conf3.1.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration3.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
-t_certstore, \tcertstore_conf3.2.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf3.txt \tcertstore_conf3.2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_conf3.3.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf3.txt \tcertstore_conf3.3.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
# Configuration 3 TMS SUPPORT
-t_certstore, \logs\testexecute\tcertstore_conf3.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf3.script \logs\testexecute\tcertstore_conf3.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration3.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
+t_certstore, \logs\testexecute\tcertstore_conf3.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf3.script \logs\testexecute\tcertstore_conf3.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configuration3.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
t_certstore, \logs\testexecute\tcertstore_conf3.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf3.script \logs\testexecute\tcertstore_conf3.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
t_certstore, \logs\testexecute\tcertstore_conf3.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf3.script \logs\testexecute\tcertstore_conf3.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
# Configuration multicertstore
-t_certstore, \tcertstore_multi.txt,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter.txt \tcertstore_multi.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configurationmulti.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
+t_certstore, \logs\testexecute\tcertstore_multi.htm,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter.script \logs\testexecute\tcertstore_multi.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configurationmulti.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
# Configuration multicertstore 1
-t_certstore, \tcertstore_multi.1.txt,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter1.txt \tcertstore_multi.1.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configurationmulti1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
+t_certstore, \logs\testexecute\tcertstore_multi.1.htm,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter1.script \logs\testexecute\tcertstore_multi.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configurationmulti1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
# Configuration multicertstore 2
-t_certstore, \tcertstore_multi.2.txt,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter2.txt \tcertstore_multi.2.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configurationmulti2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
+t_certstore, \logs\testexecute\tcertstore_multi.2.htm,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter2.script \logs\testexecute\tcertstore_multi.2.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configurationmulti2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
# Configuration 4
-
-t_certstore, \swicertstore1.txt,, -Dtextshell -- \tcertstore\scripts\swicertstore1.txt \swicertstore1.txt, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \swicertstore2.txt,, -Dtextshell -- \tcertstore\scripts\swicertstore2.txt \swicertstore2.txt, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \swicertstore4.txt,, -Dtextshell -- \tcertstore\scripts\swicertstore4.txt \swicertstore4.txt, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \swicertstore_oom.txt,, -Dtextshell -- -o \tcertstore\scripts\swicertstore1.txt \swicertstore_oom.txt, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \swicertstore_cancel.txt,, -Dtextshell -- -c \tcertstore\scripts\swicertstore1.txt \swicertstore_cancel.txt, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \wri-swicertstore1.txt,, -Dtextshell -- \tcertstore\scripts\wri-swicertstore1.txt \wri-swicertstore1.txt,300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \wri-swicertstore2.txt,, -Dtextshell -- \tcertstore\scripts\wri-swicertstore2.txt \wri-swicertstore2.txt,300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-
# Configuration 4 TMS SUPPORT
t_certstore, \logs\testexecute\swicertstore1.htm,, -Dtextshell -- \tcertstore\scripts\swicertstore1.script \logs\testexecute\swicertstore1.htm, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
t_certstore, \logs\testexecute\swicertstore2.htm,, -Dtextshell -- \tcertstore\scripts\swicertstore2.script \logs\testexecute\swicertstore2.htm, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
@@ -399,52 +300,11 @@
# Configuration 5
-t_certstore, \wri-swicertstore3.txt,, -Dtextshell -- \tcertstore\scripts\wri-swicertstore3.txt \wri-swicertstore3.txt,300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup1.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-
# Configuration 5 TMS SUPPORT
t_certstore, \logs\testexecute\wri-swicertstore3.htm,, -Dtextshell -- \tcertstore\scripts\wri-swicertstore3.script \logs\testexecute\wri-swicertstore3.htm,300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup1.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
######### Composite Certstore Testing###################################################################################
-t_certstore, \tfilecertstore01.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore01.txt \tfilecertstore01.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 5 void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore02.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore02.txt \tfilecertstore02.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 6 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore03.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore03.txt \tfilecertstore03.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 4 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore04.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore04.txt \tfilecertstore04.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 6 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore05.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore05.txt \tfilecertstore05.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 4 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore06.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore06.txt \tfilecertstore06.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore07.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore07.txt \tfilecertstore07.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 4 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore08.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore08.txt \tfilecertstore08.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt middle 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore09.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore09.txt \tfilecertstore09.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore10.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore10.txt \tfilecertstore10.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 5 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore11.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore11.txt \tfilecertstore11.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore renamed 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore12.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore12.txt \tfilecertstore12.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore13.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore13.txt \tfilecertstore13.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 3 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore14.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore14.txt \tfilecertstore14.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt middle 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore15.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore15.txt \tfilecertstore15.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 0 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore16.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore16.txt \tfilecertstore16.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore17.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore17.txt \tfilecertstore17.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore18.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore18.txt \tfilecertstore18.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 5 3 2 1 0, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-
-t_certstore, \tswicertstore01.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore01.txt \tswicertstore01.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 5 void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore02.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore02.txt \tswicertstore02.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 6 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore03.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore03.txt \tswicertstore03.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 4 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore04.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore04.txt \tswicertstore04.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 6 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore05.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore05.txt \tswicertstore05.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 4 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore06.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore06.txt \tswicertstore06.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore07.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore07.txt \tswicertstore07.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 4 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore08.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore08.txt \tswicertstore08.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt middle 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore09.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore09.txt \tswicertstore09.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore10.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore10.txt \tswicertstore10.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 5 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore11.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore11.txt \tswicertstore11.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore renamed 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore12.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore12.txt \tswicertstore12.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore13.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore13.txt \tswicertstore13.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 3 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore14.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore14.txt \tswicertstore14.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt middle 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore15.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore15.txt \tswicertstore15.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 0 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore16.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore16.txt \tswicertstore16.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore17.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore17.txt \tswicertstore17.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore18.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore18.txt \tswicertstore18.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 5 3 2 1 0, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore19.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore19.txt \tswicertstore19.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore writable void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-
# Composite Certstore Testing - TMS SUPPORT
t_certstore, \logs\testexecute\tfilecertstore01.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore01.script \logs\testexecute\tfilecertstore01.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 5 void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
@@ -490,11 +350,10 @@
######### Composite Certstore Testing###################################################################################
-
[SWI]
# Requires the following additional components to be built: SisTools, Certman
-TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\copyswitestfiles.bat,
+TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\copyswitestfiles.bat,
#NQP Tests for DataProvider
TESTEXECUTE, \logs\testexecute\tdataprovider.htm,, -Dstartupmode=1 -- z:\tswi\tdataprovider\scripts\tdataprovider.script, 600, UDEB#UREL,,
@@ -524,60 +383,57 @@
TESTEXECUTE, \logs\testexecute\testaugmentations.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testaugmentations.script, 300, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\testpreinstalled.htm,, \tswi\tuiscriptadaptors\scripts\testpreinstalled.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testpreinstalled_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testpreinstalled_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testpreinstalled_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testpreinstalled_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
TESTEXECUTE, \logs\testexecute\testdependencies.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdependencies.script, 300, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\tuiscriptadaptors.htm,, \tswi\tuiscriptadaptors\scripts\tuiscriptadaptors.script, 10000, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuiscriptadaptors_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuiscriptadaptors_post.bat
TESTEXECUTE, \logs\testexecute\tuiscriptadaptors_winscw.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tuiscriptadaptors_winscw.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat,
TESTEXECUTE, \logs\testexecute\testvids.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testvids.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tuiscriptadaptorsFH.htm,, \tswi\tuiscriptadaptors\scripts\tuiscriptadaptorsFH.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat,
+TESTEXECUTE, \logs\testexecute\tuiscriptadaptorsFH.htm,, \tswi\tuiscriptadaptors\scripts\tuiscriptadaptorsFH.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat,
TESTEXECUTE, \logs\testexecute\testrucert.htm,, \tswi\tuiscriptadaptors\scripts\testrucert.script, 500, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\romupdate_withoutstubs_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\romupdate_withoutstubs_post.bat
-TESTEXECUTE, \logs\testexecute\testrun.htm,, \tswi\tuiscriptadaptors\scripts\testrun.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testrunft.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrunft.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini,
+TESTEXECUTE, \logs\testexecute\testrun.htm,, \tswi\tuiscriptadaptors\scripts\testrun.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testrunft.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrunft.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini,
-TESTEXECUTE, \logs\testexecute\testrun2.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrun2.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_notallowrun.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testrun2.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrun2.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_notallowrun.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
TESTEXECUTE, \logs\testexecute\testshutdown.htm,, \tswi\tuiscriptadaptors\scripts\testshutdown.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testasync.htm,, \tswi\tuiscriptadaptors\scripts\testasync.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat,
+TESTEXECUTE, \logs\testexecute\testasync.htm,, \tswi\tuiscriptadaptors\scripts\testasync.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat,
TESTEXECUTE, \logs\testexecute\testasynccancel.htm,, \tswi\tuiscriptadaptors\scripts\testasynccancel.script, 3000, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\tsisstub.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tsisstub.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsisstub_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tsisstub_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\tsisstub_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tsisstub_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
TESTEXECUTE, \logs\testexecute\testasynccaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testasynccaps.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\devcerts_match.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_match.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat
+TESTEXECUTE, \logs\testexecute\devcerts_match.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_match.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat
TESTEXECUTE, \logs\testexecute\devcerts_mismatch.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_mismatch.script, 300, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\devcerts_aggregate.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_aggregate.script, 300, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\devcerts_corrupt.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_corrupt.script, 300, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\devcerts_ocsp.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_ocsp.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\devcerts_backuprestore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backuprestore.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat
-TESTEXECUTE, \logs\testexecute\devcerts_backup.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backup.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat
-TESTEXECUTE, \logs\testexecute\devcerts_restore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_restore.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\changedevid.bat, \epoc32\winscw\c\tswi\tdevcerts\scripts\batchfiles\devcerts_restore_post.bat
+TESTEXECUTE, \logs\testexecute\devcerts_backuprestore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backuprestore.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat
+TESTEXECUTE, \logs\testexecute\devcerts_backup.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backup.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat
+TESTEXECUTE, \logs\testexecute\devcerts_restore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_restore.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\changedevid.bat, \epoc32\winscw\c\tswi\tdevcerts\scripts\batchfiles\devcerts_restore_post.bat
-TESTEXECUTE, \logs\testexecute\tsisregistrytest.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\tsisregistrytest.script, 1500, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat, \epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\tsisregistrytest_post.bat
+TESTEXECUTE, \logs\testexecute\tsisregistrytest.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\tsisregistrytest.script, 1500, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat, \epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\tsisregistrytest_post.bat
TESTEXECUTE, \logs\testexecute\testVFPOnEmulator.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testVFPOnEmulator.script, 300, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\tdaemon.htm,, -Dstartupmode=1 -- \tswi\tdaemon\scripts\tdaemon.script, 300, UDEB#UREL,,
# createandsignunicode.pl needs to be run as it builds some SIS files the following tests rely on, however it is a SisTools test so it is run through a batch file and the results not recorded here
-TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\callcreateandsignunicode.bat,
+TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\callcreateandsignunicode.bat,
TESTEXECUTE, \logs\testexecute\tbackuprestore.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore.script, 1500, UDEB#UREL,\epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_post.bat
-TESTEXECUTE, \logs\testexecute\tbackuprestore_second_part.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_second_part.script, 300, UDEB, \epoc32\winscw\c\tswi\tbackuprestore\scripts\tbackuprestore_second_part_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\tbackuprestore_second_part_post.bat
TESTEXECUTE, \logs\testexecute\tbackuprestoredrive_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestoredrive_emulator.script, 300, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\tbackuprestore_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_post.bat
TESTEXECUTE, \logs\testexecute\tbackuprestore_policy_prepost_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_policy_prepost_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_policy_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_policy_post.bat
TESTEXECUTE, \logs\testexecute\tbackuprestore_policylst_certfst_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_policylst_certfst_emulator.script, 300, UDEB#UREL, ,
TESTEXECUTE, \logs\testexecute\tbackuprestore_cert_prepost_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_cert_prepost_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_cert_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_cert_post.bat
TESTEXECUTE, \logs\testexecute\tbackuptrestore_exploratory.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuptrestore_exploratory.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tbackuprestore_no_overwrite.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_no_overwrite.script, 1500, UDEB#UREL,\epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_no_overwrite_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_no_overwrite_post.bat
-
TESTEXECUTE, \logs\testexecute\tgenbackupmeta_udeb.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_udeb.script, 300, UDEB,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\premeta.bat,
TESTEXECUTE, \logs\testexecute\tgenbackupmeta_urel.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_urel.script, 300, UREL,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\premeta.bat,
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_udeb.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_udeb.script, 300,UDEB,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_urel.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_urel.script, 300,UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
+TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_udeb.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_udeb.script, 300,UDEB,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
+TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_urel.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_urel.script, 300,UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
TESTEXECUTE, \logs\testexecute\trevocation.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\trevocation.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\trevocation_unsigned.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\trevocation_unsigned.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\trevocation_unsigned.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\trevocation_unsigned.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
TESTEXECUTE, \logs\testexecute\tautosigning.htm,, -Dstartupmode=1 -- \tswi\tautosigning\scripts\tautosigning.script, 300, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\testdrm.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrm.script, 300, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\testdrmasync.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrmasync.script, 300, UDEB#UREL,,
@@ -585,27 +441,27 @@
TESTEXECUTE, \logs\testexecute\testdiskfullemulator.htm,, \tswi\tuiscriptadaptors\scripts\testdiskfullemulator.script, 300, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\testcancel.htm,, \tswi\tuiscriptadaptors\scripts\testcancel.script, 1500, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testmandatory.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testmandatory.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore.dat
-TESTEXECUTE, \logs\testexecute\testnotargetdevices.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnotargetdevices.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_incompifnotargetdevices.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testsystemcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testsystemcaps.script, 300, UDEB, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore.dat,
+TESTEXECUTE, \logs\testexecute\testmandatory.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testmandatory.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore.dat
+TESTEXECUTE, \logs\testexecute\testnotargetdevices.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnotargetdevices.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_incompifnotargetdevices.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testsystemcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testsystemcaps.script, 300, UDEB, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore.dat,
TESTEXECUTE, \logs\testexecute\testsystemcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testsystemcaps.script, 300, UREL,,
-TESTEXECUTE, \logs\testexecute\testusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps.script, 300, UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
+TESTEXECUTE, \logs\testexecute\testusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps.script, 300, UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
TESTEXECUTE, \logs\testexecute\testusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps.script, 300, UDEB,,
-TESTEXECUTE, \logs\testexecute\testusercaps_nousergrantcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_nousergrantcaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_nousergrantcaps.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testusercaps_restrictedusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_restrictedusercaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_restrictedusercaps.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testnoorphanedoverwrite.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnoorphanedoverwrite.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_noorphanedoverwrite.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\overwriteprivate.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_noprotectedorphanoverwrite.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testusercaps_nousergrantcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_nousergrantcaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_nousergrantcaps.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testusercaps_restrictedusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_restrictedusercaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_restrictedusercaps.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testnoorphanedoverwrite.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnoorphanedoverwrite.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_noorphanedoverwrite.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\overwriteprivate.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_noprotectedorphanoverwrite.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
TESTEXECUTE, \logs\testexecute\overwriteprivate_positive.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script, 300, UDEB, \epoc32\release\winscw\UDEB\Z\tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\overwriteprivate_positive.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script, 300, UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testallowunsigned.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testallowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\tpathsubst.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubst.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_pathsubst.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\tpathsubstsysdrive.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubstsysdrive.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_verifysysdrive.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\overwriteprivate_positive.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script, 300, UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testallowunsigned.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testallowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\tpathsubst.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubst.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_pathsubst.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\tpathsubstsysdrive.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubstsysdrive.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_verifysysdrive.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
TESTEXECUTE, \logs\testexecute\tpropagation_winscw.htm,, -Dtextshell -- \tswi\tuiscriptadaptors\scripts\tpropagation_winscw.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testeclipseemulator.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testeclipseemulator.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\pre_testeclipseemulator.bat,%SECURITYSOURCEDIR%\testframework\test\autotesting\delstubtemp.bat
+TESTEXECUTE, \logs\testexecute\testeclipseemulator.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testeclipseemulator.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\pre_testeclipseemulator.bat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\delstubtemp.bat
TESTEXECUTE, \logs\testexecute\testeclipse.htm,, \tswi\tuiscriptadaptors\scripts\testeclipse.script, 500, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testeclipse_pre.bat,\epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testeclipse_post.bat
@@ -621,25 +477,25 @@
TESTEXECUTE, \logs\testexecute\cr956_test.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\cr956_test.script, 2000, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testuninstallation.htm,, \tswi\tuiscriptadaptors\scripts\testuninstallation.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testuninstallation_pre.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testuninstallation.htm,, \tswi\tuiscriptadaptors\scripts\testuninstallation.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testuninstallation_pre.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
TESTEXECUTE, \logs\testexecute\tuninstallpkgs.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tuninstallpkgs.script, 1000, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testlogging.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\testlogging.script, 100, UDEB#UREL,\epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.iniwinscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testlogging.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\testlogging.script, 100, UDEB#UREL,\epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.iniwinscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
TESTEXECUTE, \logs\testexecute\test_pa_sapropagated_notdelete.htm,, \tswi\tuiscriptadaptors\scripts\test_pa_sapropagated_notdelete.script, 100, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testpastub.htm,, \tswi\tuiscriptadaptors\scripts\testpastub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testsapropagatedstub.htm,, \tswi\tuiscriptadaptors\scripts\testsapropagatedstub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testpastub.htm,, \tswi\tuiscriptadaptors\scripts\testpastub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testsapropagatedstub.htm,, \tswi\tuiscriptadaptors\scripts\testsapropagatedstub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
# Extended Key Usage check while installation of signed sis files.
-TESTEXECUTE, \logs\testexecute\testextension.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
-TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning.ini,
-TESTEXECUTE, \logs\testexecute\testextension_alternatecodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_alternatecodesigningoid.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_altcodesigningoid.ini,
-TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning_altcodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning_altcodesigningoid.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning_altcodesigningoid.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testextension.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
+TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning.ini,
+TESTEXECUTE, \logs\testexecute\testextension_alternatecodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_alternatecodesigningoid.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_altcodesigningoid.ini,
+TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning_altcodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning_altcodesigningoid.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning_altcodesigningoid.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
# SwiConsole Tests
TESTEXECUTE, \logs\testexecute\tswiconsole.htm,, -Dstartupmode=1 -- \tswi\tswiconsole\scripts\tswiconsole.script, 300, UDEB#UREL,
-TESTEXECUTE, \logs\testexecute\tswiconsole_allowunsigned.htm,, -Dstartupmode=1 -- \tswi\tswiconsole\scripts\tswiconsole_allowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\tswiconsole_allowunsigned.htm,, -Dstartupmode=1 -- \tswi\tswiconsole\scripts\tswiconsole_allowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
TESTEXECUTE, \logs\testexecute\testmulti.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testmulti.script, 300, UDEB#UREL,
TESTEXECUTE, \logs\testexecute\generateregistrytestdata.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\generateregistrytestdata.script, 300, UDEB#UREL,,
@@ -647,7 +503,7 @@
TESTEXECUTE, \logs\testexecute\removeregistrytestdata.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\removeregistrytestdata.script, 300, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\truststatus.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\truststatus.script, 600, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\testtruststatus.htm,, \tswi\tuiscriptadaptors\scripts\testtruststatus.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tresetdevice.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tresetdevice.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\tresetdevice.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tresetdevice.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
# Test Non-Removable Flag
TESTEXECUTE, \logs\testexecute\testnonremovable.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnonremovable.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testnonremovable_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testnonremovable_post.bat
@@ -667,7 +523,7 @@
#CR0914 Tests
TESTEXECUTE, \logs\testexecute\integritychecktest.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest.script, 1000, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\integritychecktest5Install_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest5Install_winscw.script, 1000, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\integritychecktest5verify_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest5verify_winscw.script, 1000, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat some_swicertstore.dat,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore.dat
+TESTEXECUTE, \logs\testexecute\integritychecktest5verify_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest5verify_winscw.script, 1000, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat some_swicertstore.dat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore.dat
TESTEXECUTE, \logs\testexecute\testswiobserver.htm,, -Dstartupmode=1 -- z:\tswi\tswiobserver\scripts\testswiobserver.script, 300, UDEB#UREL,,
swiobservertest.exe, \swiobservertest.log,, , 800, UDEB#UREL,,
@@ -687,8 +543,6 @@
[Asnpkcs]
-TASNPKCS, \tasnpkcstests.log,, -Dtextshell -- \tasnpkcstests.txt \tasnpkcstests.log, 300, UDEB#UREL,,
-
# TMS SUPPORT
TASNPKCS, \logs\testexecute\tasnpkcstests.htm,, -Dtextshell -- \tasnpkcstests.script \logs\testexecute\tasnpkcstests.htm, 300, UDEB#UREL,,
@@ -696,27 +550,18 @@
[Filetokens]
TESTEXECUTE, \logs\testexecute\sec-filetokens-tools.htm,, -Dstartupmode=1 -- \ttesttools\scripts\sec-filetokens-tools.script, 600, UDEB#UREL, \epoc32\winscw\c\ttesttools\data\pretools.bat, \epoc32\winscw\c\ttesttools\data\posttools.bat
-T_KEYSTORE, \tkeystore.log,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore.txt \tkeystore.log, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\RemoveSecDlg.bat, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat
-T_KEYSTORE, \tkeystore_authobjects.log,, -Dstartupmode=1 -- \tkeystore\scripts\authobjects.txt \tkeystore_authobjects.log, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_export.log,, -Dstartupmode=1 -- \tkeystore\scripts\exportscript.txt \tkeystore_export.log, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_oom.log,, -Dstartupmode=1 -- \tkeystore\scripts\oom.txt \tkeystore_oom.log, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_cancel.log,, -Dstartupmode=1 -- \tkeystore\scripts\cancel.txt \tkeystore_cancel.log, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_servoom.log,, -Dstartupmode=1 -- \tkeystore\scripts\servoom.txt \tkeystore_servoom.log, 1800, UDEB,,
-T_KEYSTORE, \tkeystore_reload.log,, -Dstartupmode=1 -- \tkeystore\scripts\reload.txt \tkeystore_reload.log, 300, UDEB#UREL,,
+# TMS support
+T_KEYSTORE, \logs\testexecute\tkeystore.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore.script \logs\testexecute\tkeystore.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\RemoveSecDlg.bat, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat
-# TMS support
-T_KEYSTORE, \logs\testexecute\tkeystore.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore.script \logs\testexecute\tkeystore.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\RemoveSecDlg.bat, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat
+T_KEYSTORE, \logs\testexecute\tkeystore_authobjects.htm,, -Dstartupmode=1 -- \tkeystore\scripts\authobjects.script \logs\testexecute\tkeystore_authobjects.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_authobject_post.bat
+
T_KEYSTORE, \logs\testexecute\tkeystore_export.htm,, -Dstartupmode=1 -- \tkeystore\scripts\exportscript.script \logs\testexecute\tkeystore_export.htm, 300, UDEB#UREL,,
T_KEYSTORE, \logs\testexecute\tkeystore_oom.htm,, -Dstartupmode=1 -- \tkeystore\scripts\oom.script \logs\testexecute\tkeystore_oom.htm, 300, UDEB#UREL,,
T_KEYSTORE, \logs\testexecute\tkeystore_cancel.htm,, -Dstartupmode=1 -- \tkeystore\scripts\cancel.script \logs\testexecute\tkeystore_cancel.htm, 300, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_servoom.htm,, -Dstartupmode=1 -- \tkeystore\scripts\servoom.script \logs\testexecute\tkeystore_servoom.htm, 1800, UDEB,,
+T_KEYSTORE, \logs\testexecute\tkeystore_servoom.htm,, -Dstartupmode=1 -- \tkeystore\scripts\servoom.script \logs\testexecute\tkeystore_servoom.htm, 1800, UDEB,,
T_KEYSTORE, \logs\testexecute\tkeystore_reload.htm,, -Dstartupmode=1 -- \tkeystore\scripts\reload.script \logs\testexecute\tkeystore_reload.htm, 300, UDEB#UREL,,
-t_certapps, \tcertapps.log,, -Dstartupmode=1 -- \tcertapps\scripts\script1.txt \tcertapps.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certapps, \tcertapps-oom.log,, -Dstartupmode=1 -- -o \tcertapps\scripts\script1.txt \tcertapps-oom.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certapps, \tcertapps-apipolicing.log,, -Dstartupmode=1 -- \tcertapps\scripts\apipolicing.txt \tcertapps-apipolicing.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
# TMS support
t_certapps, \logs\testexecute\tcertapps.htm,, -Dstartupmode=1 -- \tcertapps\scripts\script1.script \logs\testexecute\tcertapps.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
@@ -724,40 +569,39 @@
t_certapps, \logs\testexecute\tcertapps-apipolicing.htm,, -Dstartupmode=1 -- \tcertapps\scripts\apipolicing.script \logs\testexecute\tcertapps-apipolicing.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
[FileTokens_UseAuth]
-T_KEYSTORE, \oldserver_newfeature.log,, -Dstartupmode=1 -- \tkeystore\scripts\oldserver_newfeature.txt \oldserver_newfeature.log, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\RemoveSecDlg.bat,
+T_KEYSTORE, \logs\testexecute\oldserver_newfeature.htm,, -Dstartupmode=1 -- \tkeystore\scripts\oldserver_newfeature.script \logs\testexecute\oldserver_newfeature.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\RemoveSecDlg.bat,
# The batch file run as part of first test is requried for running all tests in this section.
TESTEXECUTE, \logs\testexecute\initialize.htm,, -Dstartupmode=1 -- \tkeystore\scripts\initialize.script, 100, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_nouserregistered.log,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_nouserregistered.txt \tkeystore_nouserregistered.log, 300, UDEB#UREL, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_pre.bat,
# TMS support
-T_KEYSTORE, \logs\testexecute\tkeystore_nouserregistered.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_nouserregistered.script \logs\testexecute\tkeystore_nouserregistered.htm, 300, UDEB#UREL, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_pre.bat,
+T_KEYSTORE, \logs\testexecute\tkeystore_nouserregistered.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_nouserregistered.script \logs\testexecute\tkeystore_nouserregistered.htm, 300, UDEB#UREL, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_pre.bat,
+
+# the execution of this code is a prerequisite for running the keystore tests against the test plugins.
TESTEXECUTE, \logs\testexecute\reg_first_identity.htm,, -Dstartupmode=1 -- \tkeystore\scripts\reg_first_identity.script, 100, UDEB#UREL,,
# These set of tests run when keystore has been enabled to use authentication server.
-T_KEYSTORE, \tkeystore_useauth.log,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_useauth.txt \tkeystore_useauth.log, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat
-T_KEYSTORE, \tkeystore_authobjects_useauth.log,, -Dstartupmode=1 -- \tkeystore\scripts\authobjects_useauth.txt \tkeystore_authobjects_useauth.log, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_authobject_post.bat
-T_KEYSTORE, \tkeystore_export_useauth.log,, -Dstartupmode=1 -- \tkeystore\scripts\exportscript_useauth.txt \tkeystore_export_useauth.log, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_oom_useauth.log,, -Dstartupmode=1 -- \tkeystore\scripts\oom_useauth.txt \tkeystore_oom_useauth.log, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_cancel_useauth.log,, -Dstartupmode=1 -- \tkeystore\scripts\cancel_useauth.txt \tkeystore_cancel_useauth.log, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_servoom_useauth.log,, -Dstartupmode=1 -- \tkeystore\scripts\servoom_useauth.txt \tkeystore_servoom_useauth.log, 5000, UDEB,,
-T_KEYSTORE, \tkeystore_reload_useauth.log,, -Dstartupmode=1 -- \tkeystore\scripts\reload_useauth.txt \tkeystore_reload_useauth.log, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_capability_useauth.log,, -Dstartupmode=1 -- \tkeystore\scripts\capability_useauth.txt \tkeystore_capability_useauth.log, 1800, UDEB,,
-T_KEYSTORE, \tkeystore_authenticate_useauth.log,, -Dstartupmode=1 -- \tkeystore\scripts\authenticate_useauth.txt \tkeystore_authenticate_useauth.log, 1800, UDEB,,
-T_KEYSTORE, \tkeystore_authentication1.log,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication1.txt \tkeystore_authentication1.log, 1800, UDEB,,
-TESTEXECUTE, \logs\testexecute\reg_second_identity.htm,, -Dstartupmode=1 -- \tkeystore\scripts\reg_second_identity.script, 100, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_authentication2.log,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication2.txt \tkeystore_authentication2.log, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_post.bat
+
+# TMS support
+T_KEYSTORE, \logs\testexecute\tkeystore_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_useauth.script \logs\testexecute\tkeystore_useauth.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat
+T_KEYSTORE, \logs\testexecute\tkeystore_authobjects_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\authobjects_useauth.script \logs\testexecute\tkeystore_authobjects_useauth.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_authobject_post.bat
# TMS support
-T_KEYSTORE, \tkeystore_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_useauth.script \tkeystore_useauth.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat
-T_KEYSTORE, \tkeystore_export_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\exportscript_useauth.script \tkeystore_export_useauth.htm, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_oom_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\oom_useauth.script \tkeystore_oom_useauth.htm, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_cancel_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\cancel_useauth.script \tkeystore_cancel_useauth.htm, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_servoom_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\servoom_useauth.script \tkeystore_servoom_useauth.htm, 5000, UDEB,,
-T_KEYSTORE, \tkeystore_reload_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\reload_useauth.script \tkeystore_reload_useauth.htm, 300, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_capability_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\capability_useauth.script \tkeystore_capability_useauth.htm, 1800, UDEB,,
-T_KEYSTORE, \tkeystore_authenticate_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\authenticate_useauth.script \tkeystore_authenticate_useauth.htm, 1800, UDEB,,
-T_KEYSTORE, \tkeystore_authentication1.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication1.script \tkeystore_authentication1.htm, 1800, UDEB,,
-T_KEYSTORE, \tkeystore_authentication2.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication2.script \tkeystore_authentication2.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_post.bat
+T_KEYSTORE, \logs\testexecute\tkeystore_export_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\exportscript_useauth.script \logs\testexecute\tkeystore_export_useauth.htm, 300, UDEB#UREL,,
+T_KEYSTORE, \logs\testexecute\tkeystore_oom_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\oom_useauth.script \logs\testexecute\tkeystore_oom_useauth.htm, 600, UDEB#UREL,,
+T_KEYSTORE, \logs\testexecute\tkeystore_cancel_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\cancel_useauth.script \logs\testexecute\tkeystore_cancel_useauth.htm, 300, UDEB#UREL,,
+T_KEYSTORE, \logs\testexecute\tkeystore_servoom_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\servoom_useauth.script \logs\testexecute\tkeystore_servoom_useauth.htm, 6000, UDEB,,
+T_KEYSTORE, \logs\testexecute\tkeystore_reload_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\reload_useauth.script \logs\testexecute\tkeystore_reload_useauth.htm, 300, UDEB#UREL,,
+T_KEYSTORE, \logs\testexecute\tkeystore_capability_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\capability_useauth.script \logs\testexecute\tkeystore_capability_useauth.htm, 1800, UDEB#UREL,,
+T_KEYSTORE, \logs\testexecute\tkeystore_createoldkeystore.htm,, -Dstartupmode=1 -- \tkeystore\scripts\createoldkeystore.script \logs\testexecute\tkeystore_createoldkeystore.htm, 1800, UDEB#UREL,\epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_migrate_pre.bat, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_migrate_copykeys.bat
+TESTEXECUTE, \logs\testexecute\keytool_migrate.htm,, -Dstartupmode=1 -- \ttesttools\scripts\keytool_migrate.script, 600, UDEB#UREL,,
+T_KEYSTORE, \logs\testexecute\tkeystore_testnewkeystore.htm,, -Dstartupmode=1 -- \tkeystore\scripts\testnewkeystore.script \logs\testexecute\tkeystore_testnewkeystore.htm, 1800, UDEB#UREL,\epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_migrate_post.bat,
+
+
+# TMS support
+T_KEYSTORE, \logs\testexecute\tkeystore_authenticate_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\authenticate_useauth.script \logs\testexecute\tkeystore_authenticate_useauth.htm, 1800, UDEB#UREL,,
+T_KEYSTORE, \logs\testexecute\tkeystore_authentication1.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication1.script \logs\testexecute\tkeystore_authentication1.htm, 1800, UDEB#UREL,,
+TESTEXECUTE, \logs\testexecute\reg_second_identity.htm,, -Dstartupmode=1 -- \tkeystore\scripts\reg_second_identity.script, 100, UDEB#UREL,,
+T_KEYSTORE, \logs\testexecute\tkeystore_authentication2.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication2.script \logs\testexecute\tkeystore_authentication2.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_post.bat
[ToolsLegacy]
@@ -768,9 +612,6 @@
# DUMPSIS test
PERL, \dumpsis_test.txt,,\epoc32\winscw\c\tswi\tdumpsis\testDumpsis.pl, 300, UDEB,,\epoc32\winscw\c\tswi\tdumpsis\postdumpsistest.bat
-# Interpretsis
-PERL, \interpretsis_test.txt,,\epoc32\winscw\c\tswi\tinterpretsis\runtests.pl, 300, UDEB,,
-
[SisTools]
# MAKESIS test
# program,log,commdb,script,timeout,release,pre cmd,post cmd
@@ -781,10 +622,10 @@
# SIGNSIS test
PERL, \signsis_test.txt,,\epoc32\winscw\c\tswi\tsignsis\testSignsis.pl, 300, UDEB,,
-[ToolsNew]
+# Interpretsis
+PERL, \interpretsis_test.txt,,\epoc32\winscw\c\tswi\tinterpretsis\runtests.pl, 300, UDEB,,
-# Interpretsis
-PERL, \interpretsis_test.txt,,\epoc32\winscw\c\tswi\tinterpretsis\runtests.pl usif, 300, UDEB,,
+[ToolsNew]
# Interpretsis Test Harness
PERL, \interpretsis_test_harness.txt,,\epoc32\winscw\c\tswi\tinterpretsisinteg\runtest1.pl usifnative, 1000, UDEB,,
@@ -832,41 +673,36 @@
upstest.exe, \upstest.log,,, 800, UDEB#UREL,,
upstestobsif.exe, \upstestobsif.log,,, 800, UDEB#UREL,,
upstestoom.exe, \upstestoom.log,, , 800, UDEB,,
-upstestobsifoom.exe, \upstestobsifoom.log,, , 800, UDEB,,
+upstestobsifoom.exe, \upstestobsifoom.log,, , 800, UDEB,,\epoc32\data\Z\tups\integ\scripts\tups_networkingupsdisable.bat
tmsgapp.exe, \tmsgapp.log,, -Dtextshell -- , 800, UDEB#UREL,,
[AuthServer]
# AuthServer tests
-TESTEXECUTE, \logs\testexecute\tauthkeys.htm,, -Dstartupmode=1 -- \tauth\tauthkeys\scripts\tauthkeys.script, 30, UDEB#UREL,,
+TESTEXECUTE, \logs\testexecute\tauthkeys.htm,,-Dstartupmode=1 -- \tauth\tauthkeys\scripts\tauthkeys.script, 30, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\tauthdb.htm,, -Dstartupmode=1 -- \tauth\tauthdb\scripts\tauthdb.script, 30, UDEB#UREL,,
TESTEXECUTE, \logs\testexecute\tauthcliserv.htm,, -Dstartupmode=1 -- \tauth\tauthcliserv\scripts\tauthcliserv.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthcliserv_debug.htm,, -Dstartupmode=1 -- \tauth\tauthcliserv\scripts\tauthcliserv_debug.script, 30, UDEB,,
-TESTEXECUTE, \logs\testexecute\tauthexpr.htm,, -Dstartupmode=1 -- \tauth\tauthexpr\scripts\tauthexpr.script, 500, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthplugins.htm,, -Dstartupmode=1 -- \tauth\tauthplugins\scripts\tauthplugins.script, 30, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthsvr2.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tauthsvr2.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_tauthsvr.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketplugin.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketplugin.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketplugin_macroenabled.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketplugin_macroenabled.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_postmarketplugin.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketpluginenabled1_winscw.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketpluginenabled1_winscw.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_patchdata_positive.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketpluginenabled_winscw.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketpluginenabled_winscw.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_patchdata_negative.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
+TESTEXECUTE, \logs\testexecute\tauthcliserv_debug.htm,,-Dstartupmode=1 -- \tauth\tauthcliserv\scripts\tauthcliserv_debug.script, 30, UDEB,,
+TESTEXECUTE, \logs\testexecute\tauthexpr.htm,, -Dstartupmode=1 -- \tauth\tauthexpr\scripts\tauthexpr.script, 500, UDEB#UREL,,
+TESTEXECUTE, \logs\testexecute\tauthplugins.htm,, -Dstartupmode=1 -- \tauth\tauthplugins\scripts\tauthplugins.script, 30, UDEB#UREL,,
+TESTEXECUTE, \logs\testexecute\tauthsvr2.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tauthsvr2.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_tauthsvr.bat
+TESTEXECUTE, \logs\testexecute\tauthsvrclock.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tauthsvrclock.script, 1600, UDEB#UREL,,
+TESTEXECUTE, \logs\testexecute\tpostmarketplugin.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketplugin.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
+TESTEXECUTE, \logs\testexecute\tpostmarketplugin_macroenabled.htm,,-Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketplugin_macroenabled.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_postmarketplugin.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
+TESTEXECUTE, \logs\testexecute\tpostmarketpluginenabled1_winscw.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketpluginenabled1_winscw.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_patchdata_positive.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
+TESTEXECUTE, \logs\testexecute\tpostmarketpluginenabled_winscw.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketpluginenabled_winscw.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_patchdata_negative.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
TESTEXECUTE, \logs\testexecute\tclientsidsupport.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tclientsidsupport.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_tclientsidsupport.bat
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,,
-
+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,,
+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,,
-[StreamingCAF]
-#Streaming CAF Tests
-TESTEXECUTE, \logs\testexecute\tscaf.htm,,-Dtextshell -- z:\tcaf\tscaf\tscaf.script, 300, UDEB#UREL, ,
-TESTEXECUTE, \logs\testexecute\tscaf_oom.htm,,-Dtextshell -- z:\tcaf\tscaf\tscaf_oom.script, 300, UDEB, ,
-
[USIF]
#Universal Software Install Framework Tests
TESTEXECUTE, \logs\testexecute\usifsecuritytests.htm,,z:\tusif\securitytests\usifsecuritytests.script, 300, UDEB#UREL,,
@@ -882,10 +718,14 @@
[SecurityTools]
# Security tools tests
-PERL, \security_tools\tcertapp\tCertapp_Output.txt,, \epoc32\winscw\c\security_tools\tcertapp\run_tcertapp.pl, 1600, UDEB#UREL,,
-t_certapps, \SDP-Security_Tools-CertApp-CCDAT-EMU00.log,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-CCDAT-EMU00.txt \SDP-Security_Tools-CertApp-CCDAT-EMU00.log, 300, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
-t_certstore, \SDP-Security_Tools-CertApp-FILEDAT-EMU00.log,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-FILEDAT-EMU00.txt \SDP-Security_Tools-CertApp-FILEDAT-EMU00.log, 600, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
-t_certstore, \SDP-Security_Tools-CertApp-SWIDAT-EMU00.log,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-SWIDAT-EMU00.txt \SDP-Security_Tools-CertApp-SWIDAT-EMU00.log, 600, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
+PERL, \security_tools\tcertapp\tCertapp_Output.htm,, \epoc32\winscw\c\security_tools\tcertapp\run_tcertapp.pl, 1600, UDEB#UREL,,
+t_certapps, \logs\testexecute\SDP-Security_Tools-CertApp-CCDAT-EMU00.htm,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-CCDAT-EMU00.script \logs\testexecute\SDP-Security_Tools-CertApp-CCDAT-EMU00.htm, 300, 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-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]
@@ -897,9 +737,8 @@
# Categorisation tags are checked for all of security sub-system
PERL, \searchtags.txt,,\epoc32\winscw\c\tswi\searchtags.pl, 300, UDEB,,
+[FileTokens_HwImpl]
+T_KEYSTORE, \logs\testexecute\thwkeystore.htm,, -Dstartupmode=1 -- \tkeystore\scripts\thwkeystore.script \logs\testexecute\thwkeystore.htm, 300, UDEB#UREL, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\pre_dummyeccplugin.bat, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\post_dummyeccplugin.bat
+TESTEXECUTE, \logs\testexecute\te_dummyeccciphertestcases.htm,, -Dtextshell -- \testdata\tcryptospi\scripts\te_dummyeccciphertestcases.script, 900, UDEB#UREL, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\pre_dummyeccplugin.bat, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\post_dummyeccplugin.bat
-[UptoMCL]
-# Scan for unexpected panics in epocwind.out files
-PERL, \panicscanlog.txt,,\epoc32\winscw\c\tswi\panicscan.pl, 300, UDEB,,
-# END of file
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/test_spec_apr_9.5.txt Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,397 +0,0 @@
-# This file defines a test specification for all the MCL codelines and consists
-# of the two following sections: COMPONENT ASSIGNMENT and TEST DEFINITION
-#
-# COMPONENT ASSIGNMENT - this section assigns components (defined below) to
-# codelines they should be run for.
-#
-# TEST DEFINITION - this section defines Security tests and assigns them to
-# components. A component is defined using square brackets and its scope ends
-# at the next component. A component can be a Security component, for example
-# [SWI], [JMI], [Crypto] but also a group of various tests, for example [Misc]
-# that contains panicscan.pl and cdrive.pl.
-# It is strongly recommended to use the UDEB#UREL option if possible in order
-# to define the udeb and urel tests at once.
-#
-
-# Tests are executed according to the sequence in the TEST DEFINITION section.
-#
-# WARNING - There must not be more than one test block for any of the components.
-# E.g. SWI has one and only one [SWI] section in this file. Otherwise
-# \security\testframework\test\test_launcher.pl will be broken.
-
-
-###############################################################################
-# COMPONENT ASSIGNMENT #
-###############################################################################
-{9.5}=Common,SWI,IntegrityServices,SisTools,SwiTools95Only,SwiTools,Misc,ToolsLegacy,UptoMCL
-{9.6}=Common,SWI,SisTools,SwiTools,USIF,Misc,ToolsNew,UptoMCL,SwiDiran
-{future}=Common,SWI,SisTools,SwiTools,USIF,Misc,ToolsNew,SwiDiran
-
-
-###############################################################################
-# TEST DEFINITION #
-###############################################################################
-
-# Each test defines the following:
-# program,log,commdb,script,timeout(secs),release,pre cmd,post cmd
-
-# Configuration 1
-
-
-[Common]
-TESTEXECUTE, \logs\testexecute\tsecurityutils.htm,, z:\tsecurityutils\tsecurityutils.script, 300, UDEB, \epoc32\winscw\c\config_udeb.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\copyswitestfiles.bat
-TESTEXECUTE, \logs\testexecute\tsecurityutils.htm,, z:\tsecurityutils\tsecurityutils.script, 300, UREL, \config_urel.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\copyswitestfiles.bat
-
-[recjava]
-TESTEXECUTE, \logs\testexecute\trecogjava.htm,, \trecog\trecogjava.script, 300, UDEB#UREL,,
-
-
-[JavaMIDletInstaller]
-# Test JMI CenRep's production version initialization file
-tjmicenrep, \jmicenreptest.log,, -Dtextshell --, 300, UDEB, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cenrep_prod.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cenrep.bat
-tjmicenrep, \jmicenreptest.log,, -Dtextshell --, 300, UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cenrep_prod.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cenrep.bat
-
-tJavaHelper, \tJavaDRMUREL.log,, \tJavaHelper\Scripts\tJavaDRM.txt \tJavaDRMUREL.log, 300, UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmi.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tJavaDRMUDEB.log,, \tJavaHelper\Scripts\tJavaDRM.txt \tJavaDRMUDEB.log, 300, UDEB, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmi.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-
-tJavaRegistry, \tJavaRegistry.log,, -Dstartupmode=1 \tJavaRegistry\scripts\script1.txt \tJavaRegistry.log, 300, UDEB#UREL,\epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat,
-
-tJavaFile, \tJavaFilemidpjar.log,, -Dstartupmode=1 \tJavaFile\scripts\midpjartest.txt \tJavaFilemidpjar.log, 300, UDEB#UREL,\epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat,
-tJavaFile, \tJavaFilemidpjad.log,, -Dstartupmode=1 \tJavaFile\Scripts\midpjadtest.txt \tJavaFilemidpjad.log, 300, UDEB#UREL,\epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat,
-tJavaFile, \tJavaFileattribute.log,, -Dstartupmode=1 \tJavaFile\Scripts\attributestest.txt \tJavaFileattribute.log, 300, UDEB#UREL,\epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat,
-
-tJavaHelper, \tJavaHelper.log,, -Dstartupmode=1 \tJavaHelper\Scripts\MIDPLaunchInfoTest.txt \tJavaHelper.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tJavaInstaller.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tJavaInstaller.txt \tJavaInstaller.log, 3000, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tJavaInstallerocsp.log,, \tJavaHelper\Scripts\tJavaInstallerocsp.txt \tJavaInstallerocsp.log, 1500, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tjmiocsphttpfilter.log,, \tJavaHelper\Scripts\tjmiocsphttpfilter.txt \tjmiocsphttpfilter.log, 1500, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tjmiocspallerrors.log,, \tJavaHelper\Scripts\tjmiocspallerrors.txt \tjmiocspallerrors.log, 1500, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmiocspallerrors.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmiocspallerrors.bat
-tJavaHelper, \tjmiocspfilterallerrors.log,, \tJavaHelper\Scripts\tjmiocspfilterallerrors.txt \tjmiocspfilterallerrors.log, 1500, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmiocspallerrors.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmiocspallerrors.bat
-tJavaHelper, \tjavainstall_noplugin.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tjavainstall_noplugin.txt \tjavainstall_noplugin.log, 600, UDEB#UREL, \epoc32\winscw\c\tjavahelper\scripts\backup_jmi_plugin.bat, \epoc32\winscw\c\tjavahelper\scripts\restore_jmi_plugin.bat
-tJavaHelper, \tjavarunoninstall.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tjavarunoninstall.txt \tjavarunoninstall.log, 3600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tJavaMultiInstaller.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tJavaMultiInstaller.txt \tJavaMultiInstaller.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-
-tJavaHelper, \tjmiotaex.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tjmiotaex.txt \tjmiotaex.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tjmioom.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tjmioom.txt \tjmioom.log, 3300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-
-
-TESTEXECUTE, \logs\testexecute\tjavahelperserver.htm,, -Dtextshell -- \private\10204805\scripts\tjavahelperserver.script, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-
-tJarDownloader, \tJarDownloader.log,, -Dstartupmode=1 \tJarDownloader\scripts\script1.txt \tJarDownloader.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-
-TESTEXECUTE, \logs\testexecute\tmidletuaheaderfilter.htm,, -Dtextshell -- \tmidletuaheaderfilter\tmidletuaheaderfilter.script, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmi.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\preparetjardownloader.bat
-
-ITHARNESSMIDP, \itharnessmidp-conf1.log,, \JAVATEST.TXT \itharnessmidp-conf1.log, 1600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat,
-ITHARNESSMIDP, \itharnessmidp-conf2.log,, \JAVATEST2.TXT \itharnessmidp-conf2.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\backup_jmi_autodeletefiles.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\replace_jmi_autodeletefiles.bat
-ITHARNESSMIDP, \itharnessmidp-conf3.log,, \JAVATEST3.TXT \itharnessmidp-conf3.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat,
-ITHARNESSMIDP, \itharnessmidp-conf4.log,, \OTATests.txt \itharnessmidp-conf4.log, 1200, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_otasetup.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat revertotasetup
-ITHARNESSMIDP, \leavetest.log,, \leavetest.txt \leavetest.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat auto.cfg,
-ITHARNESSMIDP, \itharnessmidp-conf5.log,, \javaiaptest.txt \itharnessmidp-conf5.log, 1200, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat prompt.cfg, %SECURITYSOURCEDIR%\testframework\test\autotesting\runced c:\auto.cfg
-
-ITHARNESSMIDP, \itharnessmidp-ocsp-default.log,, \itharnessmidp\scripts\ocsp-Default.txt \itharnessmidp-ocsp-default.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat ocsp-default,
-ITHARNESSMIDP, \itharnessmidp-ocsp-allWarnings.log,, \itharnessmidp\scripts\ocsp-allWarnings.txt \itharnessmidp-ocsp-allWarnings.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat ocsp-allWarnings,
-ITHARNESSMIDP, \itharnessmidp-ocsp-allErrors.log,, \itharnessmidp\scripts\ocsp-allErrors.txt \itharnessmidp-ocsp-allErrors.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy_allerrors.bat ocsp-allErrors, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_cert_copy_allerrors.bat
-
-# WinSignMIDlet test
-PERL, \winsignmidlet_test.txt,, -Dtextshell -- %SECURITYSOURCEDIR%\JavaMIDletInstaller\test\tWinSignMIDlet\testwinsignmidlet.pl, 300, UDEB#UREL,,
-
-
-
-
-
-[SWI]
-# Requires the following additional components to be built: SisTools, Certman
-
-#NQP Tests for DataProvider
-TESTEXECUTE, \logs\testexecute\tdataprovider.htm,, -Dstartupmode=1 -- z:\tswi\tdataprovider\scripts\tdataprovider.script, 600, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\testwritableswicertstore.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testwritableswicertstore.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\cleanswicertstore.bat
-TESTEXECUTE, \logs\testexecute\tsilent_winscw.htm,, \tswi\tuiscriptadaptors\scripts\tsilent_winscw.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\cleanswicertstore.bat
-TESTEXECUTE, \logs\testexecute\tswidaemonstub.htm,, \tswi\tuiscriptadaptors\scripts\tswidaemonstub.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\inc098114_winscw.htm,, \tswi\tuiscriptadaptors\scripts\inc098114_winscw.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat
-TESTEXECUTE, \logs\testexecute\tcleanupinfrastructure.htm,, \tswi\tuiscriptadaptors\scripts\tcleanupinfrastructure.script, 300, UDEB#UREL,\epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tcleanupinfrastructure_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tcleanupinfrastructure_post.bat
-
-TESTEXECUTE, \logs\testexecute\tsis.htm,, \tswi\tsis\scripts\tsis.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsis_signed.htm,, -Dstartupmode=1 -- \tswi\tsis\scripts\tsis_signed.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsis_failure.htm,, -Dstartupmode=1 -- \tswi\tsis\scripts\tsis_failure.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsis_large.htm,, -Dstartupmode=1 -- \tswi\tsis\scripts\tsis_large.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsis_new_recognizer.htm,, \tswi\tsis\scripts\tsis_new_recognizer.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tsis\batchfiles\new_recognizer_pre.bat, \epoc32\winscw\c\tswi\tsis\batchfiles\new_recognizer_post.bat
-TESTEXECUTE, \logs\testexecute\tsishelper.htm,, -Dstartupmode=1 -- \tswi\tsishelper\scripts\tsishelper.script, 300, UDEB#UREL,,
-
-[IntegrityServices]
-TESTEXECUTE, \logs\testexecute\tstartuprecovery.htm,, \tswi\tintegrityservices\scripts\tstartuprecovery.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tintegrityservices\scripts\batchfiles\recoverystartup_pre.bat,
-TESTEXECUTE, \logs\testexecute\tintegrityservices.htm,, -Dstartupmode=1 -- \tswi\tintegrityservices\scripts\tintegrityservices.script, 300, UDEB#UREL,,
-
-[SWI]
-TESTEXECUTE, \logs\testexecute\testexpressions.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testexpressions.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testdrives.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrives.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testlocations.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testlocations.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testupgrades.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testupgrades.script, 300, UDEB#UREL,\epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\cleanswicertstore.bat
-
-TESTEXECUTE, \logs\testexecute\testaugmentations.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testaugmentations.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testpreinstalled.htm,, \tswi\tuiscriptadaptors\scripts\testpreinstalled.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testpreinstalled_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testpreinstalled_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testdependencies.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdependencies.script, 300, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\tuiscriptadaptors.htm,, \tswi\tuiscriptadaptors\scripts\tuiscriptadaptors.script, 10000, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuiscriptadaptors_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuiscriptadaptors_post.bat
-TESTEXECUTE, \logs\testexecute\tuiscriptadaptors_winscw.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tuiscriptadaptors_winscw.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat,
-TESTEXECUTE, \logs\testexecute\testvids.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testvids.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tuiscriptadaptorsFH.htm,, \tswi\tuiscriptadaptors\scripts\tuiscriptadaptorsFH.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat,
-
-TESTEXECUTE, \logs\testexecute\testrucert.htm,, \tswi\tuiscriptadaptors\scripts\testrucert.script, 500, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\romupdate_withoutstubs_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\romupdate_withoutstubs_post.bat
-
-TESTEXECUTE, \logs\testexecute\testrun.htm,, \tswi\tuiscriptadaptors\scripts\testrun.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testrunft.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrunft.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini,
-
-TESTEXECUTE, \logs\testexecute\testrun2.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrun2.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_notallowrun.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testshutdown.htm,, \tswi\tuiscriptadaptors\scripts\testshutdown.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testasync.htm,, \tswi\tuiscriptadaptors\scripts\testasync.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat,
-TESTEXECUTE, \logs\testexecute\testasynccancel.htm,, \tswi\tuiscriptadaptors\scripts\testasynccancel.script, 3000, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\tsisstub.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tsisstub.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsisstub_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tsisstub_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testasynccaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testasynccaps.script, 300, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\devcerts_match.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_match.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat
-TESTEXECUTE, \logs\testexecute\devcerts_mismatch.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_mismatch.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\devcerts_aggregate.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_aggregate.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\devcerts_corrupt.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_corrupt.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\devcerts_ocsp.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_ocsp.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\devcerts_backuprestore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backuprestore.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat
-TESTEXECUTE, \logs\testexecute\devcerts_backup.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backup.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat
-TESTEXECUTE, \logs\testexecute\devcerts_restore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_restore.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\changedevid.bat, \epoc32\winscw\c\tswi\tdevcerts\scripts\batchfiles\devcerts_restore_post.bat
-
-TESTEXECUTE, \logs\testexecute\tsisregistrytest.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\tsisregistrytest.script, 1500, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat, \epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\tsisregistrytest_post.bat
-TESTEXECUTE, \logs\testexecute\testVFPOnEmulator.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testVFPOnEmulator.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tdaemon.htm,, -Dstartupmode=1 -- \tswi\tdaemon\scripts\tdaemon.script, 300, UDEB#UREL,, %SECURITYSOURCEDIR%\testframework\test\autotesting\callcreateandsignunicode.bat
-
-# createandsignunicode.pl needs to be run as it builds some SIS files the following tests rely on, however it is a SisTools test so it is run through a batch file and the results not recorded here
-TESTEXECUTE, \logs\testexecute\tbackuprestore.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore.script, 1500, UDEB#UREL,\epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_post.bat
-TESTEXECUTE, \logs\testexecute\tbackuprestore_second_part.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_second_part.script, 300, UDEB, \epoc32\winscw\c\tswi\tbackuprestore\scripts\tbackuprestore_second_part_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\tbackuprestore_second_part_post.bat
-TESTEXECUTE, \logs\testexecute\tbackuprestoredrive_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestoredrive_emulator.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tbackuprestore_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_post.bat
-TESTEXECUTE, \logs\testexecute\tbackuprestore_policy_prepost_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_policy_prepost_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_policy_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_policy_post.bat
-TESTEXECUTE, \logs\testexecute\tbackuprestore_policylst_certfst_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_policylst_certfst_emulator.script, 300, UDEB#UREL, ,
-TESTEXECUTE, \logs\testexecute\tbackuprestore_cert_prepost_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_cert_prepost_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_cert_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_cert_post.bat
-TESTEXECUTE, \logs\testexecute\tbackuptrestore_exploratory.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuptrestore_exploratory.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tbackuprestore_no_overwrite.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_no_overwrite.script, 1500, UDEB#UREL,\epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_no_overwrite_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_no_overwrite_post.bat
-
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_udeb.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_udeb.script, 300, UDEB,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\premeta.bat,
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_urel.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_urel.script, 300, UREL,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\premeta.bat,
-
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_udeb.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_udeb.script, 300,UDEB,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_urel.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_urel.script, 300,UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
-TESTEXECUTE, \logs\testexecute\trevocation.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\trevocation.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\trevocation_unsigned.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\trevocation_unsigned.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\tautosigning.htm,, -Dstartupmode=1 -- \tswi\tautosigning\scripts\tautosigning.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testdrm.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrm.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testdrmasync.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrmasync.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testdrmFH.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrmFH.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testdiskfullemulator.htm,, \tswi\tuiscriptadaptors\scripts\testdiskfullemulator.script, 300, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\testcancel.htm,, \tswi\tuiscriptadaptors\scripts\testcancel.script, 1500, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testmandatory.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testmandatory.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore.dat
-TESTEXECUTE, \logs\testexecute\testnotargetdevices.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnotargetdevices.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_incompifnotargetdevices.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testsystemcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testsystemcaps.script, 300, UDEB, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore.dat,
-TESTEXECUTE, \logs\testexecute\testsystemcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testsystemcaps.script, 300, UREL,,
-TESTEXECUTE, \logs\testexecute\testusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps.script, 300, UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
-TESTEXECUTE, \logs\testexecute\testusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps.script, 300, UDEB,,
-
-TESTEXECUTE, \logs\testexecute\testusercaps_nousergrantcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_nousergrantcaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_nousergrantcaps.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testusercaps_restrictedusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_restrictedusercaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_restrictedusercaps.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testnoorphanedoverwrite.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnoorphanedoverwrite.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_noorphanedoverwrite.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\overwriteprivate.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_noprotectedorphanoverwrite.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\overwriteprivate_positive.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script, 300, UDEB, \epoc32\release\winscw\UDEB\Z\tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\overwriteprivate_positive.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script, 300, UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testallowunsigned.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testallowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\tpathsubst.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubst.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_pathsubst.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\tpathsubstsysdrive.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubstsysdrive.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_verifysysdrive.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-TESTEXECUTE, \logs\testexecute\tpropagation_winscw.htm,, -Dtextshell -- \tswi\tuiscriptadaptors\scripts\tpropagation_winscw.script, 600, UDEB#UREL,,
-
-
-TESTEXECUTE, \logs\testexecute\testeclipseemulator.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testeclipseemulator.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\pre_testeclipseemulator.bat,%SECURITYSOURCEDIR%\testframework\test\autotesting\delstubtemp.bat
-
-TESTEXECUTE, \logs\testexecute\testeclipse.htm,, \tswi\tuiscriptadaptors\scripts\testeclipse.script, 500, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testeclipse_pre.bat,\epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testeclipse_post.bat
-
-TESTEXECUTE, \logs\testexecute\swicaptests.htm,, -Dstartupmode=1 -- \tswi\swicaptests\scripts\swicaptests.script, 500, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\testappinuse.htm,, \tswi\tuiscriptadaptors\scripts\testappinuse.script, 1500, UDEB#UREL,,
-
-
-TESTEXECUTE, \logs\testexecute\switermination.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\switermination.script, 500, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\tuileavedialog.htm,, \tswi\tuiscriptadaptors\scripts\tuileavedialog.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuileavedialog_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuileavedialog_post.bat
-TESTEXECUTE, \logs\testexecute\tuileavedialogasync.htm,, \tswi\tuiscriptadaptors\scripts\tuileavedialogasync.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuileavedialog_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuileavedialog_post.bat
-
-TESTEXECUTE, \logs\testexecute\cr956_test.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\cr956_test.script, 2000, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\testuninstallation.htm,, \tswi\tuiscriptadaptors\scripts\testuninstallation.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testuninstallation_pre.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-TESTEXECUTE, \logs\testexecute\tuninstallpkgs.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tuninstallpkgs.script, 1000, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testlogging.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\testlogging.script, 100, UDEB#UREL,\epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.iniwinscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-TESTEXECUTE, \logs\testexecute\test_pa_sapropagated_notdelete.htm,, \tswi\tuiscriptadaptors\scripts\test_pa_sapropagated_notdelete.script, 100, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testpastub.htm,, \tswi\tuiscriptadaptors\scripts\testpastub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testsapropagatedstub.htm,, \tswi\tuiscriptadaptors\scripts\testsapropagatedstub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-
-# Extended Key Usage check while installation of signed sis files.
-TESTEXECUTE, \logs\testexecute\testextension.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
-TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning.ini,
-TESTEXECUTE, \logs\testexecute\testextension_alternatecodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_alternatecodesigningoid.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_altcodesigningoid.ini,
-TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning_altcodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning_altcodesigningoid.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning_altcodesigningoid.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-# SwiConsole Tests
-TESTEXECUTE, \logs\testexecute\tswiconsole.htm,, -Dstartupmode=1 -- \tswi\tswiconsole\scripts\tswiconsole.script, 300, UDEB#UREL,
-TESTEXECUTE, \logs\testexecute\tswiconsole_allowunsigned.htm,, -Dstartupmode=1 -- \tswi\tswiconsole\scripts\tswiconsole_allowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-TESTEXECUTE, \logs\testexecute\testmulti.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testmulti.script, 300, UDEB#UREL,
-TESTEXECUTE, \logs\testexecute\generateregistrytestdata.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\generateregistrytestdata.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\runregistrytests.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\runregistrytests.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\removeregistrytestdata.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\removeregistrytestdata.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\truststatus.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\truststatus.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testtruststatus.htm,, \tswi\tuiscriptadaptors\scripts\testtruststatus.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tresetdevice.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tresetdevice.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-# Test Non-Removable Flag
-TESTEXECUTE, \logs\testexecute\testnonremovable.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnonremovable.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testnonremovable_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testnonremovable_post.bat
-
-# Adorned filename handling tests
-TESTEXECUTE, \logs\testexecute\adornedfilenames.htm,, \tswi\tuiscriptadaptors\scripts\adornedfilenames.script, 300, UDEB#UREL,, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\adornedfilenames_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\adornedfilenames_post.bat
-
-# Testing asynchronous cancellation of installation
-TESTEXECUTE, \logs\testexecute\asynccancel.htm,, \tswi\tasynccancel\scripts\asynccancel.script, 10000, UDEB,,
-
-# DevInfoSupport test -
-tdevinfosupport,\swi.log,,-Dtextshell -- , 300, UDEB,,
-
-# DemandPaging tests - these run using testexecute
-TESTEXECUTE, \logs\testexecute\tdempaging_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tuiscriptadaptors\scripts\tdempaging_winscw.script, 1000, UDEB#UREL,,
-
-#CR0914 Tests
-TESTEXECUTE, \logs\testexecute\integritychecktest.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest.script, 1000, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\integritychecktest5Install_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest5Install_winscw.script, 1000, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\integritychecktest5verify_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest5verify_winscw.script, 1000, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat some_swicertstore.dat,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore.dat
-
-TESTEXECUTE, \logs\testexecute\testswiobserver.htm,, -Dstartupmode=1 -- z:\tswi\tswiobserver\scripts\testswiobserver.script, 300, UDEB#UREL,,
-swiobservertest.exe, \swiobservertest.log,, , 800, UDEB#UREL,,
-swiobservertestoom.exe, \swiobservertestoom.log,, , 800, UDEB#UREL,,
-
-
-[SwiDiran]
-TESTEXECUTE, \logs\testexecute\tswiregcompfields.htm,, \tswi\tuiscriptadaptors\scripts\tswiregcompfields.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tswtype.htm,, \tswi\tuiscriptadaptors\scripts\tswtype.script, 300, UDEB#UREL,,
-
-[SISInstaller]
-tIntegritySupport, \tisrecovery.log,, -Dtextshell -- \tIntegritySupport\scripts\tisrecovery.txt \tisrecovery.log, 300, UDEB#UREL,, \epoc32\winscw\c\tIntegritySupport\scripts\batchfiles\tIntegritySupport_post.bat
-tIntegritySupport, \tisrecoveryapp.log,, -Dtextshell -- \tIntegritySupport\scripts\tisrecoveryapp.txt \tisrecoveryapp.log, 300, UDEB#UREL,,
-
-tInstalledAppsRegistry, \tInstalledAppsRegistry.log,, -Dtextshell -- \tInstalledAppsRegistry\scripts\script1.txt \tInstalledAppsRegistry.log, 300, UDEB#UREL, \epoc32\winscw\c\tInstalledAppsRegistry\scripts\batchfiles\tInstalledAppsRegistry_pre.bat, \epoc32\winscw\c\tInstalledAppsRegistry\scripts\batchfiles\tInstalledAppsRegistry_post.bat
-
-
-
-[ToolsLegacy]
-
-# Interpretsis Test Harness
-PERL, \interpretsis_test_harness.txt,,\epoc32\winscw\c\tswi\tinterpretsisinteg\runtest1.pl native, 1000, UDEB,,
-
-# DUMPSIS test
-PERL, \dumpsis_test.txt,,\epoc32\winscw\c\tswi\tdumpsis\testDumpsis.pl, 300, UDEB,,\epoc32\winscw\c\tswi\tdumpsis\postdumpsistest.bat
-
-# Interpretsis
-PERL, \interpretsis_test.txt,,\epoc32\winscw\c\tswi\tinterpretsis\runtests.pl, 300, UDEB,,
-
-[SisTools]
-# MAKESIS test
-# program,log,commdb,script,timeout,release,pre cmd,post cmd
-PERL, \createandsignunicode.txt,,\epoc32\winscw\c\tswi\tsignsis\createandsignunicode.pl, 300, UDEB#UREL,,
-
-PERL, \makesis_test.txt,,\epoc32\winscw\c\tswi\testMakesis.pl, 300, UDEB,,
-
-# SIGNSIS test
-PERL, \signsis_test.txt,,\epoc32\winscw\c\tswi\tsignsis\testSignsis.pl, 300, UDEB,,
-
-[ToolsNew]
-
-# Interpretsis
-PERL, \interpretsis_test.txt,,\epoc32\winscw\c\tswi\tinterpretsis\runtests.pl usif, 300, UDEB,,
-
-# Interpretsis Test Harness
-PERL, \interpretsis_test_harness.txt,,\epoc32\winscw\c\tswi\tinterpretsisinteg\runtest1.pl usifnative, 1000, UDEB,,
-
-# Interpretsis Test Harness - This test is for testing the installation using database to store registration information.
-PERL, \interpretsis_test_harness_db.txt,,\epoc32\winscw\c\tswi\tinterpretsisinteg\runtest1.pl usif, 1000, UDEB,,
-
-# tdbtool
-PERL, \tdbtool.txt,,\epoc32\winscw\c\tswi\tdbtool\tdbtool.pl, 300, UDEB,,\epoc32\winscw\c\tswi\tdbtool\postdbtool.bat
-
-# DUMPSIS test for USIF
-PERL, \dumpsis_test_usif.txt,,\epoc32\winscw\c\tswi\tdumpsis\testDumpsis.pl usif, 300, UDEB,,\epoc32\winscw\c\tswi\tdumpsis\postdumpsistest.bat
-
-[SwiTools]
-# DUMPCHAINVALIDITY test
-PERL, \dumpchainvalidity_test.txt,,\epoc32\winscw\c\tswi\tchainvalidity\testChainValidity.pl, 300, UDEB,,
-# DUMPINSTALLFILESTATUS test
-PERL, \dumpinstallstatus_test.txt,,\epoc32\winscw\c\tswi\tinstallfilestatus\testInstallStatus.pl, 300, UDEB,,
-
-[SwiTools95Only]
-# DUMPSWICERTSTORE test
-PERL, \dumpswicertstore_test.txt,,\epoc32\winscw\c\tswi\tdumpcertstore\testswiCertstore.pl, 600, UDEB,\epoc32\winscw\c\tswi\tdumpcertstore\predumpcertstoretest.bat, \epoc32\winscw\c\tswi\tdumpcertstore\postdumpcertstoretest.bat
-# DUMPSWIREGISTRY test
-PERL, \dumpregistry_test.txt,,\epoc32\winscw\c\tswi\tdumpregistry\testregistry.pl, 300, UDEB,,
-
-TESTEXECUTE, \logs\testexecute\tauthkeys.htm,,-Dstartupmode=1 -- \tauth\tauthkeys\scripts\tauthkeys.script, 30, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthdb.htm,, -Dstartupmode=1 -- \tauth\tauthdb\scripts\tauthdb.script, 30, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthcliserv.htm,, -Dstartupmode=1 -- \tauth\tauthcliserv\scripts\tauthcliserv.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthcliserv_debug.htm,,-Dstartupmode=1 -- \tauth\tauthcliserv\scripts\tauthcliserv_debug.script, 30, UDEB,,
-TESTEXECUTE, \logs\testexecute\tauthexpr.htm,,-Dstartupmode=1 -- \tauth\tauthexpr\scripts\tauthexpr.script, 500, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthplugins.htm,, -Dstartupmode=1 -- \tauth\tauthplugins\scripts\tauthplugins.script, 30, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthsvr2.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tauthsvr2.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\post_tauthsvr.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketplugin.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketplugin.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketplugin_macroenabled.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketplugin_macroenabled.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\pre_postmarketplugin.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tauthsvroom.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tauthsvroom.script, 5000, UDEB#UREL,,
-# Scan for unexpected panics in epocwind.out files
-PERL, \panicscanlog.txt,,\epoc32\winscw\c\tswi\panicscan_authserver.pl, 300, UDEB,,
-
-
-
-[StreamingCAF]
-#Streaming CAF Tests
-TESTEXECUTE, \logs\testexecute\tscaf.htm,,-Dtextshell -- z:\tcaf\tscaf\tscaf.script, 300, UDEB#UREL, ,
-TESTEXECUTE, \logs\testexecute\tscaf_oom.htm,,-Dtextshell -- z:\tcaf\tscaf\tscaf_oom.script, 300, UDEB, ,
-
-[USIF]
-#Universal Software Install Framework Tests
-TESTEXECUTE, \logs\testexecute\usifsecuritytests.htm,,z:\tusif\securitytests\usifsecuritytests.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsifintegration.htm,,z:\tusif\tsifintegration\tsifintegration.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsif.htm,,z:\tusif\tsif\tsif.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsifoom.htm,,z:\tusif\tsif\tsifoom.script, 300, UDEB,,
-TESTEXECUTE, \logs\testexecute\tscr.htm,,z:\tusif\tscr\tscr.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsts_bootuptimerecovery.htm,,z:\tusif\tsts\tsts_bootuptimerecovery.script, 300, UDEB#UREL, \epoc32\data\z\tusif\tsts\batchfiles\tsts_bootuptimerecovery.bat,
-TESTEXECUTE, \logs\testexecute\tsts_rollbackall.htm,,z:\tusif\tsts\tsts_rollbackall.script, 300, UDEB#UREL, ,
-TESTEXECUTE, \logs\testexecute\tsts.htm,,z:\tusif\tsts\tsts.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsts_tintegrityservices.htm,,z:\tusif\tsts\tintegrityservices\scripts\tsts_tintegrityservices.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsifrefinstaller.htm,,z:\tusif\tsifrefinstaller\tsifrefinstaller.script, 300, UDEB#UREL,,
-
-[SecurityTools]
-# Security tools tests
-PERL, \security_tools\tcertapp\tCertapp_Output.txt,, \epoc32\winscw\c\security_tools\tcertapp\run_tcertapp.pl, 1600, UDEB#UREL,,
-t_certapps, \SDP-Security_Tools-CertApp-CCDAT-EMU00.log,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-CCDAT-EMU00.txt \SDP-Security_Tools-CertApp-CCDAT-EMU00.log, 300, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
-t_certstore, \SDP-Security_Tools-CertApp-FILEDAT-EMU00.log,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-FILEDAT-EMU00.txt \SDP-Security_Tools-CertApp-FILEDAT-EMU00.log, 600, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
-t_certstore, \SDP-Security_Tools-CertApp-SWIDAT-EMU00.log,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-SWIDAT-EMU00.txt \SDP-Security_Tools-CertApp-SWIDAT-EMU00.log, 600, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
-
-
-[Misc]
-# Check that there are no test certificates in invalid locations in the source code
-PERL, \checklocationofcertificateslog.txt,, \epoc32\winscw\c\checklocationofcertificates.pl %SECURITYSOURCEDIR%, 300, UDEB,,
-
-# Scan for occurrences of "C: , EDriveC and [<index>]='C' in source files
-PERL, \cdrivewarnings.htm,,\epoc32\winscw\c\cdrive.pl --exclude=\epoc32\winscw\c\cdrive_exclude.txt --excludedir=%SECURITYSOURCEDIR%\usif\scr\sqlite_secure\ --log=cdrivewarnings.htm %SECURITYSOURCEDIR%,300,UDEB,,
-
-# Categorisation tags are checked for all of security sub-system
-PERL, \searchtags.txt,,\epoc32\winscw\c\tswi\searchtags.pl, 300, UDEB,,
-
-[UptoMCL]
-# Scan for unexpected panics in epocwind.out files
-PERL, \panicscanlog.txt,,\epoc32\winscw\c\tswi\panicscan.pl, 300, UDEB,,
-# END of file
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/test_spec_sdp_9.5.txt Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,744 +0,0 @@
-# This file defines a test specification for all the MCL codelines and consists
-# of the two following sections: COMPONENT ASSIGNMENT and TEST DEFINITION
-#
-# COMPONENT ASSIGNMENT - this section assigns components (defined below) to
-# codelines they should be run for.
-#
-# TEST DEFINITION - this section defines Security tests and assigns them to
-# components. A component is defined using square brackets and its scope ends
-# at the next component. A component can be a Security component, for example
-# [SWI], [JMI], [Crypto] but also a group of various tests, for example [Misc]
-# that contains panicscan.pl and cdrive.pl.
-# It is strongly recommended to use the UDEB#UREL option if possible in order
-# to define the udeb and urel tests at once.
-#
-
-# Tests are executed according to the sequence in the TEST DEFINITION section.
-#
-# WARNING - There must not be more than one test block for any of the components.
-# E.g. SWI has one and only one [SWI] section in this file. Otherwise
-# %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\test_launcher.pl will be broken.
-
-
-###############################################################################
-# COMPONENT ASSIGNMENT #
-###############################################################################
-{tb92SF}=Init,Crypto,CryptoTokens,CAF2,CAF296,Common,Certman,Asnpkcs,Filetokens,CryptoSpi,UPS,StreamingCAF,SecurityTools,Misc
-{tb101SF}=Init,Crypto,CryptoTokens,CAF2,CAF296,CAF2Future,Common,Certman,Asnpkcs,Filetokens,FileTokens_UseAuth,CryptoSpi,UPS,AuthServer,StreamingCAF,SecurityTools,Misc,FileTokens_HwImpl
-
-
-###############################################################################
-# TEST DEFINITION #
-###############################################################################
-
-# Each test defines the following:
-# program,log,commdb,script,timeout(secs),release,pre cmd,post cmd
-
-# Configuration 1
-
-[Init]
-# Setup the emulator network support and backup/restore emulator drives.
-TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UDEB, \epoc32\winscw\c\config_udeb.bat,
-TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UREL, \config_urel.bat,
-
-
-
-[Crypto]
-thash, \hashlog.txt,, -Dtextshell --, 2500, UDEB,,
-thash, \hashlog.txt,, -Dtextshell --, 2500, UREL,,
-t_random, \t_random.log,, -Dtextshell --, 300, UDEB#UREL,,
-
-# Padding tests - these run using testexecute
-TESTEXECUTE, \logs\testexecute\tpadding.htm,, -Dtextshell -- \tpadding\tpadding.script, 300, UDEB,,
-TESTEXECUTE, \logs\testexecute\tpaddingudeb.htm,, -Dtextshell -- \tpadding\tpaddingudeb.script, 300, UDEB,,
-
-# CRYPTO
-# CRYPTO TMS SUPPORT
-tasymmetric, \logs\testexecute\tasymmetrictests.htm,, -Dtextshell -- \tasymmetric\tasymmetrictests.script \logs\testexecute\tasymmetrictests.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\tsymmetrictests.htm,, -Dtextshell -- \tsymmetric\tsymmetrictests.script \logs\testexecute\tsymmetrictests.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESECBVectorsScript.htm,, -Dtextshell -- \tsymmetric\AESECBVectorsScript.script \logs\testexecute\AESECBVectorsScript.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESECB_KAT_VT.htm,, -Dtextshell -- \tsymmetric\AESECB_KAT_VT.script \logs\testexecute\AESECB_KAT_VT.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESECB_KAT_VK.htm,, -Dtextshell -- \tsymmetric\AESECB_KAT_VK.script \logs\testexecute\AESECB_KAT_VK.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloEncryptECB128.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptECB128.script \logs\testexecute\AESMonteCarloEncryptECB128.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloEncryptECB192.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptECB192.script \logs\testexecute\AESMonteCarloEncryptECB192.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloEncryptECB256.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptECB256.script \logs\testexecute\AESMonteCarloEncryptECB256.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloDecryptECB128.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptECB128.script \logs\testexecute\AESMonteCarloDecryptECB128.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloDecryptECB192.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptECB192.script \logs\testexecute\AESMonteCarloDecryptECB192.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloDecryptECB256.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptECB256.script \logs\testexecute\AESMonteCarloDecryptECB256.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloEncryptCBC128.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptCBC128.script \logs\testexecute\AESMonteCarloEncryptCBC128.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloEncryptCBC192A.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptCBC192A.script \logs\testexecute\AESMonteCarloEncryptCBC192A.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloEncryptCBC192B.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptCBC192B.script \logs\testexecute\AESMonteCarloEncryptCBC192B.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloEncryptCBC256.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptCBC256.script \logs\testexecute\AESMonteCarloEncryptCBC256.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloDecryptCBC128.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptCBC128.script \logs\testexecute\AESMonteCarloDecryptCBC128.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloDecryptCBC192.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptCBC192.script \logs\testexecute\AESMonteCarloDecryptCBC192.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\AESMonteCarloDecryptCBC256.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptCBC256.script \logs\testexecute\AESMonteCarloDecryptCBC256.htm, 300, UDEB#UREL,,
-tsymmetric, \logs\testexecute\symmetricOOMtests.htm,, -Dtextshell -- \tsymmetric\symmetricOOMtests.script \logs\testexecute\symmetricOOMtests.htm, 300, UDEB#UREL,,
-
-tbigint, \logs\testexecute\tconstruction.htm,, -Dtextshell -- \tbigint\tconstructiontests.script \logs\testexecute\tconstruction.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tbasicmaths.htm,, -Dtextshell -- \tbigint\tbasicmathstests.script \logs\testexecute\tbasicmaths.htm, 1500, UDEB#UREL,,
-tbigint, \logs\testexecute\tmontgomery.htm,, -Dtextshell -- \tbigint\tmontgomerytests.script \logs\testexecute\tmontgomery.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tprime.htm,, -Dtextshell -- \tbigint\tprimetests.script \logs\testexecute\tprime.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tprime2.htm,, -Dtextshell -- \tbigint\tprimetests2.script \logs\testexecute\tprime2.htm, 600, UDEB#UREL,,
-tbigint, \logs\testexecute\tprimegen.htm,, -Dtextshell -- \tbigint\tprimegen.script \logs\testexecute\tprimegen.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tprimefailure.htm,, -Dtextshell -- \tbigint\tprimefailuretests.script \logs\testexecute\tprimefailure.htm, 300, UDEB#UREL,,
-
-tpkcs5kdf, \logs\testexecute\tpkcs12kdftests.htm,, -Dtextshell -- \tpkcs5kdf\tpkcs12kdftests.script \logs\testexecute\tpkcs12kdftests.htm, 600, UDEB#UREL,,
-TPBE, \logs\testexecute\tpbetestsv2.htm,, -Dtextshell -- \tpbe\tpbetests_v2.script \logs\testexecute\tpbetestsv2.htm, 3000, UDEB#UREL,,
-
-
-
-[CryptoTokens]
-T_CTFRAMEWORK, \T_CTFRAMEWORKlog.txt,, -Dtextshell --, 300, UDEB#UREL,,
-
-
-
-[CAF2]
-# Requires the following additional components to be built: RefTestAgent
-TESTEXECUTE, \logs\testexecute\TCAF.htm,, z:\TCAF\TCAF.script,1800, UDEB#UREL,\techview.bat,
-TESTEXECUTE, \logs\testexecute\RTA.htm,, z:\RTA\RTA.script,1800, UDEB#UREL,\techview.bat,
-TESTEXECUTE, \logs\testexecute\tcafnodrmcap.htm,, z:\tcaf\tcafnodrmcap.script,300, UDEB#UREL,\techview.bat,
-
-[CAF296]
-# Should be run v9.6 onwards
-TESTEXECUTE, \logs\testexecute\RTA_64bit.htm,, z:\RTA\rta_64bit.script,1800, UDEB#UREL,\techview.bat,
-TESTEXECUTE, \logs\testexecute\consumerstep_64bit.htm,, z:\tcaf\consumerstep_64bit.script,1800, UDEB#UREL,\techview.bat,
-
-[CAF2Future]
-# Should run for vfuture onwards.
-TESTEXECUTE, \logs\testexecute\tcafwmdrmsupport.htm,, z:\tcaf\tcafwmdrmsupport.script,1800, UDEB#UREL,\techview.bat,
-TESTEXECUTE, \logs\testexecute\tmtputils.htm,, z:\tcaf\tmtputils\tmtputils.script,1800, UDEB#UREL,\techview.bat,
-TESTEXECUTE, \logs\testexecute\tcafhelper.htm,, z:\tcaf\tcafhelper.script,1800, UDEB#UREL,\techview.bat,
-
-[StreamingCAF]
-#Streaming CAF Tests
-TESTEXECUTE, \logs\testexecute\tscaf.htm,,-Dtextshell -- z:\tcaf\tscaf\tscaf.script, 300, UDEB#UREL, ,
-TESTEXECUTE, \logs\testexecute\tscaf_oom.htm,,-Dtextshell -- z:\tcaf\tscaf\tscaf_oom.script, 300, UDEB, ,
-
-
-
-[Common]
-TESTEXECUTE, \logs\testexecute\trecogcert.htm,, \trecog\trecogcert.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\trecogpkcs12.htm,, \trecog\trecogpkcs12.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsecurityutils.htm,, z:\tsecurityutils\tsecurityutils.script, 300, UDEB#UREL,,
-
-[recjava]
-TESTEXECUTE, \logs\testexecute\trecogjava.htm,, \trecog\trecogjava.script, 300, UDEB#UREL,,
-
-
-[JavaMIDletInstaller]
-# Test JMI CenRep's production version initialization file
-tjmicenrep, \jmicenreptest.log,, -Dtextshell --, 300, UDEB, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cenrep_prod.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cenrep.bat
-tjmicenrep, \jmicenreptest.log,, -Dtextshell --, 300, UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cenrep_prod.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cenrep.bat
-
-tJavaHelper, \tJavaDRMUREL.log,, \tJavaHelper\Scripts\tJavaDRM.txt \tJavaDRMUREL.log, 300, UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmi.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tJavaDRMUDEB.log,, \tJavaHelper\Scripts\tJavaDRM.txt \tJavaDRMUDEB.log, 300, UDEB, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmi.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-
-tJavaRegistry, \tJavaRegistry.log,, -Dstartupmode=1 \tJavaRegistry\scripts\script1.txt \tJavaRegistry.log, 300, UDEB#UREL,\epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat,
-
-tJavaFile, \tJavaFilemidpjar.log,, -Dstartupmode=1 \tJavaFile\scripts\midpjartest.txt \tJavaFilemidpjar.log, 300, UDEB#UREL,\epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat,
-tJavaFile, \tJavaFilemidpjad.log,, -Dstartupmode=1 \tJavaFile\Scripts\midpjadtest.txt \tJavaFilemidpjad.log, 300, UDEB#UREL,\epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat,
-tJavaFile, \tJavaFileattribute.log,, -Dstartupmode=1 \tJavaFile\Scripts\attributestest.txt \tJavaFileattribute.log, 300, UDEB#UREL,\epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat,
-
-tJavaHelper, \tJavaHelper.log,, -Dstartupmode=1 \tJavaHelper\Scripts\MIDPLaunchInfoTest.txt \tJavaHelper.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tJavaInstaller.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tJavaInstaller.txt \tJavaInstaller.log, 3000, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tJavaInstallerocsp.log,, \tJavaHelper\Scripts\tJavaInstallerocsp.txt \tJavaInstallerocsp.log, 1500, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tjmiocsphttpfilter.log,, \tJavaHelper\Scripts\tjmiocsphttpfilter.txt \tjmiocsphttpfilter.log, 1500, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tjmiocspallerrors.log,, \tJavaHelper\Scripts\tjmiocspallerrors.txt \tjmiocspallerrors.log, 1500, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmiocspallerrors.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmiocspallerrors.bat
-tJavaHelper, \tjmiocspfilterallerrors.log,, \tJavaHelper\Scripts\tjmiocspfilterallerrors.txt \tjmiocspfilterallerrors.log, 1500, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmiocspallerrors.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmiocspallerrors.bat
-tJavaHelper, \tjavainstall_noplugin.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tjavainstall_noplugin.txt \tjavainstall_noplugin.log, 600, UDEB#UREL, \epoc32\winscw\c\tjavahelper\scripts\backup_jmi_plugin.bat, \epoc32\winscw\c\tjavahelper\scripts\restore_jmi_plugin.bat
-tJavaHelper, \tjavarunoninstall.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tjavarunoninstall.txt \tjavarunoninstall.log, 3600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tJavaMultiInstaller.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tJavaMultiInstaller.txt \tJavaMultiInstaller.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-
-tJavaHelper, \tjmiotaex.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tjmiotaex.txt \tjmiotaex.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-tJavaHelper, \tjmioom.log,, -Dstartupmode=1 \tJavaHelper\Scripts\tjmioom.txt \tjmioom.log, 3300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-
-
-TESTEXECUTE, \logs\testexecute\tjavahelperserver.htm,, -Dtextshell -- \private\10204805\scripts\tjavahelperserver.script, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\cenrep_cleanup.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-
-tJarDownloader, \tJarDownloader.log,, -Dstartupmode=1 \tJarDownloader\scripts\script1.txt \tJarDownloader.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
-
-TESTEXECUTE, \logs\testexecute\tmidletuaheaderfilter.htm,, -Dtextshell -- \tmidletuaheaderfilter\tmidletuaheaderfilter.script, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmi.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\preparetjardownloader.bat
-
-ITHARNESSMIDP, \itharnessmidp-conf1.log,, \JAVATEST.TXT \itharnessmidp-conf1.log, 1600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat,
-ITHARNESSMIDP, \itharnessmidp-conf2.log,, \JAVATEST2.TXT \itharnessmidp-conf2.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\backup_jmi_autodeletefiles.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\replace_jmi_autodeletefiles.bat
-ITHARNESSMIDP, \itharnessmidp-conf3.log,, \JAVATEST3.TXT \itharnessmidp-conf3.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat,
-ITHARNESSMIDP, \itharnessmidp-conf4.log,, \OTATests.txt \itharnessmidp-conf4.log, 1200, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_otasetup.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat revertotasetup
-ITHARNESSMIDP, \leavetest.log,, \leavetest.txt \leavetest.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat auto.cfg,
-ITHARNESSMIDP, \itharnessmidp-conf5.log,, \javaiaptest.txt \itharnessmidp-conf5.log, 1200, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat prompt.cfg, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\runced c:\auto.cfg
-
-ITHARNESSMIDP, \itharnessmidp-ocsp-default.log,, \itharnessmidp\scripts\ocsp-Default.txt \itharnessmidp-ocsp-default.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat ocsp-default,
-ITHARNESSMIDP, \itharnessmidp-ocsp-allWarnings.log,, \itharnessmidp\scripts\ocsp-allWarnings.txt \itharnessmidp-ocsp-allWarnings.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat ocsp-allWarnings,
-ITHARNESSMIDP, \itharnessmidp-ocsp-allErrors.log,, \itharnessmidp\scripts\ocsp-allErrors.txt \itharnessmidp-ocsp-allErrors.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy_allerrors.bat ocsp-allErrors, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_cert_copy_allerrors.bat
-
-# WinSignMIDlet test
-PERL, \winsignmidlet_test.txt,, -Dtextshell -- %SECURITYSOURCEDIR%\JavaMIDletInstaller\test\tWinSignMIDlet\testwinsignmidlet.pl, 300, UDEB#UREL,,
-
-
-
-[Certman]
-# PKCS7 tests - these run using testexecute
-TESTEXECUTE, \logs\testexecute\tpkcs7_v2.htm,, -Dtextshell -- \tpkcs7\tpkcs7_v2.script, 300, UDEB#UREL,,
-
-# PKCS12 tests - these run using testexecute
-TESTEXECUTE, \logs\testexecute\tpkcs12lib.htm,, -Dtextshell -- \tpkcs12intg\data\tpkcs12lib.script, 600, UDEB#UREL,,
-# CMS tests - these run using testexecute
-TESTEXECUTE, \logs\testexecute\tcms.htm,, -Dtextshell -- \tpkcs7\tcms.script, 300, UDEB#UREL,,
-# CMS tests by integration - these run using testexecute
-TESTEXECUTE, \logs\testexecute\tinteg_cms.htm,, -Dtextshell -- \tpkcs7\tinteg_cms.script, 1200, UDEB#UREL,,
-# New tpkcs10 testframe work these run using testexecute
-TESTEXECUTE, \logs\testexecute\tpkcs10_v2.htm,, -Dtextshell -- \tpkcs10\scripts\tpkcs10_v2.script, 900, UDEB#UREL, \epoc32\winscw\c\tpkcs10\batchfiles\t_pkcs10_backup.bat, \epoc32\winscw\c\tpkcs10\batchfiles\t_pkcs10_cleanup.bat
-#New tpkixcert tests using TEF framework
-TESTEXECUTE, \logs\testexecute\tpkixcert_tef.htm,, -Dtextshell -- \tpkixcert_tef\scripts\tpkixcert_tef.script, 900, UDEB#UREL,,
-
-# TMS SUPPORT
-TASN1, \logs\testexecute\TASN1.htm,, -Dtextshell -- \tasn1\scripts\tasn1.script \logs\testexecute\tasn1.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tasn1\scripts\batchfiles\tasn1_cleanup.bat
-Tx509, \logs\testexecute\tx509.htm,, -Dtextshell -- \tx509\scripts\tx509.script \logs\testexecute\tx509.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tx509\scripts\batchfiles\tx509_cleanup.bat
-Tx509, \logs\testexecute\tx509_dev_certs.htm,, -Dtextshell -- \tx509\scripts\tx509_dev_certs.script \logs\testexecute\tx509_dev_certs.htm, 300, UDEB#UREL,,
-Tx509, \logs\testexecute\outFileOOM1.htm,, -Dtextshell -- \TX509\SCRIPTS\TX509-OOM1.script \logs\testexecute\outFileOOM1.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tx509\scripts\batchfiles\tx509_cleanup.bat
-Tx509, \logs\testexecute\outFileOOM2.htm,, -Dtextshell -- \TX509\SCRIPTS\TX509-OOM2.script \logs\testexecute\outFileOOM2.htm, 300, UDEB#UREL,,
-Tx509, \logs\testexecute\tx509_dev_certs_oom.htm,, -Dtextshell -- \tx509\scripts\tx509_dev_certs_oom.script \logs\testexecute\tx509_dev_certs_oom.htm, 300, UDEB#UREL,,
-tx509, \logs\testexecute\tx509_dnames.htm,, -Dtextshell -- \tx509\scripts\tx509-dnames.script \logs\testexecute\tx509_dnames.htm, 300, UDEB#UREL,,
-
-# TMS SUPPORT
-TWTLSCERT, \logs\testexecute\twtlscert.htm,, -Dtextshell -- \twtlscert\scripts\twtlscert.script \logs\testexecute\twtlscert.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TWTLSCERT, \logs\testexecute\wtlstests1.htm,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT1.script \logs\testexecute\wtlstests1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TWTLSCERT, \logs\testexecute\wtlstests2.htm,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT2.script \logs\testexecute\wtlstests2.htm, 300, UDEB#UREL,, \epoc32\winscw\c\twtlscert\scripts\batchfiles\twtlscert_cleanup.bat
-TWTLSCERT, \logs\testexecute\wtlstests3.htm,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT3.script \logs\testexecute\wtlstests3.htm, 900, UDEB#UREL,, \epoc32\winscw\c\twtlscert\scripts\batchfiles\twtlscert_cleanup.bat
-
-# TMS SUPPORT
-TPKIXCERT, \logs\testexecute\TPKIXCERT_log1.htm,, -Dtextshell -- \TPKIXCERT\SCRIPTS\TPKIXTEST_part1.script \logs\testexecute\TPKIXCERT_log1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \logs\testexecute\TPKIXCERT_log2.htm,, -Dtextshell -- \TPKIXCERT\SCRIPTS\TPKIXTEST_part2.script \logs\testexecute\TPKIXCERT_log2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \logs\testexecute\TPKIXCERT_logcancel.htm,, -Dtextshell -- \TPKIXCERT\SCRIPTS\CANCEL1.script \logs\testexecute\TPKIXCERT_logcancel.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \logs\testexecute\TPKIXCERT_logoom1.htm,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM1.script \logs\testexecute\TPKIXCERT_logoom1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \logs\testexecute\TPKIXCERT_logoom2.htm,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM2.script \logs\testexecute\TPKIXCERT_logoom2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \logs\testexecute\TPKIXCERT_logoom3.htm,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM3.script \logs\testexecute\TPKIXCERT_logoom3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \logs\testexecute\TPKIXCERT_logoom4.htm,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM4.script \logs\testexecute\TPKIXCERT_logoom4.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
-
-# TMS SUPPORT
-tocsp, \logs\testexecute\tocsp_openssl.htm,, \system\tocsp\scripts\openssl.script \logs\testexecute\tocsp_openssl.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logxcert_local.htm,, \system\tocsp\scripts\xcert-local.script \logs\testexecute\tocsp_logxcert_local.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logopenssl_local.htm,, \system\tocsp\scripts\openssl-local.script \logs\testexecute\tocsp_logopenssl_local.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logerror.htm,, \system\tocsp\scripts\error.script \logs\testexecute\tocsp_logerror.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_defaultpolicy.htm,, \system\tocsp\scripts\defaultpolicy.script \logs\testexecute\tocsp_defaultpolicy.htm, 300, UDEB,,
-tocsp, \logs\testexecute\tocsp_newpolicy.htm,, \system\tocsp\scripts\newpolicy.script \logs\testexecute\tocsp_newpolicy.htm, 300, UDEB, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat 2002b28b-new.txt, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat 2002b28b.txt
-tocsp, \logs\testexecute\tocsp_httpinterface.htm,, \system\tocsp\scripts\httpinterface.script \logs\testexecute\tocsp_httpinterface.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
-
-tocsp, \logs\testexecute\tocsp_openssl.htm,, -Dtextshell -- \system\tocsp\scripts\openssl.script \logs\testexecute\tocsp_openssl.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logxcert_local.htm,, -Dtextshell -- \system\tocsp\scripts\xcert-local.script \logs\testexecute\tocsp_logxcert_local.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logopenssl_local.htm,, -Dtextshell -- \system\tocsp\scripts\openssl-local.script \logs\testexecute\tocsp_logopenssl_local.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logerror.htm,, -Dtextshell -- \system\tocsp\scripts\error.script \logs\testexecute\tocsp_logerror.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_defaultpolicy.htm,, -Dtextshell -- \system\tocsp\scripts\defaultpolicy.script \logs\testexecute\tocsp_defaultpolicy.htm, 300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat donothing,
-tocsp, \logs\testexecute\tocsp_newpolicy.htm,, -Dtextshell -- \system\tocsp\scripts\newpolicy.script \logs\testexecute\tocsp_newpolicy.htm, 300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat 2002b28b-new.txt, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat 2002b28b.txt
-tocsp, \logs\testexecute\tocsp_httpinterface.htm,, -Dtextshell -- \system\tocsp\scripts\httpinterface.script \logs\testexecute\tocsp_httpinterface.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
-tocsp, \logs\testexecute\tocsp_logoom.htm,, -Dtextshell -- \system\tocsp\scripts\xcert-oom.script \logs\testexecute\tocsp_logoom.htm, 900, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-
-
-# TMS SUPPORT
-t_certstore, \logs\testexecute\tcertstore_conf1.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf1.script \logs\testexecute\tcertstore_conf1.1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_conf1.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf1.script \logs\testexecute\tcertstore_conf1.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_conf1.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf1.script \logs\testexecute\tcertstore_conf1.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\t_handle_1.htm,, -Dtextshell -- \tcertstore\scripts\t_handle_1.script \logs\testexecute\t_handle_1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
-//TEF Format
-t_certstore, \logs\testexecute\t_certstore_sha2.htm,, -Dtextshell -- \tcertstore\scripts\t_certstore_sha2.script \logs\testexecute\t_certstore_sha2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
-# TMS SUPPORT
-t_certstore, \logs\testexecute\tcertstore_oom.conf1.1.htm,, -Dtextshell -- \tcertstore\scripts\oom1.script \logs\testexecute\tcertstore_oom.conf1.1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_oom.conf1.2.htm,, -Dtextshell -- \tcertstore\scripts\oom2.script \logs\testexecute\tcertstore_oom.conf1.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_oom.conf1.3.htm,, -Dtextshell -- \tcertstore\scripts\oom3.script \logs\testexecute\tcertstore_oom.conf1.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_cancel.conf1.1.htm,, -Dtextshell -- \tcertstore\scripts\cancel1.script \logs\testexecute\tcertstore_cancel.conf1.1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_dsa.conf1.htm,, -Dtextshell -- \tcertstore\scripts\dsa.script \logs\testexecute\tcertstore_dsa.conf1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_reload.htm,, -Dtextshell -- \tcertstore\scripts\reload.script \logs\testexecute\tcertstore_reload.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_apipolicing.htm,, -Dtextshell -- \tcertstore\scripts\apipolicing.script \logs\testexecute\tcertstore_apipolicing.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_errors.htm,, -Dtextshell -- \tcertstore\scripts\filecertstore_errors.script \logs\testexecute\tcertstore_errors.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
-
-
-# Configuration 2
-# Configuration 2 - TMS SUPPORT
-t_certstore, \logs\testexecute\tcertstore_conf2.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.script \logs\testexecute\tcertstore_conf2.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configuration2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
-t_certstore, \logs\testexecute\tcertstore_conf2.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf2.script \logs\testexecute\tcertstore_conf2.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_conf2.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf2.script \logs\testexecute\tcertstore_conf2.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
-
-# Configuration 2a (asynch store)
-# Configuration 2a TMS SUPPORT
-t_certstore, \logs\testexecute\tcertstore_conf2a.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.script \logs\testexecute\tcertstore_conf2a.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configuration2a.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
-t_certstore, \logs\testexecute\tcertstore_conf2a.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf2a.script \logs\testexecute\tcertstore_conf2a.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_conf2a.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf2.script \logs\testexecute\tcertstore_conf2a.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
-
-# Configuration 3
-# Configuration 3 TMS SUPPORT
-t_certstore, \logs\testexecute\tcertstore_conf3.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf3.script \logs\testexecute\tcertstore_conf3.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configuration3.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
-t_certstore, \logs\testexecute\tcertstore_conf3.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf3.script \logs\testexecute\tcertstore_conf3.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \logs\testexecute\tcertstore_conf3.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf3.script \logs\testexecute\tcertstore_conf3.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
-
-# Configuration multicertstore
-
-t_certstore, \logs\testexecute\tcertstore_multi.htm,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter.script \logs\testexecute\tcertstore_multi.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configurationmulti.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
-
-# Configuration multicertstore 1
-
-t_certstore, \logs\testexecute\tcertstore_multi.1.htm,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter1.script \logs\testexecute\tcertstore_multi.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configurationmulti1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
-
-# Configuration multicertstore 2
-
-t_certstore, \logs\testexecute\tcertstore_multi.2.htm,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter2.script \logs\testexecute\tcertstore_multi.2.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configurationmulti2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
-
-# Configuration 4
-# Configuration 4 TMS SUPPORT
-t_certstore, \logs\testexecute\swicertstore1.htm,, -Dtextshell -- \tcertstore\scripts\swicertstore1.script \logs\testexecute\swicertstore1.htm, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \logs\testexecute\swicertstore2.htm,, -Dtextshell -- \tcertstore\scripts\swicertstore2.script \logs\testexecute\swicertstore2.htm, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \logs\testexecute\swicertstore4.htm,, -Dtextshell -- \tcertstore\scripts\swicertstore4.script \logs\testexecute\swicertstore4.htm, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \logs\testexecute\swicertstore_oom.htm,, -Dtextshell -- -o \tcertstore\scripts\swicertstore1.script \logs\testexecute\swicertstore_oom.htm, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \logs\testexecute\swicertstore_cancel.htm,, -Dtextshell -- -c \tcertstore\scripts\swicertstore1.script \logs\testexecute\swicertstore_cancel.htm, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \logs\testexecute\wri-swicertstore1.htm,, -Dtextshell -- \tcertstore\scripts\wri-swicertstore1.script \logs\testexecute\wri-swicertstore1.htm,300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \logs\testexecute\wri-swicertstore2.htm,, -Dtextshell -- \tcertstore\scripts\wri-swicertstore2.script \logs\testexecute\wri-swicertstore2.htm,300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-
-
-# Configuration 5
-# Configuration 5 TMS SUPPORT
-t_certstore, \logs\testexecute\wri-swicertstore3.htm,, -Dtextshell -- \tcertstore\scripts\wri-swicertstore3.script \logs\testexecute\wri-swicertstore3.htm,300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup1.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-
-
-######### Composite Certstore Testing###################################################################################
-# Composite Certstore Testing - TMS SUPPORT
-
-t_certstore, \logs\testexecute\tfilecertstore01.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore01.script \logs\testexecute\tfilecertstore01.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 5 void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore02.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore02.script \logs\testexecute\tfilecertstore02.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 6 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore03.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore03.script \logs\testexecute\tfilecertstore03.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 4 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore04.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore04.script \logs\testexecute\tfilecertstore04.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 6 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore05.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore05.script \logs\testexecute\tfilecertstore05.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 4 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore06.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore06.script \logs\testexecute\tfilecertstore06.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore07.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore07.script \logs\testexecute\tfilecertstore07.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 4 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore08.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore08.script \logs\testexecute\tfilecertstore08.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt middle 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore09.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore09.script \logs\testexecute\tfilecertstore09.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore10.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore10.script \logs\testexecute\tfilecertstore10.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 5 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore11.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore11.script \logs\testexecute\tfilecertstore11.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore renamed 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore12.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore12.script \logs\testexecute\tfilecertstore12.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore13.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore13.script \logs\testexecute\tfilecertstore13.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 3 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore14.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore14.script \logs\testexecute\tfilecertstore14.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt middle 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore15.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore15.script \logs\testexecute\tfilecertstore15.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 0 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore16.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore16.script \logs\testexecute\tfilecertstore16.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore17.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore17.script \logs\testexecute\tfilecertstore17.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tfilecertstore18.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore18.script \logs\testexecute\tfilecertstore18.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 5 3 2 1 0, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-
-t_certstore, \logs\testexecute\tswicertstore01.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore01.script \logs\testexecute\tswicertstore01.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 5 void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore02.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore02.script \logs\testexecute\tswicertstore02.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 6 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore03.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore03.script \logs\testexecute\tswicertstore03.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 4 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore04.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore04.script \logs\testexecute\tswicertstore04.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 6 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore05.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore05.script \logs\testexecute\tswicertstore05.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 4 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore06.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore06.script \logs\testexecute\tswicertstore06.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore07.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore07.script \logs\testexecute\tswicertstore07.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 4 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore08.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore08.script \logs\testexecute\tswicertstore08.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt middle 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore09.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore09.script \logs\testexecute\tswicertstore09.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore10.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore10.script \logs\testexecute\tswicertstore10.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 5 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore11.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore11.script \logs\testexecute\tswicertstore11.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore renamed 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore12.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore12.script \logs\testexecute\tswicertstore12.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore13.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore13.script \logs\testexecute\tswicertstore13.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 3 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore14.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore14.script \logs\testexecute\tswicertstore14.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt middle 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore15.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore15.script \logs\testexecute\tswicertstore15.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 0 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore16.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore16.script \logs\testexecute\tswicertstore16.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore17.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore17.script \logs\testexecute\tswicertstore17.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore18.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore18.script \logs\testexecute\tswicertstore18.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 5 3 2 1 0, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \logs\testexecute\tswicertstore19.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore19.script \logs\testexecute\tswicertstore19.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore writable void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-
-
-######### Composite Certstore Testing###################################################################################
-
-
-[SWI]
-# Requires the following additional components to be built: SisTools, Certman
-
-TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\copyswitestfiles.bat,
-
-#NQP Tests for DataProvider
-TESTEXECUTE, \logs\testexecute\tdataprovider.htm,, -Dstartupmode=1 -- z:\tswi\tdataprovider\scripts\tdataprovider.script, 600, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\testwritableswicertstore.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testwritableswicertstore.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\cleanswicertstore.bat
-TESTEXECUTE, \logs\testexecute\tsilent_winscw.htm,, \tswi\tuiscriptadaptors\scripts\tsilent_winscw.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\cleanswicertstore.bat
-TESTEXECUTE, \logs\testexecute\tswidaemonstub.htm,, \tswi\tuiscriptadaptors\scripts\tswidaemonstub.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\inc098114_winscw.htm,, \tswi\tuiscriptadaptors\scripts\inc098114_winscw.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat
-TESTEXECUTE, \logs\testexecute\tcleanupinfrastructure.htm,, \tswi\tuiscriptadaptors\scripts\tcleanupinfrastructure.script, 300, UDEB#UREL,\epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tcleanupinfrastructure_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tcleanupinfrastructure_post.bat
-
-TESTEXECUTE, \logs\testexecute\tsis.htm,, \tswi\tsis\scripts\tsis.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsis_signed.htm,, -Dstartupmode=1 -- \tswi\tsis\scripts\tsis_signed.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsis_failure.htm,, -Dstartupmode=1 -- \tswi\tsis\scripts\tsis_failure.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsis_large.htm,, -Dstartupmode=1 -- \tswi\tsis\scripts\tsis_large.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsis_new_recognizer.htm,, \tswi\tsis\scripts\tsis_new_recognizer.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tsis\batchfiles\new_recognizer_pre.bat, \epoc32\winscw\c\tswi\tsis\batchfiles\new_recognizer_post.bat
-TESTEXECUTE, \logs\testexecute\tsishelper.htm,, -Dstartupmode=1 -- \tswi\tsishelper\scripts\tsishelper.script, 300, UDEB#UREL,,
-
-[IntegrityServices]
-TESTEXECUTE, \logs\testexecute\tstartuprecovery.htm,, \tswi\tintegrityservices\scripts\tstartuprecovery.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tintegrityservices\scripts\batchfiles\recoverystartup_pre.bat,
-TESTEXECUTE, \logs\testexecute\tintegrityservices.htm,, -Dstartupmode=1 -- \tswi\tintegrityservices\scripts\tintegrityservices.script, 300, UDEB#UREL,,
-
-[SWI]
-TESTEXECUTE, \logs\testexecute\testexpressions.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testexpressions.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testdrives.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrives.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testlocations.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testlocations.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testupgrades.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testupgrades.script, 300, UDEB#UREL,\epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\cleanswicertstore.bat
-
-TESTEXECUTE, \logs\testexecute\testaugmentations.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testaugmentations.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testpreinstalled.htm,, \tswi\tuiscriptadaptors\scripts\testpreinstalled.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testpreinstalled_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testpreinstalled_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testdependencies.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdependencies.script, 300, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\tuiscriptadaptors.htm,, \tswi\tuiscriptadaptors\scripts\tuiscriptadaptors.script, 10000, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuiscriptadaptors_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuiscriptadaptors_post.bat
-TESTEXECUTE, \logs\testexecute\tuiscriptadaptors_winscw.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tuiscriptadaptors_winscw.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat,
-TESTEXECUTE, \logs\testexecute\testvids.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testvids.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tuiscriptadaptorsFH.htm,, \tswi\tuiscriptadaptors\scripts\tuiscriptadaptorsFH.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat,
-
-TESTEXECUTE, \logs\testexecute\testrucert.htm,, \tswi\tuiscriptadaptors\scripts\testrucert.script, 500, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\romupdate_withoutstubs_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\romupdate_withoutstubs_post.bat
-
-TESTEXECUTE, \logs\testexecute\testrun.htm,, \tswi\tuiscriptadaptors\scripts\testrun.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testrunft.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrunft.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini,
-
-TESTEXECUTE, \logs\testexecute\testrun2.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrun2.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_notallowrun.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testshutdown.htm,, \tswi\tuiscriptadaptors\scripts\testshutdown.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testasync.htm,, \tswi\tuiscriptadaptors\scripts\testasync.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat,
-TESTEXECUTE, \logs\testexecute\testasynccancel.htm,, \tswi\tuiscriptadaptors\scripts\testasynccancel.script, 3000, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\tsisstub.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tsisstub.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsisstub_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tsisstub_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testasynccaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testasynccaps.script, 300, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\devcerts_match.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_match.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat
-TESTEXECUTE, \logs\testexecute\devcerts_mismatch.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_mismatch.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\devcerts_aggregate.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_aggregate.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\devcerts_corrupt.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_corrupt.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\devcerts_ocsp.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_ocsp.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\devcerts_backuprestore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backuprestore.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat
-TESTEXECUTE, \logs\testexecute\devcerts_backup.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backup.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat
-TESTEXECUTE, \logs\testexecute\devcerts_restore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_restore.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\changedevid.bat, \epoc32\winscw\c\tswi\tdevcerts\scripts\batchfiles\devcerts_restore_post.bat
-
-TESTEXECUTE, \logs\testexecute\tsisregistrytest.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\tsisregistrytest.script, 1500, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat, \epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\tsisregistrytest_post.bat
-TESTEXECUTE, \logs\testexecute\testVFPOnEmulator.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testVFPOnEmulator.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tdaemon.htm,, -Dstartupmode=1 -- \tswi\tdaemon\scripts\tdaemon.script, 300, UDEB#UREL,,
-
-# createandsignunicode.pl needs to be run as it builds some SIS files the following tests rely on, however it is a SisTools test so it is run through a batch file and the results not recorded here
-TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\callcreateandsignunicode.bat,
-TESTEXECUTE, \logs\testexecute\tbackuprestore.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore.script, 1500, UDEB#UREL,\epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_post.bat
-TESTEXECUTE, \logs\testexecute\tbackuprestoredrive_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestoredrive_emulator.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tbackuprestore_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_post.bat
-TESTEXECUTE, \logs\testexecute\tbackuprestore_policy_prepost_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_policy_prepost_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_policy_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_policy_post.bat
-TESTEXECUTE, \logs\testexecute\tbackuprestore_policylst_certfst_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_policylst_certfst_emulator.script, 300, UDEB#UREL, ,
-TESTEXECUTE, \logs\testexecute\tbackuprestore_cert_prepost_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_cert_prepost_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_cert_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_cert_post.bat
-TESTEXECUTE, \logs\testexecute\tbackuptrestore_exploratory.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuptrestore_exploratory.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_udeb.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_udeb.script, 300, UDEB,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\premeta.bat,
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_urel.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_urel.script, 300, UREL,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\premeta.bat,
-
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_udeb.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_udeb.script, 300,UDEB,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_urel.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_urel.script, 300,UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
-TESTEXECUTE, \logs\testexecute\trevocation.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\trevocation.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\trevocation_unsigned.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\trevocation_unsigned.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\tautosigning.htm,, -Dstartupmode=1 -- \tswi\tautosigning\scripts\tautosigning.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testdrm.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrm.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testdrmasync.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrmasync.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testdrmFH.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrmFH.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testdiskfullemulator.htm,, \tswi\tuiscriptadaptors\scripts\testdiskfullemulator.script, 300, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\testcancel.htm,, \tswi\tuiscriptadaptors\scripts\testcancel.script, 1500, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testmandatory.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testmandatory.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore.dat
-TESTEXECUTE, \logs\testexecute\testnotargetdevices.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnotargetdevices.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_incompifnotargetdevices.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testsystemcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testsystemcaps.script, 300, UDEB, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore.dat,
-TESTEXECUTE, \logs\testexecute\testsystemcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testsystemcaps.script, 300, UREL,,
-TESTEXECUTE, \logs\testexecute\testusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps.script, 300, UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
-TESTEXECUTE, \logs\testexecute\testusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps.script, 300, UDEB,,
-
-TESTEXECUTE, \logs\testexecute\testusercaps_nousergrantcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_nousergrantcaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_nousergrantcaps.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testusercaps_restrictedusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_restrictedusercaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_restrictedusercaps.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testnoorphanedoverwrite.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnoorphanedoverwrite.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_noorphanedoverwrite.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\overwriteprivate.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_noprotectedorphanoverwrite.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\overwriteprivate_positive.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script, 300, UDEB, \epoc32\release\winscw\UDEB\Z\tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\overwriteprivate_positive.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script, 300, UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testallowunsigned.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testallowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\tpathsubst.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubst.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_pathsubst.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\tpathsubstsysdrive.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubstsysdrive.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_verifysysdrive.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-TESTEXECUTE, \logs\testexecute\tpropagation_winscw.htm,, -Dtextshell -- \tswi\tuiscriptadaptors\scripts\tpropagation_winscw.script, 600, UDEB#UREL,,
-
-
-TESTEXECUTE, \logs\testexecute\testeclipseemulator.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testeclipseemulator.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\pre_testeclipseemulator.bat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\delstubtemp.bat
-
-TESTEXECUTE, \logs\testexecute\testeclipse.htm,, \tswi\tuiscriptadaptors\scripts\testeclipse.script, 500, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testeclipse_pre.bat,\epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testeclipse_post.bat
-
-TESTEXECUTE, \logs\testexecute\swicaptests.htm,, -Dstartupmode=1 -- \tswi\swicaptests\scripts\swicaptests.script, 500, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\testappinuse.htm,, \tswi\tuiscriptadaptors\scripts\testappinuse.script, 1500, UDEB#UREL,,
-
-
-TESTEXECUTE, \logs\testexecute\switermination.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\switermination.script, 500, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\tuileavedialog.htm,, \tswi\tuiscriptadaptors\scripts\tuileavedialog.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuileavedialog_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuileavedialog_post.bat
-TESTEXECUTE, \logs\testexecute\tuileavedialogasync.htm,, \tswi\tuiscriptadaptors\scripts\tuileavedialogasync.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuileavedialog_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuileavedialog_post.bat
-
-TESTEXECUTE, \logs\testexecute\cr956_test.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\cr956_test.script, 2000, UDEB#UREL,,
-
-TESTEXECUTE, \logs\testexecute\testuninstallation.htm,, \tswi\tuiscriptadaptors\scripts\testuninstallation.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testuninstallation_pre.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-TESTEXECUTE, \logs\testexecute\tuninstallpkgs.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tuninstallpkgs.script, 1000, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testlogging.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\testlogging.script, 100, UDEB#UREL,\epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.iniwinscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-TESTEXECUTE, \logs\testexecute\test_pa_sapropagated_notdelete.htm,, \tswi\tuiscriptadaptors\scripts\test_pa_sapropagated_notdelete.script, 100, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testpastub.htm,, \tswi\tuiscriptadaptors\scripts\testpastub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testsapropagatedstub.htm,, \tswi\tuiscriptadaptors\scripts\testsapropagatedstub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-
-# Extended Key Usage check while installation of signed sis files.
-TESTEXECUTE, \logs\testexecute\testextension.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
-TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning.ini,
-TESTEXECUTE, \logs\testexecute\testextension_alternatecodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_alternatecodesigningoid.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_altcodesigningoid.ini,
-TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning_altcodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning_altcodesigningoid.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning_altcodesigningoid.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-# SwiConsole Tests
-TESTEXECUTE, \logs\testexecute\tswiconsole.htm,, -Dstartupmode=1 -- \tswi\tswiconsole\scripts\tswiconsole.script, 300, UDEB#UREL,
-TESTEXECUTE, \logs\testexecute\tswiconsole_allowunsigned.htm,, -Dstartupmode=1 -- \tswi\tswiconsole\scripts\tswiconsole_allowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-TESTEXECUTE, \logs\testexecute\testmulti.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testmulti.script, 300, UDEB#UREL,
-TESTEXECUTE, \logs\testexecute\generateregistrytestdata.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\generateregistrytestdata.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\runregistrytests.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\runregistrytests.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\removeregistrytestdata.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\removeregistrytestdata.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\truststatus.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\truststatus.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testtruststatus.htm,, \tswi\tuiscriptadaptors\scripts\testtruststatus.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tresetdevice.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tresetdevice.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-
-# Test Non-Removable Flag
-TESTEXECUTE, \logs\testexecute\testnonremovable.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnonremovable.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testnonremovable_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testnonremovable_post.bat
-
-# Adorned filename handling tests
-TESTEXECUTE, \logs\testexecute\adornedfilenames.htm,, \tswi\tuiscriptadaptors\scripts\adornedfilenames.script, 300, UDEB#UREL,, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\adornedfilenames_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\adornedfilenames_post.bat
-
-# Testing asynchronous cancellation of installation
-TESTEXECUTE, \logs\testexecute\asynccancel.htm,, \tswi\tasynccancel\scripts\asynccancel.script, 10000, UDEB,,
-
-# DevInfoSupport test -
-tdevinfosupport,\swi.log,,-Dtextshell -- , 300, UDEB,,
-
-# DemandPaging tests - these run using testexecute
-TESTEXECUTE, \logs\testexecute\tdempaging_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tuiscriptadaptors\scripts\tdempaging_winscw.script, 1000, UDEB#UREL,,
-
-#CR0914 Tests
-TESTEXECUTE, \logs\testexecute\integritychecktest.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest.script, 1000, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\integritychecktest5Install_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest5Install_winscw.script, 1000, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\integritychecktest5verify_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest5verify_winscw.script, 1000, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat some_swicertstore.dat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore.dat
-
-TESTEXECUTE, \logs\testexecute\testswiobserver.htm,, -Dstartupmode=1 -- z:\tswi\tswiobserver\scripts\testswiobserver.script, 300, UDEB#UREL,,
-swiobservertest.exe, \swiobservertest.log,, , 800, UDEB#UREL,,
-swiobservertestoom.exe, \swiobservertestoom.log,, , 800, UDEB#UREL,,
-
-
-[SwiDiran]
-TESTEXECUTE, \logs\testexecute\tswiregcompfields.htm,, \tswi\tuiscriptadaptors\scripts\tswiregcompfields.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tswtype.htm,, \tswi\tuiscriptadaptors\scripts\tswtype.script, 300, UDEB#UREL,,
-
-[SISInstaller]
-tIntegritySupport, \tisrecovery.log,, -Dtextshell -- \tIntegritySupport\scripts\tisrecovery.txt \tisrecovery.log, 300, UDEB#UREL,, \epoc32\winscw\c\tIntegritySupport\scripts\batchfiles\tIntegritySupport_post.bat
-tIntegritySupport, \tisrecoveryapp.log,, -Dtextshell -- \tIntegritySupport\scripts\tisrecoveryapp.txt \tisrecoveryapp.log, 300, UDEB#UREL,,
-
-tInstalledAppsRegistry, \tInstalledAppsRegistry.log,, -Dtextshell -- \tInstalledAppsRegistry\scripts\script1.txt \tInstalledAppsRegistry.log, 300, UDEB#UREL, \epoc32\winscw\c\tInstalledAppsRegistry\scripts\batchfiles\tInstalledAppsRegistry_pre.bat, \epoc32\winscw\c\tInstalledAppsRegistry\scripts\batchfiles\tInstalledAppsRegistry_post.bat
-
-
-
-[Asnpkcs]
-# TMS SUPPORT
-TASNPKCS, \logs\testexecute\tasnpkcstests.htm,, -Dtextshell -- \tasnpkcstests.script \logs\testexecute\tasnpkcstests.htm, 300, UDEB#UREL,,
-
-
-[Filetokens]
-TESTEXECUTE, \logs\testexecute\sec-filetokens-tools.htm,, -Dstartupmode=1 -- \ttesttools\scripts\sec-filetokens-tools.script, 600, UDEB#UREL, \epoc32\winscw\c\ttesttools\data\pretools.bat, \epoc32\winscw\c\ttesttools\data\posttools.bat
-
-# TMS support
-T_KEYSTORE, \logs\testexecute\tkeystore.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore.script \logs\testexecute\tkeystore.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\RemoveSecDlg.bat, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat
-
-T_KEYSTORE, \logs\testexecute\tkeystore_authobjects.htm,, -Dstartupmode=1 -- \tkeystore\scripts\authobjects.script \logs\testexecute\tkeystore_authobjects.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_authobject_post.bat
-
-T_KEYSTORE, \logs\testexecute\tkeystore_export.htm,, -Dstartupmode=1 -- \tkeystore\scripts\exportscript.script \logs\testexecute\tkeystore_export.htm, 300, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_oom.htm,, -Dstartupmode=1 -- \tkeystore\scripts\oom.script \logs\testexecute\tkeystore_oom.htm, 300, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_cancel.htm,, -Dstartupmode=1 -- \tkeystore\scripts\cancel.script \logs\testexecute\tkeystore_cancel.htm, 300, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_servoom.htm,, -Dstartupmode=1 -- \tkeystore\scripts\servoom.script \logs\testexecute\tkeystore_servoom.htm, 1800, UDEB,,
-T_KEYSTORE, \logs\testexecute\tkeystore_reload.htm,, -Dstartupmode=1 -- \tkeystore\scripts\reload.script \logs\testexecute\tkeystore_reload.htm, 300, UDEB#UREL,,
-
-
-# TMS support
-
-t_certapps, \logs\testexecute\tcertapps.htm,, -Dstartupmode=1 -- \tcertapps\scripts\script1.script \logs\testexecute\tcertapps.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certapps, \logs\testexecute\tcertapps-oom.htm,, -Dstartupmode=1 -- -o \tcertapps\scripts\script1.script \logs\testexecute\tcertapps-oom.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certapps, \logs\testexecute\tcertapps-apipolicing.htm,, -Dstartupmode=1 -- \tcertapps\scripts\apipolicing.script \logs\testexecute\tcertapps-apipolicing.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
-[FileTokens_UseAuth]
-T_KEYSTORE, \logs\testexecute\oldserver_newfeature.htm,, -Dstartupmode=1 -- \tkeystore\scripts\oldserver_newfeature.script \logs\testexecute\oldserver_newfeature.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\RemoveSecDlg.bat,
-# The batch file run as part of first test is requried for running all tests in this section.
-TESTEXECUTE, \logs\testexecute\initialize.htm,, -Dstartupmode=1 -- \tkeystore\scripts\initialize.script, 100, UDEB#UREL,,
-
-# TMS support
-T_KEYSTORE, \logs\testexecute\tkeystore_nouserregistered.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_nouserregistered.script \logs\testexecute\tkeystore_nouserregistered.htm, 300, UDEB#UREL, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_pre.bat,
-
-# the execution of this code is a prerequisite for running the keystore tests against the test plugins.
-
-TESTEXECUTE, \logs\testexecute\reg_first_identity.htm,, -Dstartupmode=1 -- \tkeystore\scripts\reg_first_identity.script, 100, UDEB#UREL,,
-# These set of tests run when keystore has been enabled to use authentication server.
-
-# TMS support
-T_KEYSTORE, \logs\testexecute\tkeystore_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_useauth.script \logs\testexecute\tkeystore_useauth.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat
-T_KEYSTORE, \logs\testexecute\tkeystore_authobjects_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\authobjects_useauth.script \logs\testexecute\tkeystore_authobjects_useauth.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_authobject_post.bat
-
-# TMS support
-T_KEYSTORE, \logs\testexecute\tkeystore_export_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\exportscript_useauth.script \logs\testexecute\tkeystore_export_useauth.htm, 300, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_oom_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\oom_useauth.script \logs\testexecute\tkeystore_oom_useauth.htm, 600, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_cancel_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\cancel_useauth.script \logs\testexecute\tkeystore_cancel_useauth.htm, 300, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_servoom_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\servoom_useauth.script \logs\testexecute\tkeystore_servoom_useauth.htm, 6000, UDEB,,
-T_KEYSTORE, \logs\testexecute\tkeystore_reload_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\reload_useauth.script \logs\testexecute\tkeystore_reload_useauth.htm, 300, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_capability_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\capability_useauth.script \logs\testexecute\tkeystore_capability_useauth.htm, 1800, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_createoldkeystore.htm,, -Dstartupmode=1 -- \tkeystore\scripts\createoldkeystore.script \logs\testexecute\tkeystore_createoldkeystore.htm, 1800, UDEB#UREL,\epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_migrate_pre.bat, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_migrate_copykeys.bat
-TESTEXECUTE, \logs\testexecute\keytool_migrate.htm,, -Dstartupmode=1 -- \ttesttools\scripts\keytool_migrate.script, 600, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_testnewkeystore.htm,, -Dstartupmode=1 -- \tkeystore\scripts\testnewkeystore.script \logs\testexecute\tkeystore_testnewkeystore.htm, 1800, UDEB#UREL,\epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_migrate_post.bat,
-
-
-# TMS support
-T_KEYSTORE, \logs\testexecute\tkeystore_authenticate_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\authenticate_useauth.script \logs\testexecute\tkeystore_authenticate_useauth.htm, 1800, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_authentication1.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication1.script \logs\testexecute\tkeystore_authentication1.htm, 1800, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\reg_second_identity.htm,, -Dstartupmode=1 -- \tkeystore\scripts\reg_second_identity.script, 100, UDEB#UREL,,
-T_KEYSTORE, \logs\testexecute\tkeystore_authentication2.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication2.script \logs\testexecute\tkeystore_authentication2.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_post.bat
-
-
-[ToolsLegacy]
-
-# Interpretsis Test Harness
-PERL, \interpretsis_test_harness.txt,,\epoc32\winscw\c\tswi\tinterpretsisinteg\runtest1.pl native, 1000, UDEB,,
-
-# DUMPSIS test
-PERL, \dumpsis_test.txt,,\epoc32\winscw\c\tswi\tdumpsis\testDumpsis.pl, 300, UDEB,,\epoc32\winscw\c\tswi\tdumpsis\postdumpsistest.bat
-
-[SisTools]
-# MAKESIS test
-# program,log,commdb,script,timeout,release,pre cmd,post cmd
-PERL, \createandsignunicode.txt,,\epoc32\winscw\c\tswi\tsignsis\createandsignunicode.pl, 300, UDEB#UREL,,
-
-PERL, \makesis_test.txt,,\epoc32\winscw\c\tswi\testMakesis.pl, 300, UDEB,,
-
-# SIGNSIS test
-PERL, \signsis_test.txt,,\epoc32\winscw\c\tswi\tsignsis\testSignsis.pl, 300, UDEB,,
-
-# Interpretsis
-PERL, \interpretsis_test.txt,,\epoc32\winscw\c\tswi\tinterpretsis\runtests.pl, 300, UDEB,,
-
-[ToolsNew]
-
-# Interpretsis Test Harness
-PERL, \interpretsis_test_harness.txt,,\epoc32\winscw\c\tswi\tinterpretsisinteg\runtest1.pl usifnative, 1000, UDEB,,
-
-# Interpretsis Test Harness - This test is for testing the installation using database to store registration information.
-PERL, \interpretsis_test_harness_db.txt,,\epoc32\winscw\c\tswi\tinterpretsisinteg\runtest1.pl usif, 1000, UDEB,,
-
-# tdbtool
-PERL, \tdbtool.txt,,\epoc32\winscw\c\tswi\tdbtool\tdbtool.pl, 300, UDEB,,\epoc32\winscw\c\tswi\tdbtool\postdbtool.bat
-
-# DUMPSIS test for USIF
-PERL, \dumpsis_test_usif.txt,,\epoc32\winscw\c\tswi\tdumpsis\testDumpsis.pl usif, 300, UDEB,,\epoc32\winscw\c\tswi\tdumpsis\postdumpsistest.bat
-
-[SwiTools]
-# DUMPCHAINVALIDITY test
-PERL, \dumpchainvalidity_test.txt,,\epoc32\winscw\c\tswi\tchainvalidity\testChainValidity.pl, 300, UDEB,,
-# DUMPINSTALLFILESTATUS test
-PERL, \dumpinstallstatus_test.txt,,\epoc32\winscw\c\tswi\tinstallfilestatus\testInstallStatus.pl, 300, UDEB,,
-
-[SwiTools95Only]
-# DUMPSWICERTSTORE test
-PERL, \dumpswicertstore_test.txt,,\epoc32\winscw\c\tswi\tdumpcertstore\testswiCertstore.pl, 600, UDEB,\epoc32\winscw\c\tswi\tdumpcertstore\predumpcertstoretest.bat, \epoc32\winscw\c\tswi\tdumpcertstore\postdumpcertstoretest.bat
-# DUMPSWIREGISTRY test
-PERL, \dumpregistry_test.txt,,\epoc32\winscw\c\tswi\tdumpregistry\testregistry.pl, 300, UDEB,,
-
-[CryptoSpi]
-TESTEXECUTE, \logs\testexecute\tcryptospi.htm,, -Dtextshell -- \testdata\tcryptospi\scripts\tcryptospi.script, 900, UDEB#UREL,,
-tmacapiusage.exe, \t_mac_apis.log,, -Dtextshell -- , 600, UDEB#UREL,,
-
-
-[UPS]
-# UPS tests by integration - these run using testexecute
-TESTEXECUTE, \logs\testexecute\tups_integ.htm,, -Dtextshell -- z:\tups\integ\scripts\tups_integ.script, 500, UDEB#UREL,\epoc32\data\Z\tups\integ\scripts\tups_integ_pre.bat, \epoc32\data\Z\tups\integ\scripts\tups_integ_post.bat
-
-#PREQ1262 Tests
-TESTEXECUTE, \logs\testexecute\tupsdb.htm,, -Dtextshell -- z:\tups\tupsdb\scripts\tupsdb.script,300,UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tupsdbperformance.htm,, -Dtextshell -- z:\tups\tupsdb\scripts\tupsdbperformance.script,300,UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tpolicycache.htm,, z:\tups\tpolicies\scripts\tpolicycache.script,300,UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tpolicyreader.htm,,-Dtextshell -- z:\tups\tpolicies\scripts\tpolicyreader.script,300,UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tserviceconfig.htm,,-Dtextshell -- z:\tups\tpolicies\scripts\tserviceconfig.script,300,UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tpolicycacheoom.htm,,-Dtextshell -- z:\tups\tpolicies\scripts\tpolicycacheoom.script,300,UDEB#UREL,,
-
-dumpupsdb.exe, \upsdb.txt,, -Dtextshell -- -e -db c:\private\10283690\tups.db -f c:\upsdb.txt -t, 800, UDEB#UREL,,
-scstest.exe, \scstest.log,, -Dtextshell --, 800, UDEB#UREL,,
-upstest.exe, \upstest.log,,, 800, UDEB#UREL,,
-upstestobsif.exe, \upstestobsif.log,,, 800, UDEB#UREL,,
-upstestoom.exe, \upstestoom.log,, , 800, UDEB,,
-upstestobsifoom.exe, \upstestobsifoom.log,, , 800, UDEB,,\epoc32\data\Z\tups\integ\scripts\tups_networkingupsdisable.bat
-tmsgapp.exe, \tmsgapp.log,, -Dtextshell -- , 800, UDEB#UREL,,
-
-
-
-[AuthServer]
-# AuthServer tests
-TESTEXECUTE, \logs\testexecute\tauthkeys.htm,,-Dstartupmode=1 -- \tauth\tauthkeys\scripts\tauthkeys.script, 30, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthdb.htm,, -Dstartupmode=1 -- \tauth\tauthdb\scripts\tauthdb.script, 30, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthcliserv.htm,, -Dstartupmode=1 -- \tauth\tauthcliserv\scripts\tauthcliserv.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthcliserv_debug.htm,,-Dstartupmode=1 -- \tauth\tauthcliserv\scripts\tauthcliserv_debug.script, 30, UDEB,,
-TESTEXECUTE, \logs\testexecute\tauthexpr.htm,, -Dstartupmode=1 -- \tauth\tauthexpr\scripts\tauthexpr.script, 500, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthplugins.htm,, -Dstartupmode=1 -- \tauth\tauthplugins\scripts\tauthplugins.script, 30, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthsvr2.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tauthsvr2.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_tauthsvr.bat
-TESTEXECUTE, \logs\testexecute\tauthsvrclock.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tauthsvrclock.script, 1600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tpostmarketplugin.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketplugin.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketplugin_macroenabled.htm,,-Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketplugin_macroenabled.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_postmarketplugin.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketpluginenabled1_winscw.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketpluginenabled1_winscw.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_patchdata_positive.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketpluginenabled_winscw.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tpostmarketpluginenabled_winscw.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_patchdata_negative.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tclientsidsupport.htm,, -Dstartupmode=1 -- \tauth\tauthsvr\scripts\tclientsidsupport.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_tclientsidsupport.bat
-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,, -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,,
-
-
-
-[USIF]
-#Universal Software Install Framework Tests
-TESTEXECUTE, \logs\testexecute\usifsecuritytests.htm,,z:\tusif\securitytests\usifsecuritytests.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsifintegration.htm,,z:\tusif\tsifintegration\tsifintegration.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsif.htm,,z:\tusif\tsif\tsif.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsifoom.htm,,z:\tusif\tsif\tsifoom.script, 300, UDEB,,
-TESTEXECUTE, \logs\testexecute\tscr.htm,,z:\tusif\tscr\tscr.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsts_bootuptimerecovery.htm,,z:\tusif\tsts\tsts_bootuptimerecovery.script, 300, UDEB#UREL, \epoc32\data\z\tusif\tsts\batchfiles\tsts_bootuptimerecovery.bat,
-TESTEXECUTE, \logs\testexecute\tsts_rollbackall.htm,,z:\tusif\tsts\tsts_rollbackall.script, 300, UDEB#UREL, ,
-TESTEXECUTE, \logs\testexecute\tsts.htm,,z:\tusif\tsts\tsts.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsts_tintegrityservices.htm,,z:\tusif\tsts\tintegrityservices\scripts\tsts_tintegrityservices.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsifrefinstaller.htm,,z:\tusif\tsifrefinstaller\tsifrefinstaller.script, 300, UDEB#UREL,,
-
-[SecurityTools]
-# Security tools tests
-PERL, \security_tools\tcertapp\tCertapp_Output.htm,, \epoc32\winscw\c\security_tools\tcertapp\run_tcertapp.pl, 1600, UDEB#UREL,,
-t_certapps, \logs\testexecute\SDP-Security_Tools-CertApp-CCDAT-EMU00.htm,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-CCDAT-EMU00.script \logs\testexecute\SDP-Security_Tools-CertApp-CCDAT-EMU00.htm, 300, 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-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
-PERL, \checklocationofcertificateslog.txt,, \epoc32\winscw\c\checklocationofcertificates.pl %SECURITYSOURCEDIR%, 300, UDEB,,
-
-# Scan for occurrences of "C: , EDriveC and [<index>]='C' in source files
-PERL, \cdrivewarnings.htm,,\epoc32\winscw\c\cdrive.pl --exclude=\epoc32\winscw\c\cdrive_exclude.txt --excludedir=%SECURITYSOURCEDIR%\usif\scr\sqlite_secure\ --log=cdrivewarnings.htm %SECURITYSOURCEDIR%,300,UDEB,,
-
-# Categorisation tags are checked for all of security sub-system
-PERL, \searchtags.txt,,\epoc32\winscw\c\tswi\searchtags.pl, 300, UDEB,,
-[FileTokens_HwImpl]
-T_KEYSTORE, \logs\testexecute\thwkeystore.htm,, -Dstartupmode=1 -- \tkeystore\scripts\thwkeystore.script \logs\testexecute\thwkeystore.htm, 300, UDEB#UREL, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\pre_dummyeccplugin.bat, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\post_dummyeccplugin.bat
-TESTEXECUTE, \logs\testexecute\te_dummyeccciphertestcases.htm,, -Dtextshell -- \testdata\tcryptospi\scripts\te_dummyeccciphertestcases.script, 900, UDEB#UREL, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\pre_dummyeccplugin.bat, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\post_dummyeccplugin.bat
-
-
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_9.4_java.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +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:
-@rem
-
-REM Attempt to stop the execution in case it's accidentally started on a PC
-ECHO About to run Security Team Hardware Tests
-pause
-
-REM create testresults directory
-md c:\testresults
-md e:\testresults
-copy z:\buildid.txt e:\
-copy z:\buildid.txt e:\testresults
-
-REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
-md c:\private
-md c:\private\10000882
-copy z:\hosts c:\private\10000882\hosts
-
-REM install automated commdb
-copy z:\auto.cfg c:\auto.cfg
-ced -i c:\auto.cfg
-
-sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
-
-runcrypto.bat
-
-runjavamidletinstaller.bat
\ No newline at end of file
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_9.4_mcs.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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:
-@rem
-
-REM Attempt to stop the execution in case it's accidentally started on a PC
-ECHO About to run Security Team Hardware Tests
-pause
-
-REM create testresults directory
-md c:\testresults
-md e:\testresults
-copy z:\buildid.txt e:\
-copy z:\buildid.txt e:\testresults
-
-REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
-md c:\private
-md c:\private\10000882
-copy z:\hosts c:\private\10000882\hosts
-
-REM install automated commdb
-copy z:\auto.cfg c:\auto.cfg
-ced -i c:\auto.cfg
-
-sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
-
-runcertman.bat
-
-runasnpkcs.bat
-
-runfiletokens.bat
-
-runcryptotokens.bat
-
-
-runswiromtests.bat
-
-// uncomment the authserver tests when it is released
-//runauthtests.bat
-
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_9.4_mcs_vfuture.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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:
-@rem
-
-REM Attempt to stop the execution in case it's accidentally started on a PC
-ECHO About to run Security Team Hardware Tests
-pause
-
-REM create testresults directory
-md c:\testresults
-md e:\testresults
-copy z:\buildid.txt e:\
-copy z:\buildid.txt e:\testresults
-
-REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
-md c:\private
-md c:\private\10000882
-copy z:\hosts c:\private\10000882\hosts
-
-REM install automated commdb
-copy z:\auto.cfg c:\auto.cfg
-ced -i c:\auto.cfg
-
-sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
-
-runcertman.bat
-
-runasnpkcs.bat
-
-runfiletokens.bat
-
-runcryptotokens.bat
-
-runswiromtests.bat
-
-REM authserver test
-runauthtests.bat
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_9.4_nonmcs.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +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:
-@rem
-
-REM Attempt to stop the execution in case it's accidentally started on a PC
-ECHO About to run Security Team Hardware Tests
-pause
-
-REM create testresults directory
-md c:\testresults
-md e:\testresults
-copy z:\buildid.txt e:\
-copy z:\buildid.txt e:\testresults
-
-REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
-md c:\private
-md c:\private\10000882
-copy z:\hosts c:\private\10000882\hosts
-
-REM install automated commdb
-copy z:\auto.cfg c:\auto.cfg
-ced -i c:\auto.cfg
-
-sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
-
-runcaftests.bat
-
-runsisinstaller.bat
-
-runswiromtests.bat
-
-REM Enable the following test when DEF076875(or relevant CR) is done.
-REM runtlsclientauth.bat
-
-REM Temporary solution for ROM overflow issues (DEF109635)
-runpkcs12tests.bat
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_9.5_mcs.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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:
-@rem
-
-REM Attempt to stop the execution in case it's accidentally started on a PC
-ECHO About to run Security Team Hardware Tests
-pause
-
-REM create testresults directory
-md c:\testresults
-md e:\testresults
-copy z:\buildid.txt e:\
-copy z:\buildid.txt e:\testresults
-
-REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
-md c:\private
-md c:\private\10000882
-copy z:\hosts c:\private\10000882\hosts
-
-REM install automated commdb
-copy z:\auto.cfg c:\auto.cfg
-ced -i c:\auto.cfg
-
-sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
-
-runcertman.bat
-
-runfiletokens.bat
-
-runcryptotokens.bat
-
-
-runswiromtests.bat
-
-// uncomment the authserver tests when it is released
-//runauthtests.bat
-
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_9.5_nonmcs.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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:
-@rem
-
-REM Attempt to stop the execution in case it's accidentally started on a PC
-ECHO About to run Security Team Hardware Tests
-pause
-
-REM create testresults directory
-md c:\testresults
-md e:\testresults
-copy z:\buildid.txt e:\
-copy z:\buildid.txt e:\testresults
-
-REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
-md c:\private
-md c:\private\10000882
-copy z:\hosts c:\private\10000882\hosts
-
-REM install automated commdb
-copy z:\auto.cfg c:\auto.cfg
-ced -i c:\auto.cfg
-
-sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
-
-runcaftests.bat
-
-runsisinstaller.bat
-
-runswiromtests.bat
-
-REM Enable the following test when DEF076875(or relevant CR) is done.
-REM runtlsclientauth.bat
-
-runupstests.bat
-
-REM Temporary solution for ROM overflow issues (DEF109635)
-runpkcs12tests.bat
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_9.6_crypto.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +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:
-@rem
-
-REM Attempt to stop the execution in case it's accidentally started on a PC
-ECHO About to run Security Team Hardware Tests
-pause
-
-REM create testresults directory
-md c:\testresults
-md e:\testresults
-copy z:\buildid.txt e:\
-copy z:\buildid.txt e:\testresults
-
-REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
-md c:\private
-md c:\private\10000882
-copy z:\hosts c:\private\10000882\hosts
-
-REM install automated commdb
-copy z:\auto.cfg c:\auto.cfg
-ced -i c:\auto.cfg
-
-sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
-
-runcrypto.bat
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_9.6_mcs.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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:
-@rem
-
-REM Attempt to stop the execution in case it's accidentally started on a PC
-ECHO About to run Security Team Hardware Tests
-pause
-
-REM create testresults directory
-md c:\testresults
-md e:\testresults
-copy z:\buildid.txt e:\
-copy z:\buildid.txt e:\testresults
-
-REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
-md c:\private
-md c:\private\10000882
-copy z:\hosts c:\private\10000882\hosts
-
-REM install automated commdb
-copy z:\auto.cfg c:\auto.cfg
-ced -i c:\auto.cfg
-
-sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
-
-runasnpkcs.bat
-
-runcryptotokens.bat
-
-
-runswiromtests.bat
-
-REM authserver test
-runauthtests.bat
-
-runfiletokens.bat
-
-runcertman.bat
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_9.6_nonmcs.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +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:
-@rem
-
-REM Attempt to stop the execution in case it's accidentally started on a PC
-ECHO About to run Security Team Hardware Tests
-pause
-
-REM create testresults directory
-md c:\testresults
-md e:\testresults
-copy z:\buildid.txt e:\
-copy z:\buildid.txt e:\testresults
-
-REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
-md c:\private
-md c:\private\10000882
-copy z:\hosts c:\private\10000882\hosts
-
-REM install automated commdb
-copy z:\auto.cfg c:\auto.cfg
-ced -i c:\auto.cfg
-
-sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
-
-runcaftests.bat
-
-runswiromtests.bat
-
-REM Enable the following test when DEF076875(or relevant CR) is done.
-REM runtlsclientauth.bat
-
-runupstests.bat
-
-runusiftests.bat
-
-REM Temporary solution for ROM overflow issues (DEF109635)
-runpkcs12tests.bat
-
-runcommonutilstests.bat
\ No newline at end of file
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurityonlyjava.bat Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +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:
-@rem
-
-REM Attempt to stop the execution in case it's accidentally started on a PC
-ECHO About to run Security Team Hardware Tests
-pause
-
-REM create testresults directory
-md c:\testresults
-md e:\testresults
-copy z:\buildid.txt e:\
-copy z:\buildid.txt e:\testresults
-
-REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
-md c:\private
-md c:\private\10000882
-copy z:\hosts c:\private\10000882\hosts
-
-REM install automated commdb
-copy z:\auto.cfg c:\auto.cfg
-ced -i c:\auto.cfg
-
-sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
-
-runjavamidletinstaller.bat
-
-runsisinstaller.bat
-
Binary file cryptomgmtlibs/securitytestfw/testcertificates/certman/tpkixcert_tef/fulltrust.der has changed
--- a/cryptomgmtlibs/securitytestfw/testcertificates/certman/tpkixcert_tef/makecert.bat Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/testcertificates/certman/tpkixcert_tef/makecert.bat Mon May 03 14:11:52 2010 +0300
@@ -1,8 +1,8 @@
@rem
-@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem Copyright (c) 2010 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 "Eclipse Public License v1.0"
+@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
--- a/cryptomgmtlibs/securitytestfw/testcertificates/group/bld.inf Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/testcertificates/group/bld.inf Mon May 03 14:11:52 2010 +0300
@@ -400,6 +400,9 @@
../certman/tpkixcert_tef/004_ee.der /epoc32/winscw/c/tpkixcert_tef/data/004_ee.der
../certman/tpkixcert_tef/009_rc.der /epoc32/winscw/c/tpkixcert_tef/data/009_rc.der
../certman/tpkixcert_tef/009_ee.der /epoc32/winscw/c/tpkixcert_tef/data/009_ee.der
+
+../certman/tpkixcert_tef/fulltrust.der /epoc32/winscw/c/tpkixcert_tef/data/fulltrust.der
+
../certman/tx509/Data/dnames/dn_unstructuredname_lc.der /epoc32/winscw/c/tx509/data/dn_unstructuredname_lc.der
../certman/tx509/Data/extensions/certs/absent.der /epoc32/winscw/c/tx509/data/extensions/certs/absent.der
../certman/tx509/Data/extensions/certs/corrupt.der /epoc32/winscw/c/tx509/data/extensions/certs/corrupt.der
--- a/cryptoservices/certificateandkeymgmt/bwins/X509_v2u.def Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/bwins/X509_v2u.def Mon May 03 14:11:52 2010 +0300
@@ -279,4 +279,5 @@
?NewL@CCertificateValidationWarnings@@SAPAV1@H@Z @ 278 NONAME ; class CCertificateValidationWarnings * CCertificateValidationWarnings::NewL(int)
?NewLC@CCertificateValidationWarnings@@SAPAV1@H@Z @ 279 NONAME ; class CCertificateValidationWarnings * CCertificateValidationWarnings::NewLC(int)
?Warnings@CCertificateValidationWarnings@@QBEABV?$RArray@VTValidationStatus@@@@XZ @ 280 NONAME ; class RArray<class TValidationStatus> const & CCertificateValidationWarnings::Warnings(void) const
+ ?SubjectKeyIdL@CX509Certificate@@QAE?AV?$TBuf8@$0BE@@@XZ @ 281 NONAME ; class TBuf8<20> CX509Certificate::SubjectKeyIdL(void)
--- a/cryptoservices/certificateandkeymgmt/documentation/building-certstore.txt Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-Title: Building Certificate Store
-Owner: Gleb Dolgich
-Contributors: Xavier Leclercq, Gleb Dolgich
-Copyright (C) 2003 Symbian Limited. All rights reserved.
-================================================================================
-
-Purpose
--------
-
-This document describes how to build CACerts.dat (certificate store) and
-certclients.dat (certificate client applications) files. These files are stored
-on a device in c:\system\data\ directory. They are necessary for Software
-Install and SSL/TLS.
-
-Certificates and trusters
--------------------------
-
-Every certificate stored in CACerts.dat has a set of UIDs associated with it,
-each UID marking the certificate as good for a particular purpose (application).
-Currently the following applications/UIDs are defined:
-
-- SW Install (268452523, or 0x100042AB)--certificate is suitable for software
- install (SIS files);
-- SW Install OCSP Signing (268478646, or 0x1000A8B6)--certificate is suitable
- for OCSP checking (SIS files);
-- MIDlet Installation (270506792, or 0x101F9B28)--certificate is good for Java
- MIDlet installation, which includes OCSP checking;
-- Server Authentication (268441661, or 0x1000183D)--certificate is suitable for
- SSL/TLS server authentication.
-
-These UIDs are stored in certclients.dat file. Once certclients.dat is in
-c:\system\data on the device, the Certificates Control Panel applet allows
-manual assignment of applications to each certificate.
-
-Files needed
-------------
-
-The following files are needed to build a certificate store:
-
-- T_CERTSTORE.EXE test harness, which is located in security/certman/tcertstore;
- build it from security/certman/group;
-- bldcertstore.txt: test script located in security/certman/tcertstore/scripts;
- you can modify it depending on which certificates/applications you want
- included in the store. This script is exported into device's
- c:\tcertstore\scripts.
-
-The following certificates are used for running tests:
-
-- Symbiana.der "Identity ACS Root"--Symbian application signing certificate that
- is provided for reference only and is not used by tests
-- Symbianb.der "Testing ACS Root"--Symbian application signing test certificate
- that is provided for reference only and is not used by tests
-- cacert.crt "TestCA"--SSL server CA certificate (self-signed)
-- thawtetest.crt "Thawte Root"--SW Install certificate
-- TOCSP-Root5-RSA.cer--SW Install and MIDlet Installation
-- TOCSP-Signing5-RSA.cer--OCSP Signing
-
-These certificates are copied into c:\tappinst\certs\ directory on the device.
-
-Building the store
-------------------
-
-To build a certificate store, perform the following steps:
-
-1. Build the T_CERTSTORE test harness and export test files for appinst and
- certman.
-
-2. Go to the appropriate build directory (udeb or urel) and run the following
- command:
-
- t_certstore c:\tcertstore\scripts\bldcertstore.txt c:\bldcertstore.log
-
- This will build c:\system\data\cacerts.dat and c:\system\data\certclients.dat
- with test certificates. If you need to add your own certificates, modify the
- bldcertstore.txt script accordingly. The ‘console’ option is necessary to ensure
- the tool can operate independently of the UI environment.
--- a/cryptoservices/certificateandkeymgmt/eabi/x509_v2u.def Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/eabi/x509_v2u.def Mon May 03 14:11:52 2010 +0300
@@ -397,4 +397,5 @@
_ZNK30CCertificateValidationWarnings9CertIndexEv @ 396 NONAME
_ZTI30CCertificateValidationWarnings @ 397 NONAME
_ZTV30CCertificateValidationWarnings @ 398 NONAME
+ _ZN16CX509Certificate13SubjectKeyIdLEv @ 399 NONAME
--- a/cryptoservices/certificateandkeymgmt/group/bld.inf Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/group/bld.inf Mon May 03 14:11:52 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
@@ -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,6 +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.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
--- a/cryptoservices/certificateandkeymgmt/group/makecertstore.ipr Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-[purpose]
-
-Creates a default certificate store, as used by the certificate
-management component. For use by licensees only for the purpose
-of creating a certificate store to be included within the ROM
-of a device.
-
-[categories]
-licensee
-
-[files]
-tools\makecertstore.bat
-release\winc\urel\makecertstore.exe
-
-[owner]
-Runtime & Tools # CERTMAN
-
-[IPR]
-Copyright (c) 2000 Symbian Ltd. All rights reserved.
-
-Makecertstore.exe can be freely distributed as a binary,
-but the source code requires an export licence.
--- a/cryptoservices/certificateandkeymgmt/group/security_certman.mrp Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/group/security_certman.mrp Mon May 03 14:11:52 2010 +0300
@@ -18,7 +18,6 @@
source \sf\os\security\cryptoservices\certificateandkeymgmt
binary \sf\os\security\cryptoservices\certificateandkeymgmt\group all
exports \sf\os\security\cryptoservices\certificateandkeymgmt\group
--export_file \sf\os\security\cryptoservices\certificateandkeymgmt\group\makecertstore.ipr \epoc32\engdoc\tools\makecertstore.ipr
notes_source \component_defs\release.src
--- a/cryptoservices/certificateandkeymgmt/inc/pkcs10attr.h Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/inc/pkcs10attr.h Mon May 03 14:11:52 2010 +0300
@@ -28,6 +28,7 @@
class CASN1EncBase;
class CASN1EncSequence;
+class CASN1EncSet;
//
// Class capturing common functionality of a PKCS attribute.
--- a/cryptoservices/certificateandkeymgmt/inc/x509cert.h Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/inc/x509cert.h Mon May 03 14:11:52 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1998-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"
@@ -616,6 +616,14 @@
* @return The new X.509 certificate object. */
IMPORT_C static CX509Certificate* NewLC(const CX509Certificate& aCert);
+ /** Retrieves the subject key identifier of a certificate based on the decision whether
+ * it is a CA certificate or not. If it is a CA certificate then returns the stored subject key id
+ * as an extension in the certificate, any other certificate it returns the keyidentifier as
+ * calculated by Symbian's proprietary logic.
+ * @return The subject key identifier for the certificate. */
+ IMPORT_C TKeyIdentifier SubjectKeyIdL();
+
+
/** Destructor.
*
* Frees all resources owned by the object, prior to its destruction. */
Binary file cryptoservices/certificateandkeymgmt/pkixCert/doxygen_docs/Certman_X509_Certificate_Validation_chain.png has changed
--- a/cryptoservices/certificateandkeymgmt/pkixCert/doxygen_docs/Certman_X509_Certificate_Validation_overview.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-/**
-@page overview_Certificate_Validation_in_PKIX Certificate Validation in PKIX
-
-<hr>
-
-@section certificate_chain Certificate Chain
-
-Certificate validation is a recursive process. It begins with the need to verify the @ref digital_signature "digital signature" on some data presented by
-an @ref EE "End Entity" (EE). This involves checking that the key pair is actually owned by that @ref EE. To do this, the
-public signing key of that EE is acquired by getting its @ref certificate. That @ref certificate would have been
-signed by the EE's @ref CA "certification authority" (CA), so the @ref digital_signature "digital signature" on the @ref certificate can be
-verified by getting the @ref CA's public signing key. In turn, the @ref CA's certificate may need verifying, in which case
-the process is repeated until it bottoms out when an entity that is already trusted is reached; that entity is
-usually self signed. This process is illustrated in the figure below:
-
-@image html Certman_X509_Certificate_Validation_chain.png
-\n\n
-
-The set of @ref certificates from an @ref EE up to a trusted root @ref CA_certificate "CA certificate" is called a certificate chain.
-Once a certificate chain has been constructed, the @ref EE's key pair at the start can validated.
-
-<hr>
-
-@section input_to_certificate_validation Input to Certificate Validation
-
-The following inputs need to be supplied to the validation process:
-
-@li @ref End_Entity_and_Intermediate_Certificates
-@li @ref Trusted_Root_Certificates
-@li @ref Validation_Time
-@li @ref Acceptable_Policies
-
-@subsection End_Entity_and_Intermediate_Certificates End Entity & Intermediate Certificates
-
-A set of @ref certificates, from the entity requesting @ref authentication up to, but not including, one already trusted
-by the @ref relying_party "relying party".
-
-Where these @ref certificates come from is potentially a difficult problem, if certificate management is expected to search
-for intermediate certificates in remote repositories; however for @ref TLS, at least servers are required to supply a
-complete, ordered set of certificates in the form of @ref DER encoded @ref ASN "ASN.1"; so client code can just pass this into
-the certificate chain object.
-
-@subsection Trusted_Root_Certificates Trusted Root Certificates
-
-@ref Authentication cannot be done entirely by software: there must be a point at which the user confirms that they trust
-a particular entity. The validation algorithm can only ascertain that if the user trusts certificate X then they may also
-trust certificate Y. Certificates that the user trusts directly are called @ref root_certificate "root certificates" because they are the root
-of the validation chain; they are usually self-signed.
-
-It is likely that different applications will have different requirements about which @ref certificates may be considered
-trust roots, and for the level of protection they require for trust roots. To this end, applications will pass in a unique
-ID (\c TUid) which Certificate Management will use to identify the application, and so work out which @ref certificates
-can be considered trusted for that application.
-
-For additional flexibility, an overload is provided enabling clients to pass a set of @ref root_certificate "root certificates" directly into
-the validation function.
-
-For more detailed discussion of the storage and management of root certificates
-see Root Certificate Management and Storage.
-
-
-@subsection Validation_Time Validation Time
-
-The time for which validation will be performed.
-
-
-@subsection Acceptable_Policies Acceptable Policies
-
-A set of @ref OID "OID"s, each of which represents a certification policy acceptable to the application. This enables client
-code to restrict the @ref certificates that may occur in a valid certificate chain. Client code does not have to specify
-any preferred policies here. An empty set is interpreted as any policy.
-
-
-<hr>
-
-@section chain_validation Chain Validation
-
-@subsection chain_construction Chain Construction
-
-The chain object parses the encoded set of certificates. The first certificate is considered to be the @ref EE
-certificate, and subsequent @ref certificates must each certify the preceding one. The chain object then searches the set
-of trusted @ref root_certificate "root certificates" for a certificate trusted by the client and whose subject name matches the issuer name
-in the last certificate in the decoded set. If two or more match, it will attempt to resolve this be comparing the
-authority key ID in the last certificate with the subject key ID in each candidate root. If this extension is not present,
-it will attempt to find a single root by signature verification. If no root is found, validation will fail immediately
-with an error.
-
-
-@subsection initialisation_of_chain_validation_algorithm Initialisation of Chain Validation Algorithm
-
-The certificate chain initialises the following state variables:
-
-@li Validation Time: time for which validation is calculated. Initialised to the time supplied by client code.
-
-@li Initial Policies: set of policy @ref OIDs, initialised to the policies supplied by client code
-
-@li Acceptable Policies: set of X.509 policy information objects, initially any policy
-
-@li Mapped Policies: set of policy @ref OIDs, initially empty
-
-@li Excluded Subtrees: set of X.500 General Name objects, initially empty
-
-@li Permitted Subtrees: set of X.500 General Name objects, initially any subtree
-
-@li Max Path Length: integer representing the maximum path length. Initially the actual path length
-
-@li Inhibit Policy Mapping: integer whose value is the number of certificates that may appear after the current one before
- policy mapping is no longer permitted. Initially the chain length
-
-@li Require Explicit Policy: integer whose value is the number of certificates that may appear after the current one
- before an acceptable policy @ref OID must appear in the certificate. Initially the chain length
-
-@li Current Cert: integer whose value is the position of the current certificate in the chain. Initially the chain length -1
-
-
-<hr>
-
-@section validation_algorithm Validation Algorithm
-
-Validation of a certificate chain starts at the root and ends at the @ref EE "End Entity" (EE). It returns a result object which
-includes:
-
-@li a single error value, which consists of a reason for the error and an integer identifying which @ref certificate the
- error is associated with. If the reason is anything other than \c EValidatedOK then validation has failed.
-
-@li a set of warning values, each consisting of a reason for the warning and an integer identifying which @ref certificate the
- warning is associated with.
-
-@li a set of policies accepted in the course of validating the chain.
-
-The reason the warnings are present is that it is sometimes impossible for Certificate Management to work out if an
-irregularity is an error or not, because it depends on the context of the @ref certificate (e.g. the use to which its key
-will be put) which is only known by client code. Warnings give client code a chance to evaluate these irregularities.
-
-For each @ref certificate the actions described below are performed:
-
-@li Signature Verification & Name Chaining -- Each @ref certificate must be signed by, and its subject name should match the
- issuer name in, the certificate above it in the chain. The only exception is the @ref root_certificate "root certificate", which, if it
- claims to be self signed (i.e. its subject and issuer names match) must really be self signed; otherwise its signature
- is not verified, but a warning is generated.
-
-@li Validity Period Checking -- For each certificate, the Validation Time must lie within the validity period in the
- certificate.
-
-@li Extension Processing -- Extensions can be marked critical; all critical extensions must be 'recognized and processed'
- or the certificate must be rejected. For some extensions it is either unclear what this means, or it clearly makes no
- sense, and in these cases a common response is to reject the certificate if the extension is marked critical. It is
- impossible to guarantee support for some extensions.
-
-@li Revocation Checking
-
-Additionally, for each certificate:
-
-@li the \em Max \em Path \em Length, \em Inhibit \em Policy \em Mapping and \em Require \em Explicit \em Policy variables
- are decremented,
-
-@li and Current Cert must be less than or equal to \em Max \em Path \em Length.
-
-When validation is complete the \em Acceptable \em Policies variable will be copied into the set of policies in the result
-object.
-
-
-
-*/
\ No newline at end of file
--- a/cryptoservices/certificateandkeymgmt/pkixCert/doxygen_docs/Certman_X509_PKIXCert_overview.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-/**
-@page overview_X509_PKIXCert PKIXCert Overview
-
-This DLL implements certificate validation according to the @ref PKIX Certificate and @ref CRL profile. It is the main public
-interface to certificate management. Given a set of @ref certificates supplied by a third party, and a local store of
-trusted @ref root_certificate "root certificates", this component will attempt to validate the identity of the third party. Two public
-classes are defined here:
-
-\c CPKIXCertChain -- performs certificate validation.
-
-\c CPKIXValidationResult -- encapsulates the result of the validation operation.
-
-*/
\ No newline at end of file
--- a/cryptoservices/certificateandkeymgmt/tcertstore/scripts/unifiedcertstore2-conf1.ini Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/tcertstore/scripts/unifiedcertstore2-conf1.ini Mon May 03 14:11:52 2010 +0300
@@ -1,1071 +1,2334 @@
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-002]
+
<actionbody>
+
<name>A1</name>
+
<uid>1</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-003]
+
<actionbody>
+
<name>A2</name>
+
<uid>2</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-004]
+
<actionbody>
+
<name>A3</name>
+
<uid>3</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-005]
+
<actionbody>
+
<name>A4</name>
+
<uid>4</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-007]
+
<actionbody>
+
<ImportData>rsacertkey1.txt</ImportData>
+
<keyusage>AllUsagesButNR</keyusage>
+
<keylabel>*IMPORTED* RSA key 1</keylabel>
+
<keyaccesstype>Extractable</keyaccesstype>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-008]
+
<actionbody>
+
<ImportData>rsacertkey2.txt</ImportData>
+
<keyusage>AllUsagesButNR</keyusage>
+
<keylabel>*IMPORTED* RSA key 2</keylabel>
+
<keyaccesstype>Extractable</keyaccesstype>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-009]
+
<actionbody>
+
<ImportData>rsacertkey3.txt</ImportData>
+
<keyusage>AllUsagesButNR</keyusage>
+
<keylabel>*IMPORTED* RSA key 3</keylabel>
+
<keyaccesstype>Extractable</keyaccesstype>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-010]
+
<actionbody>
+
<mode>write</mode>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-011]
+
<actionbody>
+
<label>*.*</label>
+
<deleteallcerts>1</deleteallcerts>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-012]
+
<actionbody>
+
<format>X509</format>
+
<label>BadUserCert</label>
+
<issuerkey></issuerkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAX1.cer</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-013]
+
<actionbody>
+
<format>X509</format>
+
<label>BadUserCert</label>
+
<issuerkey></issuerkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAX2.cer</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-014]
+
<actionbody>
+
<format>X509</format>
+
<label>BadUserCert</label>
+
<issuerkey></issuerkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAX3.cer</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-015]
+
<actionbody>
+
<format>X509</format>
+
<label>CAX1</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAX1.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-016]
+
<actionbody>
+
<format>X509</format>
+
<label>CAX2</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAX2.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-017]
+
<actionbody>
+
<format>X509</format>
+
<label>CAX3</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAX3.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-018]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
</filter>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX1</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX2</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX3</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-019]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-020]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
</filter>
+
<issuerdn>c:\unifiedcertstore2\CAX1.cer</issuerdn>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX1</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-021]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
</filter>
+
<issuerdn>c:\unifiedcertstore2\CAX1.cer</issuerdn>
+
<issuerdn>c:\unifiedcertstore2\CAX2.cer</issuerdn>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX1</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX2</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-022]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
</filter>
+
<issuerdn>c:\unifiedcertstore2\CAX1.cer</issuerdn>
+
<issuerdn>c:\unifiedcertstore2\CAX2.cer</issuerdn>
+
<issuerdn>c:\unifiedcertstore2\CAX3.cer</issuerdn>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX1</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX2</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX3</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-024]
+
<actionbody>
+
<mode>write</mode>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-025]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
</filter>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX1</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX2</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX3</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-026]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
<label>CAX1</label>
+
</filter>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX1</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0001-027]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
<label>CAX3</label>
+
</filter>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX3</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0002-001]
+
<actionbody>
+
<format>WTLS</format>
+
<label>CAW1</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAW1.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0002-002]
+
<actionbody>
+
<format>WTLS</format>
+
<label>CAW2</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAW2.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0002-003]
+
<actionbody>
+
<format>WTLS</format>
+
<label>CAW3</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAW3.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0002-004]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
</filter>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX1</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX2</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX3</label></CCTCertInfo>
+
<CCTCertInfo><label>CAW1</label></CCTCertInfo>
+
<CCTCertInfo><label>CAW2</label></CCTCertInfo>
+
<CCTCertInfo><label>CAW3</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0002-005]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
</filter>
+
<issuerdn>c:\unifiedcertstore2\CAX1.cer</issuerdn>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX1</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0002-006]
+
<actionbody>
+
<label>CAW1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0002-008]
+
<actionbody>
+
<mode>write</mode>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0002-009]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
</filter>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX1</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX2</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX3</label></CCTCertInfo>
+
<CCTCertInfo><label>CAW1</label></CCTCertInfo>
+
<CCTCertInfo><label>CAW2</label></CCTCertInfo>
+
<CCTCertInfo><label>CAW3</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-001]
+
<actionbody>
+
<label>CAX1</label>
+
<uid>1 2 3</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-002]
+
<actionbody>
+
<label>CAX1</label>
+
<uid>1 1 1</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-003]
+
<actionbody>
+
<label>CAX1</label>
+
<trust>1</trust>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-004]
+
<actionbody>
+
<label>CAX2</label>
+
<uid>1</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-005]
+
<actionbody>
+
<label>CAX2</label>
+
<uid>1 2 1</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-006]
+
<actionbody>
+
<label>CAX2</label>
+
<trust>1</trust>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-007]
+
<actionbody>
+
<label>CAX3</label>
+
<uid></uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-008]
+
<actionbody>
+
<label>CAX3</label>
+
<trust>1</trust>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-009]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
<actionresult>
+
<uid>1 2 3</uid>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-010]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
<actionresult>
+
<trust>1</trust>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-011]
+
<actionbody>
+
<label>CAX2</label>
+
</actionbody>
+
<actionresult>
+
<uid>1</uid>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-012]
+
<actionbody>
+
<label>CAX2</label>
+
</actionbody>
+
<actionresult>
+
<trust>1</trust>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-013]
+
<actionbody>
+
<label>CAX3</label>
+
</actionbody>
+
<actionresult>
+
<uid></uid>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-014]
+
<actionbody>
+
<label>CAX3</label>
+
</actionbody>
+
<actionresult>
+
<trust>1</trust>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-015]
+
<actionbody>
+
<label>CAW2</label>
+
<uid>1 2 3</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-016]
+
<actionbody>
+
<label>CAW2</label>
+
<trust>1</trust>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-017]
+
<actionbody>
+
<label>CAW3</label>
+
<uid>1 2</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-018]
+
<actionbody>
+
<label>CAW3</label>
+
<trust>1</trust>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-019]
+
<actionbody>
+
<label>CAW1</label>
+
</actionbody>
+
<actionresult>
+
<uid></uid>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-020]
+
<actionbody>
+
<label>CAW1</label>
+
</actionbody>
+
<actionresult>
+
<trust>0</trust>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-021]
+
<actionbody>
+
<label>CAW2</label>
+
</actionbody>
+
<actionresult>
+
<uid>1 2 3</uid>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-022]
+
<actionbody>
+
<label>CAW2</label>
+
</actionbody>
+
<actionresult>
+
<trust>1</trust>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-023]
+
<actionbody>
+
<label>CAW3</label>
+
</actionbody>
+
<actionresult>
+
<uid>1 2</uid>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0003-024]
+
<actionbody>
+
<label>CAW3</label>
+
</actionbody>
+
<actionresult>
+
<trust>1</trust>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0004-001]
+
<actionbody>
+
<label>CAX1</label>
+
<uid>1 2</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0004-002]
+
<actionbody>
+
<label>CAX1</label>
+
<trust>1</trust>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0004-003]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
<actionresult>
+
<uid>1 2</uid>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0004-004]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
<actionresult>
+
<trust>1</trust>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0005-001]
+
<actionbody>
+
<label>CAX1</label>
+
<uid>1 2 3 4</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0005-002]
+
<actionbody>
+
<label>CAX1</label>
+
<trust>0</trust>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0005-003]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
<actionresult>
+
<uid>1 2 3 4</uid>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0005-004]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
<actionresult>
+
<trust>0</trust>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0006-001]
+
<actionbody>
+
<label>CAX1</label>
+
<uid>1 2 3</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0006-002]
+
<actionbody>
+
<label>CAX1</label>
+
<trust>1</trust>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0006-003]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
<actionresult>
+
<uid>1 2 3</uid>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0006-004]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
<actionresult>
+
<trust>1</trust>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0007-001]
+
<actionbody>
+
<label>CAX1</label>
+
<uid>1 2 3 4 5</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0007-002]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
<actionresult>
+
<uid>1 2 3</uid>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0007-003]
+
<actionbody>
+
<label>CAX1</label>
+
<trust>1</trust>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0007-004]
+
<actionbody>
+
<label>CAX1</label>
+
<uid>1 2 3 4</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0007-005]
+
<actionbody>
+
<label>CAX1</label>
+
<uid>1 2 3 4 5 7 8 9</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0007-006]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
<actionresult>
+
<uid>1 2 3 4</uid>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-001]
+
<actionbody>
+
<format>X509</format>
+
<label>rsacert1</label>
+
<issuerkey></issuerkey>
+
<subjectkey>4808f03892fe836e78d048bcefcca4a37913d886</subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\rsacert1.cer</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-002]
+
<actionbody>
+
<format>X509</format>
+
<label>rsacert2</label>
+
<issuerkey></issuerkey>
+
<subjectkey>dc448293c7c3ed68c9fabd37db43007136ae2ef4</subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\rsacert2.cer</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-003]
+
<actionbody>
+
<format>X509</format>
+
<label>rsacert3</label>
+
<issuerkey></issuerkey>
+
<subjectkey>0b2e1d1d4dbae5fc59a02a5115d2c2910fa796e0</subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\rsacert3.cer</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-004]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
</filter>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX1</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX2</label></CCTCertInfo>
+
<CCTCertInfo><label>CAX3</label></CCTCertInfo>
+
<CCTCertInfo><label>CAW1</label></CCTCertInfo>
+
<CCTCertInfo><label>CAW2</label></CCTCertInfo>
+
<CCTCertInfo><label>CAW3</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-005]
+
<actionbody>
+
<filter>
+
<ownertype>user</ownertype>
+
</filter>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>rsacert1</label></CCTCertInfo>
+
<CCTCertInfo><label>rsacert2</label></CCTCertInfo>
+
<CCTCertInfo><label>rsacert3</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-006]
+
<actionbody>
+
<filter>
+
<ownertype>user</ownertype>
+
</filter>
+
<issuerdn>c:\unifiedcertstore2\rsacert1.cer</issuerdn>
+
</actionbody>
+
<actionresult>
+
// All 3 user certs have same issuer
+
<CCTCertInfo><label>rsacert1</label></CCTCertInfo>
+
<CCTCertInfo><label>rsacert2</label></CCTCertInfo>
+
<CCTCertInfo><label>rsacert3</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-007]
+
<actionbody>
+
<filter>
+
<ownertype>user</ownertype>
+
</filter>
+
<issuerdn>c:\unifiedcertstore2\CAX1.cer</issuerdn>
+
</actionbody>
+
<actionresult>
+
// No user certs with this DN expected
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-008]
+
<actionbody>
+
<label>rsacert1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-009]
+
<actionbody>
+
<certtype>ca</certtype>
+
<label>CAX1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-010]
+
<actionbody>
+
<certtype>ca</certtype>
+
<label>CAX2</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-011]
+
<actionbody>
+
<certtype>ca</certtype>
+
<label>CAX3</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-012]
+
<actionbody>
+
<certtype>ca</certtype>
+
<label>CAW1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-013]
+
<actionbody>
+
<certtype>ca</certtype>
+
<label>CAW2</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-014]
+
<actionbody>
+
<certtype>ca</certtype>
+
<label>CAW3</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-015]
+
<actionbody>
+
<certtype>user</certtype>
+
<label>rsacert1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-016]
+
<actionbody>
+
<certtype>user</certtype>
+
<label>rsacert2</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0008-017]
+
<actionbody>
+
<certtype>user</certtype>
+
<label>rsacert3</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0009-001]
+
<actionbody>
+
<mode>write</mode>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0009-002]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
</filter>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0009-003]
+
<actionbody>
+
<filter>
+
<ownertype>user</ownertype>
+
</filter>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0010-001]
+
<actionbody>
+
<mode>write</mode>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0010-002]
+
<actionbody>
+
<format>X509</format>
+
<label>CAX1</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAX1.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0010-003]
+
<actionbody>
+
<filter>
+
<ownertype>ca</ownertype>
+
</filter>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>CAX1</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0010-004]
+
<actionbody>
+
<label>CAX1</label>
+
<uid>7</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0011-001]
+
<actionbody>
+
<format>X509</format>
+
<label>U5K3</label>
+
<issuerkey></issuerkey>
+
<subjectkey>eeda2c6da84f17519ee837eadb8a5289dadfbb26</subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\U5K3.crt</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0011-002]
+
<actionbody>
+
<format>X509</format>
+
<label>U6K5</label>
+
<issuerkey></issuerkey>
+
<subjectkey>eeda2c6da84f17519ee837eadb8a5289dadf0000</subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\U6K5.crt</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0011-003]
+
<actionbody>
+
<format>X509URL</format>
+
<label>URL3K5</label>
+
<issuerkey></issuerkey>
+
<subjectkey>eeda2c6da84f17519ee837eadb8a5289dadf0000</subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\URL3K5.cer</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0011-004]
+
<actionbody>
+
<certtype>ca</certtype>
+
<label>CAX1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0012-001]
+
<actionbody>
+
<format>WTLS</format>
+
<label>CAW1</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAW1.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0012-002]
+
<actionbody>
+
<format>WTLS</format>
+
<label>CAW1</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAW1.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0012-003]
+
<actionbody>
+
<format>X509</format>
+
<label>CAX1</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAX1.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0012-004]
+
<actionbody>
+
<format>X509</format>
+
<label>CAX1</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAX1.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0012-005]
+
<actionbody>
+
<format>X509</format>
+
<label>rsacert3</label>
+
<subjectkeyid>0b2e1d1d4dbae5fc59a02a5115d2c2910fa796e0</subjectkeyid>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\rsacert3.cer</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0012-006]
+
<actionbody>
+
<format>X509</format>
+
<label>rsacert3</label>
+
<subjectkeyid>0b2e1d1d4dbae5fc59a02a5115d2c2910fa796e0</subjectkeyid>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\rsacert3.cer</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0012-007]
+
<actionbody>
+
<certtype>ca</certtype>
+
<label>CAX1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0012-008]
+
<actionbody>
+
<certtype>ca</certtype>
+
<label>CAW1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0012-009]
+
<actionbody>
+
<certtype>user</certtype>
+
<label>rsacert3</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0013-001]
+
<actionbody>
+
<format>X509</format>
+
<label>CAX1</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAX1.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0013-002]
+
<actionbody>
+
<format>WTLS</format>
+
<label>CAW1</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAW1.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0013-003]
+
<actionbody>
+
<format>X509URL</format>
+
<label>URL1rsa1</label>
+
<issuerkey></issuerkey>
+
<subjectkey>4808f03892fe836e78d048bcefcca4a37913d886</subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\URL1K1.cer</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0013-004]
+
<actionbody>
+
<format>X509URL</format>
+
<label>URL2rsa2</label>
+
<issuerkey></issuerkey>
+
<subjectkey>dc448293c7c3ed68c9fabd37db43007136ae2ef4</subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\URL2K2.cer</certfile>
+
<certowner>user</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0013-005]
+
<actionbody>
+
<filter>
+
<ownertype>user</ownertype>
+
<formatflags>X509URL</formatflags>
+
</filter>
+
</actionbody>
+
<actionresult>
+
<CCTCertInfo><label>URL1rsa1</label></CCTCertInfo>
+
<CCTCertInfo><label>URL2rsa2</label></CCTCertInfo>
+
</actionresult>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0013-006]
+
<actionbody>
+
<label>URL1rsa1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0013-007]
+
<actionbody>
+
<label>CAX1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0013-008]
+
<actionbody>
+
<label>CAW1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0013-009]
+
<actionbody>
+
<label>U1K1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0013-010]
+
<actionbody>
+
<label>URL2rsa2</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0013-011]
+
<actionbody>
+
<label>URL1rsa1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0014-001]
+
<actionbody>
+
<mode>write</mode>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0014-002]
+
<actionbody>
+
<format>X509</format>
+
<label>CAX1</label>
+
<issuerkey></issuerkey>
+
<subjectkey></subjectkey>
+
<certstore>0</certstore>
+
<certfile>c:\unifiedcertstore2\CAX1.cer</certfile>
+
<certowner>ca</certowner>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0014-004]
+
<actionbody>
+
<mode>read</mode>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0014-005]
+
<actionbody>
+
<certtype>ca</certtype>
+
<label>CAX1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0014-006]
+
<actionbody>
+
<label>CAX1</label>
+
<uid>1</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0014-007]
+
<actionbody>
+
<label>CAX1</label>
+
<trust>1</trust>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0014-009]
+
<actionbody>
+
<mode>write</mode>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0014-010]
+
<actionbody>
+
<certtype>ca</certtype>
+
<label>CAX1</label>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0014-011]
+
<actionbody>
+
<label>*.*</label>
+
<deleteallcerts>1</deleteallcerts>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0015-002]
+
<actionbody>
+
<uid>1</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0015-003]
+
<actionbody>
+
<uid>2</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0015-004]
+
<actionbody>
+
<uid>3</uid>
+
</actionbody>
+
+
[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0015-005]
+
<actionbody>
+
<uid>4</uid>
+
</actionbody>
+
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-001]
+
+<actionbody>
+
+ <mode>write</mode>
+
+</actionbody>
+
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-002]
+
+<actionbody>
+
+ <certtype>ca</certtype>
+ <label>*.*</label>
+ <deleteallcerts>1</deleteallcerts>
+
+</actionbody>
+
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-003]
+
+<actionbody>
+
+ <ImportData>rsacertkey3.txt</ImportData>
+
+ <keyusage>AllUsagesButNR</keyusage>
+
+ <keylabel>Add RSA key 3</keylabel>
+
+ <keyaccesstype>Extractable</keyaccesstype>
+
+</actionbody>
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-004]
+
+<actionbody>
+
+ <format>X509</format>
+
+ <label>rsacert3</label>
+
+ <subjectkeyid></subjectkeyid>
+
+ <certstore>0</certstore>
+
+ <certfile>c:\unifiedcertstore2\rsacert3.cer</certfile>
+
+ <certowner>user</certowner>
+
+</actionbody>
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-005]
+
+<actionbody>
+
+ <filter>
+
+ <usesubjectkeyid>c:\unifiedcertstore2\rsacert3.cer</usesubjectkeyid>
+
+ </filter>
+
+</actionbody>
+
+<actionresult>
+
+ <CCTCertInfo><label>rsacert3</label></CCTCertInfo>
+
+</actionresult>
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-006]
+
+<actionbody>
+
+ <certtype>user</certtype>
+
+ <label>rsacert3</label>
+
+</actionbody>
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-007]
+
+<actionbody>
+
+ <ImportData>SelfSignedPrivateKey_pk8.pk8</ImportData>
+
+ <keyusage>AllUsagesButNR</keyusage>
+
+ <keylabel>selfsignedprivatekey</keylabel>
+
+ <keyaccesstype>Extractable</keyaccesstype>
+
+</actionbody>
+
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-008]
+
+<actionbody>
+
+ <format>X509</format>
+
+ <label>selfsignedcert</label>
+
+ <issuerkey></issuerkey>
+
+ <subjectkey></subjectkey>
+
+ <certstore>0</certstore>
+
+ <certfile>c:\tcertstore\data\SelfSignedCertificate.der</certfile>
+
+ <certowner>user</certowner>
+
+</actionbody>
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-009]
+
+<actionbody>
+
+ <filter>
+
+ <usesubjectkeyid>c:\tcertstore\data\SelfSignedCertificate.der</usesubjectkeyid>
+
+ </filter>
+
+</actionbody>
+
+<actionresult>
+
+ <CCTCertInfo><label>selfsignedcert</label></CCTCertInfo>
+
+</actionresult>
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-010]
+
+<actionbody>
+
+ <certtype>user</certtype>
+
+ <label>selfsignedcert</label>
+
+</actionbody>
+
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-011]
+
+<actionbody>
+
+ <format>X509</format>
+
+ <label>cacert</label>
+
+ <issuerkey></issuerkey>
+
+ <subjectkey></subjectkey>
+
+ <certstore>0</certstore>
+
+ <certfile>c:\unifiedcertstore2\CAX1.cer</certfile>
+
+ <certowner>ca</certowner>
+
+</actionbody>
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-012]
+
+<actionbody>
+
+ <filter>
+
+ <usesubjectkeyid>c:\unifiedcertstore2\CAX1.cer</usesubjectkeyid>
+
+ </filter>
+
+</actionbody>
+
+<actionresult>
+
+ <CCTCertInfo><label>cacert</label></CCTCertInfo>
+
+</actionresult>
+
+[SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-013]
+
+<actionbody>
+
+ <certtype>ca</certtype>
+
+ <label>cacert</label>
+
+</actionbody>
+
--- a/cryptoservices/certificateandkeymgmt/tcertstore/scripts/unifiedcertstore2-conf1.script Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/tcertstore/scripts/unifiedcertstore2-conf1.script Mon May 03 14:11:52 2010 +0300
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -751,6 +751,56 @@
END_TESTCASE SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-0014
+START_TESTCASE SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId
+
+//! @SYMTestCaseID SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId
+
+//! @SYMTestCaseDesc 4.1 Test cases for cheking the retrieval of certificates based on subject key identifier.
+
+//!
+
+//! @SYMTestActions 1) No Test, Add a private key (rsacertkey)
+
+//! 2) No Test,Add the end entity certificate (rsacert1) without specifying the subject keyid.
+
+//! 3) Filter the certificate based on subject key id.
+
+//! 4) No Test,Add a self signed certificate
+
+//! 5) Filter the self signed certificate based on subject key id.
+
+//! 6) No Test,Add a CA certificate
+
+//! 7) Filter the CA certificate based on subject key id.
+
+RUN_TEST_STEP -1 CTestHandler init unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-001
+
+RUN_TEST_STEP -1 CTestHandler deletecert unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-002
+
+RUN_TEST_STEP -1 CTestHandler importkey unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-003
+
+RUN_TEST_STEP -1 CTestHandler addcert unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-004
+
+RUN_TEST_STEP -1 CTestHandler listcert unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-005
+
+RUN_TEST_STEP -1 CTestHandler deletecert unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-006
+
+RUN_TEST_STEP -1 CTestHandler importkey unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-007
+
+RUN_TEST_STEP -1 CTestHandler addcert unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-008
+
+RUN_TEST_STEP -1 CTestHandler listcert unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-009
+
+RUN_TEST_STEP -1 CTestHandler deletecert unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-010
+
+RUN_TEST_STEP -1 CTestHandler addcert unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-011
+
+RUN_TEST_STEP -1 CTestHandler listcert unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-012
+
+RUN_TEST_STEP -1 CTestHandler deletecert unifiedcertstore2-conf1.ini SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId-013
+
+END_TESTCASE SEC-CERTMAN-UNIFIEDCERTSTORE2-CONF1-FilterOnSubjectKeyId
+
--- a/cryptoservices/certificateandkeymgmt/tcertstore/t_certstoredefs.h Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/tcertstore/t_certstoredefs.h Mon May 03 14:11:52 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-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"
@@ -151,6 +151,8 @@
_LIT8(KSubjectKeyIdEnd,"</subjectkeyid>");
_LIT8(KIssuerKeyIdStart,"<issuerkeyid>");
_LIT8(KIssuerKeyIdEnd,"</issuerkeyid>");
+_LIT8(KUseSubjectKeyIdStart,"<usesubjectkeyid>");
+_LIT8(KUseSubjectKeyIdEnd,"</usesubjectkeyid>");
// tag for Notification of Change
_LIT8(KChangeNotifiedStart, "<ChangeNotification>");
--- a/cryptoservices/certificateandkeymgmt/tcertstore/t_filter.cpp Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/tcertstore/t_filter.cpp Mon May 03 14:11:52 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -22,6 +22,7 @@
#include "t_certstoredefs.h"
#include <ccertattributefilter.h>
+#include <x509cert.h>
CCertAttributeFilter* CFilter::NewL(Output& aOut,
const TDesC8& aFilter)
@@ -81,6 +82,10 @@
// Set subjetkeyid filter
SetIssuerKeyIdFilter(Input::ParseElement(aFilter, KIssuerKeyIdStart));
+
+ // Set subjetkeyid using the certificate details
+ SetSubjectKeyIdFromCertFilterL(Input::ParseElement(aFilter, KUseSubjectKeyIdStart));
+
}
void CFilter::SetLabelFilter(const TDesC8& aLabel)
@@ -386,4 +391,23 @@
}
}
+void CFilter::SetSubjectKeyIdFromCertFilterL(const TDesC8& aCertPath)
+ {
+ if(aCertPath != KNullDesC8)
+ {
+ RFs fs;
+ User::LeaveIfError(fs.Connect());
+ CleanupClosePushL(fs);
+ TFileName filename;
+ filename.Copy(aCertPath);
+ HBufC8* buf = Input::ReadFileL(filename, fs);
+ CleanupStack::PushL(buf);
+ CX509Certificate* cert = CX509Certificate::NewLC(buf->Des());
+ TKeyIdentifier id = cert->SubjectKeyIdL();
+ CleanupStack::PopAndDestroy(3, &fs); // buf, cert, fs
+ iFilter->SetSubjectKeyId(id);
+ }
+ }
+
+
CCertAttributeFilter* CFilter::iFilter = NULL;
--- a/cryptoservices/certificateandkeymgmt/tcertstore/t_filter.h Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/tcertstore/t_filter.h Mon May 03 14:11:52 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -64,6 +64,9 @@
void SetSubjectKeyIdFilter(const TDesC8& aSubjectKeyId);
// Sets the issuerkeyid which is synonymous to the authority key identifier.
void SetIssuerKeyIdFilter(const TDesC8& aIssuerKeyId);
+ // Sets the subjetkeyid filter using the certificate.
+ void SetSubjectKeyIdFromCertFilterL(const TDesC8& aCertPath);
+
private:
static CCertAttributeFilter* iFilter;
Binary file cryptoservices/certificateandkeymgmt/tcertstore/tdata/selfsignedprivatekey_pk8.pk8 has changed
--- a/cryptoservices/certificateandkeymgmt/tpkixcert_tef/scripts/validatetests.ini Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/tpkixcert_tef/scripts/validatetests.ini Mon May 03 14:11:52 2010 +0300
@@ -80,8 +80,6 @@
endentity=c:\tpkixcert_tef\data\fulltrust.der
rootcert-01=c:\tpkixcert_tef\data\fulltrust.der
oid-01=2.5.29.19
-cert-00critoid-01=2.5.29.19
-cert-01critoid-01=2.5.29.19
error=0
numberofcerts=2
--- a/cryptoservices/certificateandkeymgmt/wtlscert/doxygen_docs/Certman_WTLS_overview.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,223 +0,0 @@
-/**
-
-@page overview_WTLS WTLS
-\n
-
-@section WTLS_component_overview WTLS Certificate Management component overview
-
-The WTLS component provides support for validating WTLS certificate chains.
-WTLS certificates are used for server authentication in the @ref protocol_WTLS "WTLS protocol".
-
-WTLS certificate management is implemented as a single DLL, \c WTLSCert.DLL. This includes an implementation of the WTLS
-certificate class and its components, and an implementation of the WTLS certificate validation algorithm.
-
-Symbian OS supports only @ref WTLS_server_authentication "WTLS server authentication" (class 2), which involves parsing,
-validating and storing WTLS certificates.
-The WTLS Certificate Management component only offers support for the validation of chains composed exclusively of
-WTLS certificates. The component offers the following functionality for processing WTLS certificates:
-
-@li ability to parse a set of WTLS certificates, sent from the server, from their binary encoded form into a form in which
- they are useful, and in which client code can extract interesting information (e.g. name information)
-
-@li use of these certificates to construct a chain back to a locally stored trusted @ref root_certificate "root certificate"
-
-@li validation of this certificate chain; this includes verifying the signature and validity dates on each @ref certificate.
-
-<hr>
-
-@section WTLS_certificate WTLS certificate
-
-@section basic_data_structures Basic data structures
-
-The following classes derive from their counterparts in \c Crypto.DLL, and add only a set of constructors for construction
-from encoded binary data:
-@li \c CWTLSValidityPeriod: derived from \c CValidityPeriod
-@li \c CWTLSAlgorithmIdentifier: derived from \c CAlgorithmIdentifier
-@li \c CWTLSSigningAlgorithmIdentifier: derived from \c CSigningAlgorithmIdentifier
-@li \c CWTLSSubjectPublicKeyInfo: derived from \c CSubjectPublicKeyInfo
-@li \c CWTLSRSAPublicKey: derived from \c CRSAPublicKey
-
-Classes representing public keys are derived from the corresponding classes in \c cryptalg.h and add only a set of
-constructors for construction from encoded binary data. The WTLS Certificate Management component only offers support for
-RSA asymmetric algorithms (and RSA with SHA-1).
-
-@section name_forms Name forms
-
-The name forms/identifiers supported are: text strings (Latin-1 and Unicode), and X.500 Distinguished Names.
-The WTLS name is implemented in the \c CWTLSName class and stores the type of the underlying name (as a value for the
-\c TWTLSNameType enumeration, accessible through the \c CWTLSName::NameType() function) and the encoding of the underlying type
-(accessible as a pointer descriptor through the \c CWTLSName::NameData() function). The \c CWTLSName class also provides a function
-to do matching, \c CWTLSName::ExactMatchL(), which returns a boolean value. This function is needed for constructing/validating
-certificate chains and performs a simple byte comparison of the name forms.
-
-@section text_type Text type
-
-The \c CWTLSText class is provided to represent the text type, and can be constructed from encoded binary data. It provides
-the function, \c CWTLSText::CharacterSet(), for accessing the character set, which in turn is an integer representing the IANA designated
-number for the character set. The text can be retreived using the \c CWTLSText::Name() function. \c CWTLSText also provides the function,
-\c CWTLSText::ExactMatchL(), for matching, for which two strings that are the same, but represented in different character sets,
-should match. This differs from \c CWTLSName::ExactMatchL() for which the same two strings would not match as the bytes
-would be different.
-
-@section structured_text_type Structured text type
-
-Structured text types are represented by a subclass of \c CWTLSText called \c CWTLSStructuredText. For this type, the name
-is parsed into a set of fields. Accessors are provided for the mandatory fields: \c CWTLSStructuredText::ServiceName(), \c CWTLSStructuredText::Organization(),
-\c CWTLSStructuredText::Country(). Optional fields are represented by the \c TWTLSStructuredTextField class. This provides two accessors,
-\c TWTLSStructuredTextField::Type() and \c TWTLSStructuredTextField::Value(), to return the type of the field (this is the part of the field text on the left hand side of the
-assignment operator in the name) and its value. To access the optional fields in \c CWTLSStructuredText, functions are
-provided to return the number of fields, \c CWTLSStructuredText::Count(), and to return a particular field by its index, \c CWTLSStructuredText::FieldByIndex(). It
-is also possible to access a field value by its type using the \c CWTLSStructuredText::FieldByName() function, giving as a parameter the type of
-the desired field. This function returns a pointer because the field may not be present, in which case the return value is
-\c NULL. However, the field returned remains the property of \c CWTLSStructuredText, so calling code should not destroy it.
-
-
-@section CWTLSCertificate_class CWTLSCertificate class
-
-The \c CWTLSCertificate class is a subclass of \c CCertificate. It offers eight differing \c CWTLSCertificate::NewL()/NewLC() functions that
-allow class construction from encoded binary form, streams, or from the @ref WTLS_certificate_storage "certificate store".
-The \c CWTLSCertificate::IsEqualL() function tests whether two certificates are equal, which is not a simple as it sounds.
-For @ref X509_certificate "X.509 certificates", equality means that the issuer name and serial number fields are the same.
-This guarantees equality since a @ref CA "Certification Authority" (CA) must ensure that every certificate it issues has a
-unique serial number. But WTLS certificates do not include serial numbers, so there seems to be no definition of equality.
-The equality operator here will use a byte-for-byte comparison of the signatures on the certificates: this should not
-result in any false positives, but may give false negatives if CAs do naughty things like recertifying the same key (which
-they have been known to do).
-
-The functions \c CWTLSCertificate::IssuerName() and \c CWTLSCertificate::SubjectName() return the certificate's issuer and subject names, respectively, as
-@ref name_forms "WTLSName objects". If the certificate is an X.509 certificate, then if the name contains a Common name,
-that will be returned; otherwise, if the name contains an Organization name, that will be returned. Otherwise, an empty
-string will be returned. If the certificate is a WTLS certificate, then if the name is an X.500 @ref DN then the same rules
-will apply as for X.509 certificates. If the name is null, an empty string will be returned. If the name is of type text,
-then if the name is not a 'structured' name, the entire string will be returned; otherwise, the same procedure will be
-followed as for X.509 certificates.
-
-The \c CWTLSCertificate::ExternalizeL() function externalises the certificate to a stream. This should not be used if client code is using
-certstore. The \c CWTLSCertificate::InternalizeL() function initialises the certificate from a stream. This should not be called by client
-code; instead one of the \c CWTLSCertificate::NewL()/NewLC() static factory functions above should be used. If a client is using the
-certstore component for storage then it should use \c MCTWritableCertStore::AddL() for externalising and
-\c CWTLSCert::NewL(CCertStore& aStore, const CCertStoreEntry& aEntry) for restoring. The \c CWTLSCertificate::IsTCAL()
-function tests whether the certificate is capable of signing other certificates. Currently, this only supports structured
-text variety of WTLS certificates; other certificate types will return \c EFalse.
-
-
-
-<hr>
-
-@section WTLS_certificate_processing WTLS Certificate processing
-
-This specifies how the certificates are used for authentication: that is, how a collection of certificates is made
-into a chain terminating at a trusted root, and how that chain is then validated.
-
-The following inputs need to be supplied to the validation process:
-@li the time for which validation is to be performed
-@li a set of one or more encoded WTLS certificates sent from the server
-@li some way of indicating where to find trusted roots to complete the chain.
-
-For WTLS, the server is expected to supply an ordered collection of certificates; that is, the first certificate should be
-the server's own certificate, each subsequent certificate should certify the one immediately preceding it in the chain.
-Some checks are run on the chain in advance of validation to limit the number of requests made to the
-@ref WTLS_certificate_storage "certificate store". In particular, the chain is checked to ensure that each parent
-certificate has the authority to sign subsequent child certificates. Additionally, the chain is scanned for the earliest
-certificate in the chain that may already be declared to be trusted by the user, therefore cutting down on both retrieval
-and validation time. Finally, if no trusted certificate can be found within the given chain, a search of the local store
-is made to see whether any trusted certificates exist that can complete and validate the chain.
-
-To work around the absence of a means within the WTLS certificate data structure for a @ref CA to indicate whether the
-entity it is certifying is a CA or an @ref EE "End Entity" (EE), the maximum length of a WTLS certificate chain will be 2:
-that is, there may be no intermediate CAs.
-
-The result is a @ref CWTLSValidationResult_class object indicating the success or failure of the operation, with a reason
-for failure if appropriate and an integer indicating which certificate in the chain was bad, if appropriate. It is possible
-for client code to iterate through the certificates in the chain to retrieve and examine them.
-
-Client code uses the \c CWTLSCertificate class to do actual validation, using a set of one or more certificates supplied by a
-server and a local store of trusted root certificates. It uses two public classes, \c CWTLSCertChain and
-\c CWTLSValidationResult.
-
-@section CWTLSCertChain_class CWTLSCertChain
-
-Validation consists of constructing a chain from a set of one or more certificates supplied by the client, a set of trusted
-root certificates, and a time for which validation is to be performed. Each subsequent certificate must directly certify
-the preceding one. The chain object will attempt to construct a valid chain ending in a trusted root from the encoded
-certificates supplied by the server and the set of trusted roots.
-
-The chain supplied by the client is limited only by memory considerations. However, a check of the proposed chain is done
-to attempt to validate the shortest chain possible. For example, if the client supplied 15 certificates, but the third
-certificate is marked as trusted in the @ref WTLS_certificate_storage "certificate store", then validation will proceed
-with only the first three certificates. The remaining 12 certificates are discarded and are no longer part of the chain.
-
-Validating the chain consists in ensuring that:
-@li the issuer name for each certificate is the same as the subject name on the next certificate in the chain: this is
- really guaranteed in the construction process
-@li every certificate is within its validity period for the time specified
-@li the signature on each certificate is valid
-@li all non-self-signed CA certificates contain the appropriate values within the certificate allowing them to sign child
- certificates. In the case of @ref structured_text_type "WTLS structured text certificates", this is indicated by the
- presence of the extension field \c "T=ca" in the subject, where \c T stands for WTLS title.
-
-This class may be constructed in one of two ways:
-
-
-@li @code IMPORT_C static CWTLSCertChain* NewL(RFs& aFs, const TPtrC8& aEncodedCerts, const TUid aClient); @endcode
- Here, the first parameter is an open file server session, the second is a single descriptor containing a simple
- concatenation of one or more encoded WTLS certificates. The third parameter is a UID identifying the client for whom
- validation is being performed. With this version of the function the certstore is used to find candidate root
- certificates; only certificates in the store which are trusted by that client will be considered as valid.
-
-@li @code IMPORT_C static CWTLSCertChain* NewL(RFs& aFs, const TPtrC8& aEncodedCerts, const CArrayPtr<CWTLSCertificate>& aRootCerts); @endcode
- The only difference here is that rather than using the certstore for root certificates, the client supplies a
- collection of WTLS certificates which may be considered candidate roots for the validation process. This version should
- be used when clients do not want to use the certificate store provided (for example, an application may require that a
- certificate chain can only be completed by a certificate found on the device's WIM). Because they're not using the
- certificate store clients don't have to supply a UID.
-
-The \c CWTLSCertChain::ValidateL() function actually does the validation and takes a single parameter, which is the time for which
-validation should be performed. Clients can find the number of certificates in the chain using the \c CWTLSCertChain::Count() function, and
-retrieve individual certificates using the \c CWTLSCertChain::Cert() function. It should be noted that both of these functions return
-undefined values after the call to \c CWTLSCertChain::ValidateL() and until the completion of the associated active object. This is because
-the validation procedure potentially optimises the chain handed to it and thus the chain can change after validation.
-In summary:
-@li Before calling \c CWTLSCertChain::ValidateL(), these functions return values consistent with the certificates that have been added to
- the chain.
-@li During the execution of the active object, these return undefined values.
-@li After the completion of the active object, these functions return values consistent with the chain that was actually
- used for validation. These values may or may not be same as before the call to \c CWTLSCertChain::ValidateL().
-
-The \c CWTLSCertChain::AppendCertsL() function can be used to append one or more encoded certificates to the certificate chain.
-
-
-@section CWTLSValidationResult_class CWTLSValidationResult
-
-The \c CWTLSValidationResult object encapsulates the result of the validation operation. The \c CWTLSValidationResult::Error() function returns
-the error status for the chain. Any errors here are considered fatal: validation has failed. The \c CWTLSValidationResult::Warnings() function
-returns an array of any warnings generated: these may or may not be fatal, depending on the context, which the client is
-expected to provide.
-
-
-Class \c TWTLSValidationStatus contains the following public data: \c iReason, and \c iCert.
-The reason for the error is given by \c iReason, while \c iCert gives the index number for the certificate that gave rise
-to the error. Some errors cannot be blamed on any single certificate, in which case the \c iCert value is meaningless. The
-same structure is used for errors and for warnings.
-
-The following errors are defined in the \c TValidationError enumeration:
-@li \c EChainHasNoRoot: it was not possible to find a trusted root to complete the chain; the \c iCert variable is
- meaningless.
-@li \c ESignatureInvalid: signature verification failed; the \c iCert variable is set to the position in the chain of the
- certificate whose signature failed to verify.
-@li \c EDateOutOfRange: the date supplied to the validation algorithm lay outside the validity period for one of the
- certificates; the \c iCert variable is set to the position in the chain of the certificate whose validity period did
- not include the supplied time.
-
-<hr>
-
-@section WTLS_certificate_storage Certificate storage
-
-Certificate management already provides a means for applications to store certificates, retrieve them from storage, and
-mark them as trusted or untrusted for various applications. It currently does this using a kind of registration scheme
-where users of certificate-based authentication supply a UID to the certificate store, and users can edit the certificates
-associated with each UID through a control panel application. When they require validation they supply the UID to the
-validation component, which uses this to select a set of those certificates in the store that may be considered trust roots
-for this application.
-
-*/
\ No newline at end of file
--- a/cryptoservices/certificateandkeymgmt/x500/doxygen_docs/Certman_X509_and_X500_overview.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/**
-@page overview_X500_and_X509 X.500 and X.509 Overview
-
-The X.500 component is a general component that provides services for the handling of X.500 distinguished names.
-It implements the @ref DN "Distinguished Name" (DN) as defined in the X.500 standard. An X.500 Distinguished Name consists of a
-sequence of \c AttributeTypeAndValue objects, as defined in the X.520 standard. Thus the two public classes implemented in
-this DLL are \c CX520AttributeTypeAndValue and \c CX500DistinguishedName.
-
-The X.509 component provides classes for handling @ref X509_certificate "X.509 certificates". It provides an implementation of the X.509
-certificate and its components. In fact X.500 also includes structures from X.520, but for simplicity they are considered
-to be part of X.500.
-
-For the most part, these DLLs simply represent data that the PKIXCert DLL operates on: they are the primary
-input to certificate validation.
-
-In the X.500, X.509 and X.520 standards the structures are specified with Abstract Syntax Notation 1 (@ref ASN "ASN.1") and are
-encoded for transport using the @ref "Basic Encoding Rules" (BER) which encode @ref ASN "ASN.1" as 8-bit binary data.
-
-In addition, when they represent data to be signed, as they do within certificate management, the signature is calculated
-on the data encoded using @ref DER "Distinguished Encoding Rules" (DER: a subset of @ref BER which has the property that the
-same data always encodes to the same binary representation).
-
-*/
\ No newline at end of file
--- a/cryptoservices/certificateandkeymgmt/x509/doxygen_docs/Certman_X509_index.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-/**
-
-@page Certman_X509_Certificate_Validation X.509 Certificate Validation
-\n
-
-@li @ref overview_X509_and_PKIX
-@li @ref overview_Certificate_Validation_in_PKIX
-@li @ref overview_X509_PKIXCert
-@li @ref overview_X500_and_X509
-*/
\ No newline at end of file
--- a/cryptoservices/certificateandkeymgmt/x509/doxygen_docs/Certman_X509_overview.dox Fri Apr 16 16:52:34 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/**
-
-@page overview_X509_and_PKIX X.509 and PKIX
-\n
-
-A @ref certificate consists of a public key together with some identifying information, all of which is signed with a
-@ref CA "Certificate Authority's" (CA's) private key. Different @ref certificate specifications elaborate on this in different ways
-with varying syntax, encoding rules and processing requirements.
-
-Currently, X.509 is the dominant specification and is used by @ref TLS, @ref SMIME "S/MIME" and @ref IPSec. In addition to this
-certificate type, the Symbian OS also provides support for and implements @ref WTLS certificates: this page deals with
-X.509, for information on WTLS see @ref overview_WTLS Certificates Overview.
-
-
-<hr>
-
-@section need_for_profiles_in_x509 The need for profiles in X.509
-
-The X.509 specification alone is not restrictive or specific enough to form the basis of an implementation of a
-certificate management component. Realisation of this fact has led to the creation of a set of mostly incompatible
-profiles.
-
-While X.509 defines an extensible syntax for all the data structures required to perform certificate management, a profile
-adds three things:
-@li a restriction on the sorts of data structures that an implementation is required to understand
-@li a requirement that certain specific sorts of data structure be present, so an implementation may rely on their
-presence
-@li a clear definition of the behaviour of a certificate management component, i.e. a specification of what it is supposed
-to do with the data structures involved
-
-The best example of this is seen in certificate extensions. X.509 defines the syntax of a series of extension types, and
-permits new extensions to be defined using object identifiers. It does not require the presence of any extensions and does
-not clearly indicate what it means to support a particular extension. Thus an implementation cannot know which extensions
-will be present, or exactly what to do with them. A profile like PKIX defines a set of extensions that a PKIX-compliant
-certificate management component must be able to deal with, which extensions can be assumed to be present, and a definition
-of what it means to deal with them.
-
-The distinction between X.509 and its profiles is largely one of syntax versus behaviour: X.509 defines the syntax of the
-objects, and the profile defines how the presence and values of objects affects the behaviour of certificate management.
-In addition, a profile may define extra pieces of syntax, specific to the application for which it is designed.
-
-
-
-
-<hr>
-
-@section profile_support_in_certman Profile support in Certman
-
-Certificate Management implements X.509 along with one profile, the PKIX profile, defined in RFC 2549. Its design attempts
-to incorporate the distinction between X.509 and its profiles, enabling further additions to be made to the X.509 part
-without affecting any profiles, and enabling further profiles to be defined without affecting the X.509 specific part.
-
-The decision to use a particular profile rests with the application.
-
-All general classes defined in X.509 are prefixed with 'X509', all profile specific classes are prefixed with the name of
-the profile.
-
-
-<hr>
-
-@section x509_specific_part X.509 specific part
-
-The @ref X509_certificate "X.509 certificate" itself and the generic extension object are both clearly part of X.509 itself.
-
-The generic extension object is simply an ASN1 'any defined by' structure, with accessors for its @ref OID and its encapsulated
-data.
-
-The @ref X509_certificate "X.509 certificate" provides a function that, given a particular @ref OID, returns a pointer to a particular extension object
-or NULL if the extension is not present. It also provides functions to verify its signature, given a key, and return the
-various data members that @ref X509 "X.509" requires, such as its subject and issuer DNs. However, it does not provide accessors for
-any particular extensions (e.g. there is no KeyUsage() function, since it cannot be assumed that key usage is present).
-
-A generic certificate chain object is also provided; this simply has a set of X.509 certificates, provides accessors to
-them and implements a function to decode a set of certificates from @ref DER encoded @ref ASN "ASN.1".
-
-Specific extension classes are in a bit of a no-man's land. This is because many of them are defined by @ref X509 "X.509", but more
-can be added by any profile, and a profile will require the use of a particular set of extensions. So, all the extensions
-used by @ref PKIX in @ref X509 "X.509" have been implemented on the assumption that they are likely to be useful for other profiles,
-however, profiles are free to define extra extensions. Since these extension classes are implemented in @ref X509 "X.509", they only
-define the syntax of the extension, not the way it should be used. Because they are radically different they do not share
-a common base class.
-
-
-<hr>
-
-@section profile_specific_part Profile specific part
-
-The profile specific part defines two significant public classes:
-
-@li \b PKIX \b certificate \b chain \b object \n
- This is main class which encapsulates path processing in the @ref PKIX profile. Thus it defines which extensions are
- required, which extensions are understood, and how they are understood.
-
-@li \b PKIX \b validation \b result \b object \n
- This is constructed by the chain object in the course of validation and handed to the client to examine.
-
-These classes are described in more detail in Certificate validation in @ref PKIX; the validation process discussed there is
-@ref PKIX specific.
-
-
-
-
-*/
\ No newline at end of file
--- a/cryptoservices/certificateandkeymgmt/x509/x509cert.cpp Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/x509/x509cert.cpp Mon May 03 14:11:52 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1998-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"
@@ -1337,3 +1337,31 @@
return KeyIdentifierL();
}
+
+
+EXPORT_C TKeyIdentifier CX509Certificate::SubjectKeyIdL()
+ {
+ // if it is a v1 or v2 type then there is no way of knowing which is a CA, treat all certs as CA as done in the certificate recognizer.
+ if (Version() != 3 )
+ {
+ return SubjectKeyIdentifierL();
+ }
+
+ // if it is x509 v3 certificate then check for the basic constraint extension.
+ const CX509CertExtension* ext = Extension(KBasicConstraints);
+ if (ext)
+ {
+ CX509BasicConstraintsExt* basic = CX509BasicConstraintsExt::NewLC(ext->Data());
+ TBool markedAsCA = basic->IsCA();
+ CleanupStack::PopAndDestroy(basic);
+ // it can be an intermediate as well as root CA
+ if ( markedAsCA )
+ {
+ return SubjectKeyIdentifierL();
+ }
+ }
+ // For non-CA certs, use the recommended method of computing it from RFC5280, section 4.2.1.2
+ return KeyIdentifierL();
+
+ }
+
