# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1275493617 25200
# Node ID 3b43e6ea6c9d64ee0e0aea14d1d637d41bc5ab89
# Parent  9dfde139acda2be7498e5109b6646e8631053f82# Parent  d52881f84eaaeeb46172597d18bc9b4bb02adb06
Merge fixes for bugs 1993 and 2707.

diff -r 9dfde139acda -r 3b43e6ea6c9d omadrm/drmengine/group/CryptoPrep.flm
--- a/omadrm/drmengine/group/CryptoPrep.flm	Thu May 27 13:08:18 2010 +0300
+++ b/omadrm/drmengine/group/CryptoPrep.flm	Wed Jun 02 08:46:57 2010 -0700
@@ -13,8 +13,10 @@
 # Description: DRM Crypto Library build configuration
 #
 
-TMPROOT:=$(subst \,/,$(EPOCROOT))
-EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
+# Bug 2707 - cryptoprep.flm changes the value of EPOCROOT
+#
+# TMPROOT:=$(subst \,/,$(EPOCROOT))
+# EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
 
 CREATABLEPATH:=$(EXTENSION_ROOT)/../drmengine/drmcrypto/build
 CLEANTARGETS:=$(CREATABLEPATH)/cmlacrypto.cpp $(CREATABLEPATH)/omacrypto.cpp
diff -r 9dfde139acda -r 3b43e6ea6c9d omadrm/drmengine/group/DrmCrypto.mmp
--- a/omadrm/drmengine/group/DrmCrypto.mmp	Thu May 27 13:08:18 2010 +0300
+++ b/omadrm/drmengine/group/DrmCrypto.mmp	Wed Jun 02 08:46:57 2010 -0700
@@ -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 9dfde139acda -r 3b43e6ea6c9d omadrm/foundationcerts/data/devicekey1024.der
Binary file omadrm/foundationcerts/data/devicekey1024.der has changed
diff -r 9dfde139acda -r 3b43e6ea6c9d omadrm/foundationcerts/data/dummycert.cnf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omadrm/foundationcerts/data/dummycert.cnf	Wed Jun 02 08:46:57 2010 -0700
@@ -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 9dfde139acda -r 3b43e6ea6c9d omadrm/foundationcerts/data/dummycert.der
Binary file omadrm/foundationcerts/data/dummycert.der has changed
diff -r 9dfde139acda -r 3b43e6ea6c9d omadrm/foundationcerts/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omadrm/foundationcerts/group/bld.inf	Wed Jun 02 08:46:57 2010 -0700
@@ -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 9dfde139acda -r 3b43e6ea6c9d omadrm/group/bld.inf
--- a/omadrm/group/bld.inf	Thu May 27 13:08:18 2010 +0300
+++ b/omadrm/group/bld.inf	Wed Jun 02 08:46:57 2010 -0700
@@ -15,8 +15,6 @@
 *
 */
 
-#include <platform_paths.hrh>
-
 PRJ_PLATFORMS
 DEFAULT