# HG changeset patch # User Shabe Razvi # Date 1284741160 -3600 # Node ID b72c2d56e34ae2bc07379e4b275551f7ca77903e # Parent 00671737faf248b3a6ce754d640ed6c6a163c4d5# Parent 6661d825985909590b1a349efa6049a61241579d Re-merge fixes for Bug 1993 and Bug 2121 diff -r 00671737faf2 -r b72c2d56e34a omadrm/drmengine/group/CryptoPrep.flm --- a/omadrm/drmengine/group/CryptoPrep.flm Tue Sep 14 21:50:40 2010 +0300 +++ b/omadrm/drmengine/group/CryptoPrep.flm Fri Sep 17 17:32:40 2010 +0100 @@ -13,26 +13,30 @@ # Description: DRM Crypto Library build configuration # -CREATABLEPATH:=$(EXTENSION_ROOT)/../drmengine/drmcrypto/build -CLEANTARGETS:=$(CREATABLEPATH)/cmlacrypto.cpp $(CREATABLEPATH)/omacrypto.cpp +ifeq ($(_CRYPTOPREP_FLM_),) +# first instance of this FLM +_CRYPTOPREP_FLM_:= 1 + + +# 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) - -GUARD:=done_$(call sanitise,$(CLEANTARGETS)) -ifeq ($($(GUARD)),) -$(GUARD):=1 - -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 - $(GNUCHMOD) u+w $(CREATABLEPATH)/cmlacrypto.cpp - $(GNUCHMOD) u+w $(CREATABLEPATH)/omacrypto.cpp +$(CREATABLEPATH)/cmlacrypto.cpp: $(CMLA_CRYPTO_SOURCE) + $(GNUCP) $< $@ # Create dirs $(call makepath,$(CREATABLEPATH)) @@ -40,11 +44,10 @@ ## Clean up $(eval $(call GenerateStandardCleanTarget,$(CLEANTARGETS))) -## What -$(eval $(call whatmacro,$(CLEANTARGETS))) - +$(info $(PLATFORM) $(CFG), selecting $(CMLA_CRYPTO_SOURCE)) else -$(info $(PLATFORM) $(CFG), up-to-date $(CLEANTARGETS)) +$(info $(PLATFORM) $(CFG), already handled $(CMLA_CRYPTO_SOURCE)) +# FLM already included - don't duplicate the targets endif diff -r 00671737faf2 -r b72c2d56e34a omadrm/drmengine/group/DrmCrypto.mmp --- a/omadrm/drmengine/group/DrmCrypto.mmp Tue Sep 14 21:50:40 2010 +0300 +++ b/omadrm/drmengine/group/DrmCrypto.mmp Fri Sep 17 17:32:40 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 00671737faf2 -r b72c2d56e34a omadrm/foundationcerts/data/devicekey1024.der Binary file omadrm/foundationcerts/data/devicekey1024.der has changed diff -r 00671737faf2 -r b72c2d56e34a omadrm/foundationcerts/data/dummycert.cnf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omadrm/foundationcerts/data/dummycert.cnf Fri Sep 17 17:32:40 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 00671737faf2 -r b72c2d56e34a omadrm/foundationcerts/data/dummycert.der Binary file omadrm/foundationcerts/data/dummycert.der has changed diff -r 00671737faf2 -r b72c2d56e34a omadrm/foundationcerts/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omadrm/foundationcerts/group/bld.inf Fri Sep 17 17:32:40 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 00671737faf2 -r b72c2d56e34a omadrm/group/bld.inf --- a/omadrm/group/bld.inf Tue Sep 14 21:50:40 2010 +0300 +++ b/omadrm/group/bld.inf Fri Sep 17 17:32:40 2010 +0100 @@ -15,8 +15,6 @@ * */ -#include - PRJ_PLATFORMS DEFAULT