| author | Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> | 
| Tue, 31 Aug 2010 17:02:56 +0300 | |
| branch | RCL_3 | 
| changeset 20 | 889504eac4fb | 
| parent 0 | e35f40988205 | 
| child 21 | 604ca70b6235 | 
| permissions | -rw-r--r-- | 
| 0 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1 | /* | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 2 | * Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies). | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 3 | * All rights reserved. | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 4 | * This component and the accompanying materials are made available | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 5 | * under the terms of "Eclipse Public License v1.0" | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 6 | * which accompanies this distribution, and is available | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 7 | * at the URL "http://www.eclipse.org/legal/epl-v10.html". | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 8 | * | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 9 | * Initial Contributors: | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 10 | * Nokia Corporation - initial contribution. | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 11 | * | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 12 | * Contributors: | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 13 | * | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 14 | * Description: Methods that allows to process X509 certificates. | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 15 | * | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 16 | */ | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 17 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 18 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 19 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 20 | /** A wrapper of OpenSSL x509.c functions to Symbian **/ | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 21 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 22 | #ifndef XMLSEC_NO_X509 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 23 | #include <stdlib.h> | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 24 | #include <string.h> | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 25 | #include <x509cert.h> | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 26 | #include <e32std.h> | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 27 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 28 | #include "xmlsecc_config.h" | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 29 | #include "xmlsecc_x509wrapper.h" | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 30 | #include "xmlsecc_evpwrapper.h" | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 31 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 32 | #include "xmlsecmsymbiancertchain.h" | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 33 | #include "xmlsecmsymbiancertstore.h" | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 34 | #include "xmlsec_error_flag.h" | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 35 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 36 | struct ScX509Store | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 37 | {	
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 38 | RPointerArray< CX509Certificate> iRootCerts; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 39 | CSymbianCertChain *iCertChain; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 40 | CSymbianCertStore *iSymbianCertStore; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 41 | RPointerArray< CX509Certificate> iRootCertsSCS; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 42 | }; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 43 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 44 | void X509_free(X509* aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 45 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 46 | if (aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 47 | 	{
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 48 | if (aCert->der) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 49 | 		{
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 50 | memset(aCert->der, 0, aCert->derlen); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 51 | free (aCert->der); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 52 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 53 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 54 | free(aCert); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 55 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 56 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 57 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 58 | void X509_crl_free(X509_CRL* aCrl) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 59 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 60 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 61 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 62 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 63 | X509* X509_dup(X509* aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 64 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 65 | return aCert; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 66 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 67 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 68 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 69 | /* Get the public key */ | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 70 | EVP_PKEY* X509_get_pubkey(X509* aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 71 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 72 | EVP_PKEY *pKey = NULL; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 73 | TInt err; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 74 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 75 | // Create the pKey structure | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 76 | pKey = sc_pkey_new(EVP_PKEY_UNKNOWN, NULL); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 77 | if (!pKey) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 78 | 	{
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 79 | return NULL; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 80 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 81 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 82 | //Assign the public key | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 83 | err = sc_pkey_setPublic(pKey, aCert); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 84 | if (err != KErrNone) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 85 | 	{
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 86 | sc_pkey_free(pKey); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 87 | return NULL; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 88 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 89 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 90 | return pKey; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 91 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 92 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 93 | TInt testValidityPeriodL(X509 *aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 94 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 95 | // convert aCert to TDesC8 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 96 | TPtrC8 certPtr((const unsigned char*)aCert->der, aCert->derlen); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 97 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 98 | CX509Certificate *cert = CX509Certificate::NewLC(certPtr); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 99 | CValidityPeriod validPeriod = cert->ValidityPeriod(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 100 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 101 | TTime currentTime; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 102 | currentTime.HomeTime(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 103 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 104 | TBool res = validPeriod.Valid(currentTime); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 105 | CleanupStack::PopAndDestroy(cert); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 106 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 107 | return (TInt)res; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 108 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 109 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 110 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 111 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 112 | /* Test the validity period from the certificate */ | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 113 | TInt X509_test_validityPeriod(X509* aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 114 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 115 | TInt err; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 116 | TBool res=FALSE; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 117 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 118 | TRAP(err, res = testValidityPeriodL(aCert)); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 119 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 120 | if (err) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 121 | 	    {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 122 | xmlSecSetErrorFlag( err ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 123 | return err; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 124 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 125 | else | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 126 | return res; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 127 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 128 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 129 | /* Read the certificate from DER format */ | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 130 | X509* d2i_X509_bio(BIO *aBio) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 131 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 132 | X509 *cert = (X509 *)malloc(sizeof(X509)); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 133 | if (!cert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 134 | 	    {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 135 | xmlSecSetErrorFlag( KErrNoMemory ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 136 | return NULL; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 137 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 138 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 139 | // Duplicate the certificate | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 140 | cert->der = (char *)malloc(aBio->len * sizeof(char)); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 141 | if (!cert->der) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 142 |         {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 143 | free( cert ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 144 | xmlSecSetErrorFlag( KErrNoMemory ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 145 | return NULL; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 146 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 147 | memcpy(cert->der, aBio->mem, aBio->len); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 148 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 149 | // Set length | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 150 | cert->derlen = aBio->len; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 151 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 152 | return cert; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 153 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 154 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 155 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 156 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 157 | X509_STORE *X509_STORE_new( void ) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 158 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 159 | X509_STORE *certStore = (X509_STORE *)malloc(sizeof(X509_STORE)); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 160 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 161 | if (certStore) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 162 | 	{
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 163 | certStore->iRootCerts = RPointerArray<CX509Certificate> (2); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 164 | certStore->iRootCertsSCS = RPointerArray<CX509Certificate> (2); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 165 | certStore->iCertChain = NULL; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 166 | certStore->iSymbianCertStore = NULL; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 167 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 168 | else | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 169 | 	    {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 170 | xmlSecSetErrorFlag( KErrNoMemory ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 171 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 172 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 173 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 174 | return certStore; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 175 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 176 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 177 | void X509_STORE_free(X509_STORE *aCertStore) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 178 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 179 | if (aCertStore) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 180 | 	    {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 181 | if (aCertStore->iCertChain) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 182 | 	        {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 183 | delete aCertStore->iCertChain; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 184 | aCertStore->iCertChain = NULL; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 185 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 186 | if (aCertStore->iSymbianCertStore) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 187 | 	        {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 188 | delete aCertStore->iSymbianCertStore; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 189 | aCertStore->iSymbianCertStore = NULL; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 190 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 191 | aCertStore->iRootCertsSCS.ResetAndDestroy(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 192 | aCertStore->iRootCerts.ResetAndDestroy(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 193 | free(aCertStore); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 194 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 195 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 196 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 197 | void doAddCertL(X509_STORE *aCertStore, X509 *aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 198 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 199 | // convert aCert to TDesC8 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 200 | TPtrC8 certPtr((const unsigned char*)aCert->der, aCert->derlen); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 201 | CX509Certificate *cert = CX509Certificate::NewLC(certPtr); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 202 | aCertStore->iRootCerts.AppendL((CX509Certificate *)cert); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 203 | CleanupStack::Pop(cert); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 204 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 205 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 206 | /* Add certificate to the cert store */ | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 207 | int X509_STORE_add_cert(X509_STORE *aCertStore, X509 *aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 208 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 209 | TInt err; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 210 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 211 | TRAP(err, doAddCertL(aCertStore, aCert)); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 212 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 213 | return err; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 214 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 215 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 216 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 217 | void doCertChainInitL(X509_STORE *aCertStore, STACK_OF(X509) *aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 218 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 219 | if (aCertStore->iCertChain) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 220 | 	{
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 221 | delete aCertStore->iCertChain; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 222 | aCertStore->iCertChain = NULL; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 223 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 224 | aCertStore->iCertChain = CSymbianCertChain::NewL(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 225 | aCertStore->iCertChain->InitializeL((unsigned char*)aCert->der, | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 226 | (unsigned int)aCert->derlen, | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 227 | aCertStore->iRootCerts); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 228 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 229 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 230 | /* Init certchain using certs from iRootCerts */ | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 231 | int X509_STORE_certchain_init (X509_STORE *aCertStore, STACK_OF(X509) *aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 232 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 233 | TInt err; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 234 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 235 | TRAP(err, doCertChainInitL(aCertStore, aCert)); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 236 | if ( err != KErrNone ) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 237 |         {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 238 | xmlSecSetErrorFlag( err ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 239 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 240 | return err; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 241 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 242 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 243 | void doCertChainInitfromCertStoreL(X509_STORE *aCertStore, STACK_OF(X509) *aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 244 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 245 | TInt numCert ; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 246 | RMPointerArray<CCTCertInfo> listCerts; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 247 | HBufC8* certdata; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 248 | CX509Certificate* certX509; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 249 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 250 | if (aCertStore->iCertChain) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 251 |             {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 252 | delete aCertStore->iCertChain; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 253 | aCertStore->iCertChain = NULL; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 254 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 255 | if(!aCertStore->iSymbianCertStore) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 256 |             {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 257 | aCertStore->iSymbianCertStore = CSymbianCertStore::NewL(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 258 | aCertStore->iSymbianCertStore->CreateUnifiedCertStoreL(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 259 | CActiveScheduler::Start(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 260 | User::LeaveIfError( aCertStore->iSymbianCertStore->GetError() ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 261 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 262 | if (aCertStore->iRootCertsSCS.Count()) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 263 |             {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 264 | aCertStore->iRootCertsSCS.ResetAndDestroy(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 265 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 266 | aCertStore->iSymbianCertStore->ListCertL(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 267 | CActiveScheduler::Start(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 268 | User::LeaveIfError( aCertStore->iSymbianCertStore->GetError() ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 269 | listCerts=aCertStore->iSymbianCertStore->GetCertList(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 270 | numCert = listCerts.Count(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 271 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 272 | for (int i=0;i<numCert;i++) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 273 |             {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 274 | CCTCertInfo* cert = (CCTCertInfo *)listCerts[i]; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 275 | aCertStore->iSymbianCertStore->SetCert(cert); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 276 | aCertStore->iSymbianCertStore->RetrieveCertDataL(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 277 | CActiveScheduler::Start(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 278 | User::LeaveIfError( aCertStore->iSymbianCertStore->GetError() ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 279 | certdata=aCertStore->iSymbianCertStore->GetRetrieveCertData(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 280 | certX509 = CX509Certificate::NewLC(*certdata); | 
| 20 
889504eac4fb
Revision: 201014
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
0diff
changeset | 281 | User::LeaveIfError(aCertStore->iRootCertsSCS.Append((CX509Certificate *)certX509)); | 
| 0 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 282 | CleanupStack::Pop(certX509); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 283 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 284 | aCertStore->iCertChain = CSymbianCertChain::NewL(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 285 | aCertStore->iCertChain->InitializeL((unsigned char*)aCert->der, | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 286 | (unsigned int)aCert->derlen, | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 287 | aCertStore->iRootCertsSCS); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 288 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 289 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 290 | /*Init certchain using root certs from SymbianCertStore stored in iRootCertsSCS */ | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 291 | int X509_STORE_certchain_init_fromCertStore (X509_STORE *aCertStore, STACK_OF(X509) *aCert) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 292 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 293 | TInt err; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 294 | TRAP(err, doCertChainInitfromCertStoreL(aCertStore, aCert)); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 295 | if ( err != KErrNone ) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 296 | 	    {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 297 | xmlSecSetErrorFlag( err ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 298 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 299 | return err; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 300 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 301 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 302 | int X509_STORE_certchain_validate (X509_STORE *aCertStore) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 303 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 304 | TInt err; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 305 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 306 | TRAP(err, aCertStore->iCertChain->ValidateL()); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 307 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 308 | if (err==KErrNone) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 309 | 	    {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 310 | CActiveScheduler::Start(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 311 | err = aCertStore->iCertChain->GetError(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 312 | if ( err != KErrNone ) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 313 | 		    {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 314 | xmlSecSetErrorFlag( err ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 315 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 316 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 317 | else | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 318 | 	    {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 319 | xmlSecSetErrorFlag( err ); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 320 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 321 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 322 | return err; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 323 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 324 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 325 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 326 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 327 | int X509_STORE_certchain_getValidateResult (X509_STORE *aCertStore) | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 328 | {
 | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 329 | TInt ret; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 330 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 331 | ret = aCertStore->iCertChain->GetValidateResult(); | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 332 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 333 | return ret; | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 334 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 335 | } | 
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 336 | |
| 
e35f40988205
Revision: 200947
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 337 | #endif /* XMLSEC_NO_X509 */ |