# HG changeset patch # User William Roberts # Date 1279034809 -3600 # Node ID e824080bd1195c389e3e13cca948519d819b06d4 # Parent 41137c634688904e36223f85676e6e5b51d557af# Parent 4c9c835a54d016887cc21e405f965c2f168e6679 Remerge fix for bug 1993 diff -r 41137c634688 -r e824080bd119 omadrm/drmengine/group/CryptoPrep.flm diff -r 41137c634688 -r e824080bd119 omadrm/drmengine/group/DrmCrypto.mmp --- a/omadrm/drmengine/group/DrmCrypto.mmp Tue Jul 06 14:34:12 2010 +0300 +++ b/omadrm/drmengine/group/DrmCrypto.mmp Tue Jul 13 16:26:49 2010 +0100 @@ -38,9 +38,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 41137c634688 -r e824080bd119 omadrm/foundationcerts/data/devicekey1024.der Binary file omadrm/foundationcerts/data/devicekey1024.der has changed diff -r 41137c634688 -r e824080bd119 omadrm/foundationcerts/data/dummycert.cnf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omadrm/foundationcerts/data/dummycert.cnf Tue Jul 13 16:26:49 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 41137c634688 -r e824080bd119 omadrm/foundationcerts/data/dummycert.der Binary file omadrm/foundationcerts/data/dummycert.der has changed diff -r 41137c634688 -r e824080bd119 omadrm/foundationcerts/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omadrm/foundationcerts/group/bld.inf Tue Jul 13 16:26:49 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 41137c634688 -r e824080bd119 omadrm/group/bld.inf --- a/omadrm/group/bld.inf Tue Jul 06 14:34:12 2010 +0300 +++ b/omadrm/group/bld.inf Tue Jul 13 16:26:49 2010 +0100 @@ -15,8 +15,6 @@ * */ -#include - PRJ_PLATFORMS DEFAULT