--- a/contentmgmt/cafstreamingsupport/group/bld.inf Mon Mar 15 12:46:43 2010 +0200
+++ b/contentmgmt/cafstreamingsupport/group/bld.inf Thu Apr 01 00:24:41 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of the License "Eclipse Public License v1.0"
--- a/crypto/weakcryptospi/inc/random.h Mon Mar 15 12:46:43 2010 +0200
+++ b/crypto/weakcryptospi/inc/random.h Thu Apr 01 00:24:41 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -140,11 +140,9 @@
*
* Implements the contract as specified in the base class, CRandom, filling the buffer
* supplied with random data up to its current length, discarding its current content.
- * It will leave with KErrNotSecure when the generated random data is not secure enough.
+ * It will leave under no memory condition.
*
- * @param aDest The buffer to which to write random data
- * @leave KErrNotSecure The generated random data is not secure enough for cryptographic operations
- * otherwise, leaves with any other system wide error codes.
+ * @param aDest The buffer to be filled with random data
*
*/
virtual void GenerateBytesL(TDes8& aDest);
--- a/crypto/weakcryptospi/source/random/random.cpp Mon Mar 15 12:46:43 2010 +0200
+++ b/crypto/weakcryptospi/source/random/random.cpp Thu Apr 01 00:24:41 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -56,8 +56,13 @@
void CSystemRandom::GenerateBytesL(TDes8& aDest)
{
- iShim->GenerateBytesL(aDest);
- }
+ TRAPD(error, iShim->GenerateBytesL(aDest));
+ // This method must leave on low memory conditions.
+ if(error == KErrNoMemory)
+ {
+ User::Leave(error);
+ }
+ }
CSystemRandom::CSystemRandom(void)
{
Binary file cryptomgmtlibs/securitytestfw/testcertificates/certman/tcertstore/tdata/selfsignedcertificate.der has changed
Binary file cryptomgmtlibs/securitytestfw/testcertificates/certman/tpkixcert_tef/fulltrust.der has changed
--- a/cryptomgmtlibs/securitytestfw/testcertificates/certman/tpkixcert_tef/makecert.bat Mon Mar 15 12:46:43 2010 +0200
+++ b/cryptomgmtlibs/securitytestfw/testcertificates/certman/tpkixcert_tef/makecert.bat Thu Apr 01 00:24:41 2010 +0300
@@ -1,3 +1,18 @@
+@rem
+@rem Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
REM days default is 30 and generated on 13/03/2008
--- a/cryptomgmtlibs/securitytestfw/testcertificates/group/bld.inf Mon Mar 15 12:46:43 2010 +0200
+++ b/cryptomgmtlibs/securitytestfw/testcertificates/group/bld.inf Thu Apr 01 00:24:41 2010 +0300
@@ -28,6 +28,7 @@
// Certman Component
../certman/tcertstore/tdata/subjectkeycert.der /epoc32/winscw/c/unifiedcertstore2/subjectkeycert.der
+../certman/tcertstore/tdata/SelfSignedCertificate.der /epoc32/winscw/c/tcertstore/data/SelfSignedCertificate.der
../certman/tcertstore/unifiedcertstore2/URL1K1.cer /epoc32/winscw/c/unifiedcertstore2/url1k1.cer
../certman/tcertstore/unifiedcertstore2/URL2K2.cer /epoc32/winscw/c/unifiedcertstore2/url2k2.cer
../certman/tcertstore/unifiedcertstore2/URL3K5.cer /epoc32/winscw/c/unifiedcertstore2/url3k5.cer
@@ -400,6 +401,9 @@
../certman/tpkixcert_tef/004_ee.der /epoc32/winscw/c/tpkixcert_tef/data/004_ee.der
../certman/tpkixcert_tef/009_rc.der /epoc32/winscw/c/tpkixcert_tef/data/009_rc.der
../certman/tpkixcert_tef/009_ee.der /epoc32/winscw/c/tpkixcert_tef/data/009_ee.der
+
+../certman/tpkixcert_tef/fulltrust.der /epoc32/winscw/c/tpkixcert_tef/data/fulltrust.der
+
../certman/tx509/Data/dnames/dn_unstructuredname_lc.der /epoc32/winscw/c/tx509/data/dn_unstructuredname_lc.der
../certman/tx509/Data/extensions/certs/absent.der /epoc32/winscw/c/tx509/data/extensions/certs/absent.der
../certman/tx509/Data/extensions/certs/corrupt.der /epoc32/winscw/c/tx509/data/extensions/certs/corrupt.der
--- a/cryptoservices/certificateandkeymgmt/group/bld.inf Mon Mar 15 12:46:43 2010 +0200
+++ b/cryptoservices/certificateandkeymgmt/group/bld.inf Thu Apr 01 00:24:41 2010 +0300
@@ -31,8 +31,6 @@
// If there's no destination then the source file will be copied
// to the same name in /epoc32/include
-../group/makecertstore.ipr /epoc32/engdoc/tools/makecertstore.ipr
-
../inc/x509cert.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(x509cert.h)
../inc/x509keys.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(x509keys.h)
../inc/pkcs10attr.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(pkcs10attr.h)
@@ -505,7 +503,7 @@
../tcertstore/tdata/nrcertkey.txt /epoc32/winscw/c/tcertstore/data/nrcertkey.txt
../tcertstore/tdata/signcertkey2.txt /epoc32/winscw/c/tcertstore/data/signcertkey2.txt
../tcertstore/tdata/enciphersigncertkey2.txt /epoc32/winscw/c/tcertstore/data/enciphersigncertkey2.txt
-../tcertstore/tdata/SelfSignedPrivateKey_pk8.der /epoc32/winscw/c/tcertstore/data/SelfSignedPrivateKey_pk8.der
+../tcertstore/tdata/SelfSignedPrivateKey_pk8.pk8 /epoc32/winscw/c/tcertstore/data/SelfSignedPrivateKey_pk8.pk8
../tcertstore/scripts/certstoreconcurrent1.txt /epoc32/winscw/c/tcertstoreconcurrent/scripts/certstoreconcurrent1.txt
../tcertstore/scripts/certstoreconcurrent2.txt /epoc32/winscw/c/tcertstoreconcurrent/scripts/certstoreconcurrent2.txt
--- a/cryptoservices/certificateandkeymgmt/group/makecertstore.ipr Mon Mar 15 12:46:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-[purpose]
-
-Creates a default certificate store, as used by the certificate
-management component. For use by licensees only for the purpose
-of creating a certificate store to be included within the ROM
-of a device.
-
-[categories]
-licensee
-
-[files]
-tools\makecertstore.bat
-release\winc\urel\makecertstore.exe
-
-[owner]
-Runtime & Tools # CERTMAN
-
-[IPR]
-Copyright (c) 2000 Symbian Ltd. All rights reserved.
-
-Makecertstore.exe can be freely distributed as a binary,
-but the source code requires an export licence.
--- a/cryptoservices/certificateandkeymgmt/group/security_certman.mrp Mon Mar 15 12:46:43 2010 +0200
+++ b/cryptoservices/certificateandkeymgmt/group/security_certman.mrp Thu Apr 01 00:24:41 2010 +0300
@@ -2,7 +2,6 @@
source \sf\os\security\cryptoservices\certificateandkeymgmt
binary \sf\os\security\cryptoservices\certificateandkeymgmt\group all
exports \sf\os\security\cryptoservices\certificateandkeymgmt\group
--export_file \sf\os\security\cryptoservices\certificateandkeymgmt\group\makecertstore.ipr \epoc32\engdoc\tools\makecertstore.ipr
notes_source \component_defs\release.src
--- a/cryptoservices/certificateandkeymgmt/tcertstore/scripts/unifiedcertstore2-conf1.ini Mon Mar 15 12:46:43 2010 +0200
+++ b/cryptoservices/certificateandkeymgmt/tcertstore/scripts/unifiedcertstore2-conf1.ini Thu Apr 01 00:24:41 2010 +0300
@@ -2223,7 +2223,7 @@
<actionbody>
- <ImportData>SelfSignedPrivateKey_pk8.der</ImportData>
+ <ImportData>SelfSignedPrivateKey_pk8.pk8</ImportData>
<keyusage>AllUsagesButNR</keyusage>
Binary file cryptoservices/certificateandkeymgmt/tcertstore/tdata/selfsignedprivatekey_pk8.der has changed
Binary file cryptoservices/certificateandkeymgmt/tcertstore/tdata/selfsignedprivatekey_pk8.pk8 has changed
--- a/cryptoservices/certificateandkeymgmt/tpkixcert_tef/scripts/validatetests.ini Mon Mar 15 12:46:43 2010 +0200
+++ b/cryptoservices/certificateandkeymgmt/tpkixcert_tef/scripts/validatetests.ini Thu Apr 01 00:24:41 2010 +0300
@@ -80,8 +80,6 @@
endentity=c:\tpkixcert_tef\data\fulltrust.der
rootcert-01=c:\tpkixcert_tef\data\fulltrust.der
oid-01=2.5.29.19
-cert-00critoid-01=2.5.29.19
-cert-01critoid-01=2.5.29.19
error=0
numberofcerts=2