--- a/commondrm/drmrightsmanagerui/src/DRMCommonUtilities.cpp Mon Mar 08 21:43:44 2010 +0000
+++ b/commondrm/drmrightsmanagerui/src/DRMCommonUtilities.cpp Sun Mar 14 13:10:51 2010 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2010 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"
@@ -308,10 +308,18 @@
TUint32 drmScheme( EDrmSchemeUnknownDrm );
params = new( ELeave )CArrayFixFlat<TPtrC>( sizeof( TPtrC ) );
CleanupStack::PushL( params );
-
+ TChar ch;
+
+ aLex.Mark();
while ( !aLex.Eos() ) // Extract the parameters
{
- params->AppendL( aLex.NextToken() );
+ ch = aLex.Get();
+ if ( ch == '\x00' ) {
+ aLex.UnGet();
+ params->AppendL( aLex.MarkedToken() );
+ aLex.Get();
+ aLex.Mark();
+ }
}
TInt startParam = KMaxTInt;
--- a/commondrm/drmsettingsplugin/inc/drmsettingsusagecheckbox.h Mon Mar 08 21:43:44 2010 +0000
+++ b/commondrm/drmsettingsplugin/inc/drmsettingsusagecheckbox.h Sun Mar 14 13:10:51 2010 +0000
@@ -27,6 +27,7 @@
class CDRMSettingUsageList;
class CDRMSettingsModel;
class CAknInfoPopupNoteController;
+class CDRMSettingsPlugin;
/**
* CDrmSettingUsageCheckBox class
@@ -41,7 +42,8 @@
*/
CDrmSettingUsageCheckBox( TInt aResourceId,
CDRMSettingUsageList* aList,
- CDRMSettingsModel* aModel );
+ CDRMSettingsModel* aModel,
+ CDRMSettingsPlugin* aPlugin );
/**
* Destructor.
@@ -73,6 +75,9 @@
// Owned
CAknInfoPopupNoteController* iPopupController;
+
+ // Pointer to CDrmSettingsPlugin instance
+ CDRMSettingsPlugin* iDrmSettingsPlugin;
};
--- a/commondrm/drmsettingsplugin/src/drmsettingsplugin.cpp Mon Mar 08 21:43:44 2010 +0000
+++ b/commondrm/drmsettingsplugin/src/drmsettingsplugin.cpp Sun Mar 14 13:10:51 2010 +0000
@@ -651,9 +651,10 @@
new (ELeave) CDrmSettingUsageCheckBox(
R_DRM_SETTINGS_METERING_CHECKBOX_PAGE,
usageList,
- model ) );
-
- isValueUpdated =
+ model,
+ this ) );
+
+ isValueUpdated =
usageCheckBox->ExecuteLD( CAknSettingPage::EUpdateWhenAccepted );
CleanupStack::PopAndDestroy( usageList );
--- a/commondrm/drmsettingsplugin/src/drmsettingsusagecheckbox.cpp Mon Mar 08 21:43:44 2010 +0000
+++ b/commondrm/drmsettingsplugin/src/drmsettingsusagecheckbox.cpp Sun Mar 14 13:10:51 2010 +0000
@@ -25,6 +25,7 @@
#include "drmsettingsusagecheckbox.h"
#include "drmsettingsusagelist.h"
#include "drmsettingsmodel.h"
+#include "drmsettingsplugin.h"
// ================= MEMBER FUNCTIONS =======================
@@ -36,9 +37,11 @@
CDrmSettingUsageCheckBox::CDrmSettingUsageCheckBox(
TInt aResourceId,
CDRMSettingUsageList* aList,
- CDRMSettingsModel* aModel ) : CAknCheckBoxSettingPage( aResourceId, aList ),
+ CDRMSettingsModel* aModel,
+ CDRMSettingsPlugin* aPlugin ) : CAknCheckBoxSettingPage( aResourceId, aList ),
iList( aList ),
- iModel( aModel )
+ iModel( aModel ),
+ iDrmSettingsPlugin( aPlugin )
{
}
@@ -72,6 +75,11 @@
ShowInfoPopupL();
}
+ if ( ( aType == EEventKey ) && ( aKeyEvent.iCode == EKeyEscape ) )
+ {
+ iDrmSettingsPlugin->HandleCommandL( EEikCmdExit );
+ }
+
return response;
}
--- a/commondrm/drmutility/src/DrmUiHandlingImpl.cpp Mon Mar 08 21:43:44 2010 +0000
+++ b/commondrm/drmutility/src/DrmUiHandlingImpl.cpp Sun Mar 14 13:10:51 2010 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2006-2010 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"
@@ -3826,7 +3826,7 @@
__ASSERT_DEBUG( !aLaunchParam && aUrl && aFullPath,
User::Panic( KDRMUtilityDebugPanicMessage,
KDRMUtilityDebugPanicCode ) );
- _LIT( KSpace, " " );
+ _LIT( KMarker, "\x00" );
RPointerArray<CDRMPermission> uriList;
TPtr ptr( NULL, 0 );
@@ -3850,10 +3850,10 @@
ptr.AppendNum( localId );
// length of startparam and drm protection scheme are always 1 and
- // 4 spaces are needed
- const TInt KSpacesBetweenParams( 4 );
+ // 5 markers are needed
+ const TInt KMarkersForParams( 5 );
TInt length( 1 + aUrl->Length() + ptr.Length() + aFullPath->Length()
- + KSpacesBetweenParams + 1 );
+ + KMarkersForParams + 1 );
aLaunchParam = HBufC::NewLC( length );
ptr.Set( aLaunchParam->Des() );
@@ -3869,20 +3869,21 @@
{
ptr.AppendNum( EDrmLaunchParamStandAloneUtility );
}
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
ptr.Append( *localIDBuf );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
HBufC* contentUrl( CnvUtfConverter::ConvertToUnicodeFromUtf8L( *aUrl ) );
ptr.Append( *contentUrl );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
// OMA DRM protection scheme
ptr.AppendNum( EDrmSchemeOmaDrm );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
ptr.Append( *aFullPath );
+ ptr.Append( KMarker );
delete contentUrl;
@@ -3902,13 +3903,13 @@
User::Panic( KDRMUtilityDebugPanicMessage,
KDRMUtilityDebugPanicCode ) );
_LIT( KZero, "0" );
- _LIT( KSpace, " " );
+ _LIT( KMarker, "\x00" );
TPtr ptr( NULL, 0 );
// Length of startparam and drm protection scheme and zero local id
- // are always 1 and total of 3 spaces are needed
- TInt length( 1 + aUrl->Length() + 1 + 3 + 1 );
+ // are always 1 and total of 4 markers are needed
+ TInt length( 1 + aUrl->Length() + 1 + 4 + 1 );
aLaunchParam = HBufC::NewLC( length );
ptr.Set( aLaunchParam->Des() );
@@ -3924,14 +3925,15 @@
{
ptr.AppendNum( EDrmLaunchParamStandAloneUtility );
}
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
// Default value 0 for localId in case of WM DRM file
ptr.Append( KZero );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
ptr.Append( *aUrl );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
// WM DRM protection scheme
ptr.AppendNum( EDrmSchemeWmDrm );
+ ptr.Append( KMarker );
CleanupStack::Pop( aLaunchParam );
}
--- a/commondrm/drmutility/src/drmutilitywmdrmwrapper.cpp Mon Mar 08 21:43:44 2010 +0000
+++ b/commondrm/drmutility/src/drmutilitywmdrmwrapper.cpp Sun Mar 14 13:10:51 2010 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 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"
@@ -672,13 +672,13 @@
KWmDrmWrapperDebugPanicCode ) );
_LIT( KZero, "0" );
- _LIT( KSpace, " " );
+ _LIT( KMarker, "\x00" );
TPtr ptr( NULL, 0 );
// length of startparam and drm protection type indicator and zero local id
- // are always 1 and total of 3 spaces are needed
- TInt length( 1 + aUrl->Length() + 1 + 3 + 1 );
+ // are always 1 and total of 4 markers are needed
+ TInt length( 1 + aUrl->Length() + 1 + 4 + 1 );
aLaunchParam = HBufC::NewLC( length );
ptr.Set( aLaunchParam->Des() );
@@ -694,14 +694,15 @@
{
ptr.AppendNum( EDrmLaunchParamStandAloneUtility );
}
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
// Default value 0 for localId in case of WM DRM file
ptr.Append( KZero );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
ptr.Append( *aUrl );
- ptr.Append( KSpace );
+ ptr.Append( KMarker );
// WM DRM protection scheme
ptr.AppendNum( EDrmSchemeWmDrm );
+ ptr.Append( KMarker );
CleanupStack::Pop( aLaunchParam );
}
--- a/omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp Mon Mar 08 21:43:44 2010 +0000
+++ b/omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp Sun Mar 14 13:10:51 2010 +0000
@@ -682,7 +682,7 @@
}
break;
case DRM::EDrmAllowedOutputs:
- value = DRM::EDrmAllowAudioAnalog | DRM::EDrmAllowAudioBluetooth | DRM::EDrmAllowVideoMacroVision;
+ value = DRM::EDrmAllowAudioAnalog | DRM::EDrmAllowAudioBluetooth | DRM::EDrmAllowVideoMacroVision | DRM::EDrmAllowAudioFmTransmitter;
break;
case ERightsNone:
if (aRightsClient == NULL)
--- a/omadrm/drmengine/group/CryptoPrep.flm Mon Mar 08 21:43:44 2010 +0000
+++ b/omadrm/drmengine/group/CryptoPrep.flm Sun Mar 14 13:10:51 2010 +0000
@@ -13,26 +13,39 @@
# Description: DRM Crypto Library build configuration
#
+ifeq ($(_CRYPTOPREP_FLM_),)
+# first instance of this FLM
+_CRYPTOPREP_FLM_:= 1
+
TMPROOT:=$(subst \,/,$(EPOCROOT))
EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
-CREATABLEPATH:=$(EXTENSION_ROOT)/../drmengine/drmcrypto/build
-CLEANTARGETS:=$(CREATABLEPATH)/cmlacrypto.cpp $(CREATABLEPATH)/omacrypto.cpp
+# NB: abspath doesn't like Windows drive letters
+CRYPTO_SOURCE_DRIVE:=$(firstword $(subst :, ,$(EXTENSION_ROOT)))
+ifeq ($(CRYPTO_SOURCE_DRIVE),$(EXTENSION_ROOT))
+CREATABLEPATH:=$(abspath $(EXTENSION_ROOT)/../drmengine/drmcrypto/build))
+else
+CRYPTO_ABSPATH:=$(abspath $(subst $(CRYPTO_SOURCE_DRIVE):,,$(EXTENSION_ROOT)/../drmengine/drmcrypto/build))
+CREATABLEPATH:=$(CRYPTO_SOURCE_DRIVE):$(CRYPTO_ABSPATH)
+endif
crypto_files:=$(wildcard $(EXTENSION_ROOT)/../drmengine/drmcrypto/CMLA/*.cpp)
-
-BITMAP :: $(CREATABLEPATH)
+ifeq ($(crypto_files),)
+CMLA_CRYPTO_SOURCE:=$(CREATABLEPATH)/../stub/CmlaCryptoStub.cpp
+else
+CMLA_CRYPTO_SOURCE:=$(CREATABLEPATH)/../CMLA/CmlaCrypto.cpp
+endif
-ifeq ($(crypto_files),)
- $(GNUCP) $(CREATABLEPATH)/../stub/CmlaCryptoStub.cpp $(CREATABLEPATH)/cmlacrypto.cpp
-else
- $(GNUCP) $(CREATABLEPATH)/../CMLA/CmlaCrypto.cpp $(CREATABLEPATH)/cmlacrypto.cpp
-endif
- $(GNUCP) $(CREATABLEPATH)/../src/OmaCrypto.cpp $(CREATABLEPATH)/omacrypto.cpp
+$(CREATABLEPATH)/cmlacrypto.cpp: $(CMLA_CRYPTO_SOURCE)
+ $(GNUCP) $< $@
# Create dirs
$(call makepath,$(CREATABLEPATH))
## Clean up
+CLEANTARGETS:=$(CREATABLEPATH)/cmlacrypto.cpp
$(eval $(call GenerateStandardCleanTarget,$(CLEANTARGETS)))
+else
+# FLM already included - don't duplicate the targets
+endif
--- a/omadrm/drmengine/group/DrmCrypto.mmp Mon Mar 08 21:43:44 2010 +0000
+++ b/omadrm/drmengine/group/DrmCrypto.mmp Sun Mar 14 13:10:51 2010 +0000
@@ -40,9 +40,11 @@
SOURCE drmaescrypto.cpp
SOURCEPATH ../drmcrypto/build
-SOURCE omacrypto.cpp
SOURCE cmlacrypto.cpp
+SOURCEPATH ../drmcrypto/src
+SOURCE OmaCrypto.cpp
+
LIBRARY euser.lib
LIBRARY efsrv.lib
LIBRARY asn1.lib
Binary file omadrm/drmengine/keystorage/data/CM/DeviceCert.der has changed
Binary file omadrm/drmengine/keystorage/data/CM/DevicePrivateKey.der has changed
Binary file omadrm/drmengine/keystorage/data/CM/SigningCert00.der has changed
Binary file omadrm/drmengine/keystorage/data/CM/SigningCert01.der has changed
Binary file omadrm/drmengine/keystorage/data/CMLA/DeviceCert.der has changed
Binary file omadrm/drmengine/keystorage/data/CMLA/DevicePrivateKey.der has changed
Binary file omadrm/drmengine/keystorage/data/CMLA/SigningCert00.der has changed
Binary file omadrm/drmengine/keystorage/data/CMLA/SigningCert01.der has changed
Binary file omadrm/drmengine/keystorage/data/DeviceCert.der has changed
Binary file omadrm/drmengine/keystorage/data/DevicePrivateKey.der has changed
Binary file omadrm/drmengine/keystorage/data/SigningCert00.der has changed
Binary file omadrm/drmengine/keystorage/data/SigningCert01.der has changed
Binary file omadrm/drmengine/keystorage/data/UdtCertificate.der has changed
--- a/omadrm/drmhelper/src/drmhelper.cpp Mon Mar 08 21:43:44 2010 +0000
+++ b/omadrm/drmhelper/src/drmhelper.cpp Sun Mar 14 13:10:51 2010 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2010 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"
@@ -3587,16 +3587,16 @@
{
TInt index;
- // MaxInt will fit into 10 characters
- HBufC* b( HBufC::NewLC( 10 ) );
+ // MaxInt will fit into 11 characters
+ HBufC* b( HBufC::NewLC( 11 ) );
b->Des().NumUC( aLocalId );
HBufC* localIDBuf( b->ReAllocL( b->Des().Length() ) );
CleanupStack::Pop( b );
b = NULL;
CleanupStack::PushL( localIDBuf );
- // length of startparam is always 1 and 2 spaces are needed
- TInt length = 1 + aUrl->Length() + localIDBuf->Des().Length() + 2;
+ // length of startparam is always 1 and some markers are needed
+ TInt length = 1 + aUrl->Length() + localIDBuf->Des().Length() + 4;
aLaunchParam = HBufC::NewMaxL( length );
@@ -3604,7 +3604,7 @@
ptr.SetLength( 0 );
_LIT( KOne, "1" );
_LIT( KTwo, "2" );
- _LIT( KSpace, " " );
+ _LIT( KMarker, "\x00" );
// start param is 1 for embedded launch and 2 for launching details view
// standalone
@@ -3616,9 +3616,9 @@
{
ptr.Append( KTwo() );
}
- ptr.Append( KSpace() );
+ ptr.Append( KMarker() );
ptr.Append( localIDBuf->Des() );
- ptr.Append( KSpace() );
+ ptr.Append( KMarker() );
index = ptr.Length();
ptr.SetLength( length );
@@ -3627,6 +3627,8 @@
ptr[index++] = ( unsigned char ) (*aUrl)[i];
}
+ ptr.Append( KMarker() );
+
CleanupStack::PopAndDestroy( localIDBuf );
}
--- a/omadrm/drmplugins/drmrohandler/src/CRoHandler.cpp Mon Mar 08 21:43:44 2010 +0000
+++ b/omadrm/drmplugins/drmrohandler/src/CRoHandler.cpp Sun Mar 14 13:10:51 2010 +0000
@@ -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 "Eclipse Public License v1.0"
@@ -715,6 +715,7 @@
HBufC16 *number( NULL );
HBufC16 *messageContent( NULL );
HBufC16* buffer( NULL );
+ _LIT( KMarker, "\x00" );
TInt ret( 0 );
if ( iMessageBodyPtr.Size() == 0 )
@@ -771,13 +772,15 @@
TPtr ptr( number->Des() );
ptr.AppendNum( localId, EDecimal );
- messageContent = HBufC16::NewL( ptr.Length() + uri16.Length() + 4 );
+ messageContent = HBufC16::NewL( ptr.Length() + uri16.Length() + 5 );
TPtr ptrToMz( messageContent->Des() );
- ptrToMz.Append( _L( "1 " ) );
+ ptrToMz.Append( _L( "1" ) );
+ ptrToMz.Append( KMarker );
ptrToMz.Append( ptr ); // add localID
- ptrToMz.Append( _L( " " ) ); // add space
+ ptrToMz.Append( KMarker );
ptrToMz.Append( uri16 ); //add uri16
-
+ ptrToMz.Append( KMarker );
+
CleanupStack::PopAndDestroy( number );
CleanupStack::PopAndDestroy( buffer );
CleanupStack::PushL( messageContent );
Binary file omadrm/foundationcerts/data/devicekey1024.der has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/omadrm/foundationcerts/data/dummycert.cnf Sun Mar 14 13:10:51 2010 +0000
@@ -0,0 +1,40 @@
+# Copyright (c) 2010 Symbian Foundation Ltd.
+# 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:
+# Symbian Foundation - Initial contribution
+#
+# Description:
+# Config file for generating the dummy certificate
+
+
+# Steps to generate using OpenSSL
+#
+# 1. Generate key
+#
+# openssl genrsa -out devicekey1024.pem 1024
+# openssl rsa -inform pem -in devicekey1024.pem -outform der -out devicekey1024.der
+#
+# 2. Generate self-signed X509 certificate
+#
+# openssl req -new -x509 -keyform der -key devicekey1024.der -outform der -out dummycert.der -config dummycert.cnf
+#
+#
+
+
+distinguished_name = Symbian Foundation
+prompt = no
+
+[Symbian Foundation]
+ C = GB
+ ST = Test State or Province
+ L = Test Locality
+ O = Organization Name
+ OU = Organizational Unit Name
+ CN = Common Name
+ emailAddress = noreply@symbian.org
+
Binary file omadrm/foundationcerts/data/dummycert.der has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/omadrm/foundationcerts/group/bld.inf Sun Mar 14 13:10:51 2010 +0000
@@ -0,0 +1,30 @@
+/*
+* Copyright (c) 2010 Symbian Foundation Ltd.
+* 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:
+* Symbian Foundation - Initial contribution
+*
+* Description:
+* Component to install dummy key & certificate to keep DRM engine alive
+*/
+
+PRJ_EXPORTS
+
+/*
+ * 96b7db19a4d05a4bc8e3a51c885088e679354469 - this directory name should be the SHA1 checksum
+ * of the active part of the certificate public key (see CDrmStdKeyStorage::ImportDataL), but
+ * hasn't been recalculated for this certificate
+ */
+
+../data/devicekey1024.der z:/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
+../data/dummycert.der z:/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
+../data/dummycert.der z:/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
+
+#ifdef __DRM_USER_DATA_TRANSFER
+../data/dummycert.der z:/private/101F51F2/PKI/UdtCertificate.der
+#endif
--- a/omadrm/group/bld.inf Mon Mar 08 21:43:44 2010 +0000
+++ b/omadrm/group/bld.inf Sun Mar 14 13:10:51 2010 +0000
@@ -15,8 +15,6 @@
*
*/
-#include <platform_paths.hrh>
-
PRJ_PLATFORMS
DEFAULT
@@ -41,37 +39,6 @@
../drmplugins/drmromtm/loc/RoMtmUi.loc MW_LAYER_LOC_EXPORT_PATH( romtmui.loc )
-// CMLA RnD keys
-../drmengine/keystorage/data/CMLA/DevicePrivateKey.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
-../drmengine/keystorage/data/CMLA/DeviceCert.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
-../drmengine/keystorage/data/CMLA/SigningCert00.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
-../drmengine/keystorage/data/CMLA/SigningCert01.der /epoc32/winscw/c/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
-
-../drmengine/keystorage/data/CMLA/DevicePrivateKey.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
-../drmengine/keystorage/data/CMLA/DeviceCert.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
-../drmengine/keystorage/data/CMLA/SigningCert00.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
-../drmengine/keystorage/data/CMLA/SigningCert01.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
-
-../drmengine/keystorage/data/CMLA/DevicePrivateKey.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
-../drmengine/keystorage/data/CMLA/DeviceCert.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
-../drmengine/keystorage/data/CMLA/SigningCert00.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
-../drmengine/keystorage/data/CMLA/SigningCert01.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
-
-../drmengine/keystorage/data/CMLA/DevicePrivateKey.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
-../drmengine/keystorage/data/CMLA/DeviceCert.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
-../drmengine/keystorage/data/CMLA/SigningCert00.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
-../drmengine/keystorage/data/CMLA/SigningCert01.der /epoc32/data/z/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
-
-// Default UDT Key
-#ifdef __DRM_USER_DATA_TRANSFER
-../drmengine/keystorage/data/UdtCertificate.der /epoc32/winscw/c/private/101F51F2/PKI/UdtCertificate.der
-
-../drmengine/keystorage/data/UdtCertificate.der /epoc32/release/winscw/udeb/z/private/101F51F2/PKI/UdtCertificate.der
-../drmengine/keystorage/data/UdtCertificate.der /epoc32/release/winscw/urel/z/private/101F51F2/PKI/UdtCertificate.der
-
-../drmengine/keystorage/data/UdtCertificate.der /epoc32/data/z/private/101F51F2/PKI/UdtCertificate.der
-#endif
-
// backup_registration.xml
../drmengine/group/backup_registration.xml /epoc32/winscw/c/private/101F51F2/backup_registration.xml
../drmengine/group/backup_registration.xml /epoc32/data/z/private/101F51F2/backup_registration.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/omadrm/rndcerts/group/bld.inf Sun Mar 14 13:10:51 2010 +0000
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) 2010 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:
+* Install CMLA certificates
+*/
+
+PRJ_EXPORTS
+
+// CMLA RnD keys
+../../drmengine/keystorage/data/CMLA/DevicePrivateKey.der c:/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
+../../drmengine/keystorage/data/CMLA/DeviceCert.der c:/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
+../../drmengine/keystorage/data/CMLA/SigningCert00.der c:/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
+../../drmengine/keystorage/data/CMLA/SigningCert01.der c:/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
+
+../../drmengine/keystorage/data/CMLA/DevicePrivateKey.der z:/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DevicePrivateKey.der
+../../drmengine/keystorage/data/CMLA/DeviceCert.der z:/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/DeviceCert.der
+../../drmengine/keystorage/data/CMLA/SigningCert00.der z:/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert00.der
+../../drmengine/keystorage/data/CMLA/SigningCert01.der z:/private/101F51F2/PKI/96b7db19a4d05a4bc8e3a51c885088e679354469/SigningCert01.der
+
+// Default UDT Key
+#ifdef __DRM_USER_DATA_TRANSFER
+../../drmengine/keystorage/data/UdtCertificate.der c:/private/101F51F2/PKI/UdtCertificate.der
+../../drmengine/keystorage/data/UdtCertificate.der z:/private/101F51F2/PKI/UdtCertificate.der
+#endif