# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1270224036 -3600
# Node ID 656c47ca7d25b225e48b7295b82cc372899be917
# Parent  a20e54f39dd4a9912334fed796a2fe3cc700e77b# Parent  77a4e6a1beb497a55dc243926fbbb96fc678e251
Remerge fixes for Bug 2121 and Bug 1993

diff -r a20e54f39dd4 -r 656c47ca7d25 omadrm/drmengine/group/CryptoPrep.flm
--- a/omadrm/drmengine/group/CryptoPrep.flm	Wed Mar 31 22:01:10 2010 +0300
+++ b/omadrm/drmengine/group/CryptoPrep.flm	Fri Apr 02 17:00:36 2010 +0100
@@ -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
diff -r a20e54f39dd4 -r 656c47ca7d25 omadrm/drmengine/group/DrmCrypto.mmp
--- a/omadrm/drmengine/group/DrmCrypto.mmp	Wed Mar 31 22:01:10 2010 +0300
+++ b/omadrm/drmengine/group/DrmCrypto.mmp	Fri Apr 02 17:00:36 2010 +0100
@@ -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
diff -r a20e54f39dd4 -r 656c47ca7d25 omadrm/foundationcerts/data/devicekey1024.der
Binary file omadrm/foundationcerts/data/devicekey1024.der has changed
diff -r a20e54f39dd4 -r 656c47ca7d25 omadrm/foundationcerts/data/dummycert.cnf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omadrm/foundationcerts/data/dummycert.cnf	Fri Apr 02 17:00:36 2010 +0100
@@ -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
+
diff -r a20e54f39dd4 -r 656c47ca7d25 omadrm/foundationcerts/data/dummycert.der
Binary file omadrm/foundationcerts/data/dummycert.der has changed
diff -r a20e54f39dd4 -r 656c47ca7d25 omadrm/foundationcerts/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omadrm/foundationcerts/group/bld.inf	Fri Apr 02 17:00:36 2010 +0100
@@ -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
diff -r a20e54f39dd4 -r 656c47ca7d25 omadrm/group/bld.inf
--- a/omadrm/group/bld.inf	Wed Mar 31 22:01:10 2010 +0300
+++ b/omadrm/group/bld.inf	Fri Apr 02 17:00:36 2010 +0100
@@ -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
diff -r a20e54f39dd4 -r 656c47ca7d25 omadrm/rndcerts/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omadrm/rndcerts/group/bld.inf	Fri Apr 02 17:00:36 2010 +0100
@@ -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