# HG changeset patch # User William Roberts # Date 1267030317 0 # Node ID 0d167ce5e2a159f69d088d86adfa684c9d19c98d # Parent 89a1f2bd800de99ce315dd1e948c18955993011f Fix bug 1993 by providing a separate component which installs a dummy certificate and key generated by the Symbian Foundation diff -r 89a1f2bd800d -r 0d167ce5e2a1 omadrm/foundationcerts/data/devicekey1024.der Binary file omadrm/foundationcerts/data/devicekey1024.der has changed diff -r 89a1f2bd800d -r 0d167ce5e2a1 omadrm/foundationcerts/data/dummycert.cnf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omadrm/foundationcerts/data/dummycert.cnf Wed Feb 24 16:51:57 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 + diff -r 89a1f2bd800d -r 0d167ce5e2a1 omadrm/foundationcerts/data/dummycert.der Binary file omadrm/foundationcerts/data/dummycert.der has changed diff -r 89a1f2bd800d -r 0d167ce5e2a1 omadrm/foundationcerts/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omadrm/foundationcerts/group/bld.inf Wed Feb 24 16:51:57 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 diff -r 89a1f2bd800d -r 0d167ce5e2a1 omadrm/group/bld.inf --- a/omadrm/group/bld.inf Fri Feb 19 23:05:49 2010 +0200 +++ b/omadrm/group/bld.inf Wed Feb 24 16:51:57 2010 +0000 @@ -15,8 +15,6 @@ * */ -#include - 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 89a1f2bd800d -r 0d167ce5e2a1 omadrm/rndcerts/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omadrm/rndcerts/group/bld.inf Wed Feb 24 16:51:57 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