os/security/cryptoservices/filebasedcertificateandkeystores/source/shared/TokenDataMarshaller.cpp
changeset 0 bde4ae8d615e
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/os/security/cryptoservices/filebasedcertificateandkeystores/source/shared/TokenDataMarshaller.cpp	Fri Jun 15 03:10:57 2012 +0200
     1.3 @@ -0,0 +1,620 @@
     1.4 +/*
     1.5 +* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.6 +* All rights reserved.
     1.7 +* This component and the accompanying materials are made available
     1.8 +* under the terms of the License "Eclipse Public License v1.0"
     1.9 +* which accompanies this distribution, and is available
    1.10 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.11 +*
    1.12 +* Initial Contributors:
    1.13 +* Nokia Corporation - initial contribution.
    1.14 +*
    1.15 +* Contributors:
    1.16 +*
    1.17 +* Description: 
    1.18 +*
    1.19 +*/
    1.20 +
    1.21 +
    1.22 +#include "fsmarshaller.h"
    1.23 +#include "fsdatatypes.h"
    1.24 +#include "NullStream.h"
    1.25 +#include <asymmetric.h>
    1.26 +#include <bigint.h>
    1.27 +#include <pbedata.h>
    1.28 +#include <s32mem.h>
    1.29 +#include <certificateapps.h>
    1.30 +#include <ccertattributefilter.h>
    1.31 +
    1.32 +// Generic externalization stuff ///////////////////////////////////////////////
    1.33 +
    1.34 +/**
    1.35 + * Determine how many bytes are taked up by the externalized representation of
    1.36 + * an object.
    1.37 + */
    1.38 +template <class T>
    1.39 +TInt Size(const T& aObject)
    1.40 +	{
    1.41 +	RNullWriteStream stream;
    1.42 +	TRAPD(err, stream << aObject);
    1.43 +	if(err != KErrNone)
    1.44 +		{
    1.45 +		_LIT(KPanicCategory, "InValid Size");
    1.46 +		User::Panic(KPanicCategory,ESerialisationPanic);
    1.47 +		}
    1.48 +	stream.Close();
    1.49 +	return stream.BytesWritten();
    1.50 +	}
    1.51 +
    1.52 +/**
    1.53 + * Externalize an object to a buffer.  Leaves if an error occurs.
    1.54 + */
    1.55 +template <class T>
    1.56 +void WriteL(const T& aIn, TDes8& aOut)
    1.57 +	{
    1.58 +	RDesWriteStream stream(aOut);
    1.59 +	stream << aIn;
    1.60 +	stream.Close();
    1.61 +	}
    1.62 +
    1.63 +/**
    1.64 + * Externalize an object to a buffer.  In debug mode, it will panics if an error
    1.65 + * occurs - eg buffer is too short.  In release mode, errors are ignored.
    1.66 + */
    1.67 +template <class T>
    1.68 +void Write(const T& aIn, TDes8& aOut)
    1.69 +	{
    1.70 +	TRAPD(err, WriteL(aIn, aOut));
    1.71 +	if(err != KErrNone)
    1.72 +		{
    1.73 +		_LIT(KPanicCategory, "Writing Error");
    1.74 +		User::Panic(KPanicCategory,ESerialisationPanic);
    1.75 +		}
    1.76 +	}
    1.77 +
    1.78 +/**
    1.79 + * Implement Externalization selector for RPointerArrays to use a function.
    1.80 + */
    1.81 +template <class T>
    1.82 +EXTERNALIZE_FUNCTION(RPointerArray<T>)
    1.83 +
    1.84 +/**
    1.85 + * Function to externalize RPointerArrays.
    1.86 + *
    1.87 + * Although this is generic, it's currently only instantiated for CKeyInfo.
    1.88 + */
    1.89 +template <class T>
    1.90 +void ExternalizeL(const RPointerArray<T>& aIn, RWriteStream& aOut)
    1.91 +	{
    1.92 +	TInt count = aIn.Count();
    1.93 +	aOut.WriteInt32L(count);
    1.94 +	for (TInt i = 0 ; i < count ; ++i)
    1.95 +		{
    1.96 +		T* object = aIn[i];
    1.97 +		if (object == NULL)
    1.98 +			{
    1.99 +			User::Leave(KErrArgument);
   1.100 +			}
   1.101 +		aOut << *object;
   1.102 +		}
   1.103 +	}
   1.104 +
   1.105 +/**
   1.106 + * Implement Externalization selector for RArrays to use a function.
   1.107 + */
   1.108 +template <class T>
   1.109 +EXTERNALIZE_FUNCTION(RArray<T>)
   1.110 +
   1.111 +/**
   1.112 + * Function to externalize RArrays.
   1.113 + */
   1.114 +template <class T>
   1.115 +void ExternalizeL(const RArray<T>& aIn, RWriteStream& aOut)
   1.116 +	{
   1.117 +	TInt count = aIn.Count();
   1.118 +	aOut.WriteInt32L(count);
   1.119 +	for (TInt i = 0 ; i < count ; ++i)
   1.120 +		{
   1.121 +		aOut << aIn[i];
   1.122 +		}
   1.123 +	}
   1.124 +
   1.125 +// No-so-generic internalization stuff /////////////////////////////////////////
   1.126 +
   1.127 +/**
   1.128 + * Internalize an object from a descriptor.
   1.129 + */
   1.130 +template <class T>
   1.131 +void ReadL(const TDesC8& aIn, T& aOut)
   1.132 +	{
   1.133 +	RDesReadStream stream(aIn);
   1.134 +	stream >> aOut;
   1.135 +	stream.Close();
   1.136 +	}
   1.137 +
   1.138 +/**
   1.139 + * Implement Internalization selector for RArrays to use a function.
   1.140 + */
   1.141 +template <class T>
   1.142 +inline Internalize::Function Internalization(const RArray<T>*)
   1.143 +	{
   1.144 +	return Internalize::Function();
   1.145 +	}
   1.146 +
   1.147 +/**
   1.148 + * Function to internalize an RArray.
   1.149 + */
   1.150 +template <class T>
   1.151 +void InternalizeL(RArray<T>& aOut, RReadStream& aIn)
   1.152 +	{
   1.153 +	ASSERT(aOut.Count() == 0);
   1.154 +	TInt count = aIn.ReadInt32L();
   1.155 +	for (TInt i = 0 ; i < count ; ++i)
   1.156 +		{
   1.157 +		T t;
   1.158 +		aIn >> t;
   1.159 +		User::LeaveIfError(aOut.Append(t));
   1.160 +		}
   1.161 +	}
   1.162 +
   1.163 +/**
   1.164 + * Internalize an object from a stream.  Creates an instance by calling the
   1.165 + * class' NewL(RReadStream&) method.
   1.166 + */
   1.167 +template <class T>
   1.168 +inline void CreateL(RReadStream& aIn, T*& aOut)
   1.169 +	{
   1.170 +	aOut = T::NewL(aIn);
   1.171 +	}
   1.172 +
   1.173 +/**
   1.174 + * Internalize an object from a descriptor.  
   1.175 + */
   1.176 +template <class T>
   1.177 +void CreateL(const TDesC8& aIn, T& aOut)
   1.178 +	{
   1.179 +	RDesReadStream stream(aIn);
   1.180 +	CreateL(stream, aOut);
   1.181 +	stream.Close();
   1.182 +	}
   1.183 +
   1.184 +/**
   1.185 + * Internalize an object from a descriptor leaving the result on the cleanup
   1.186 + * stack.  This is generic, but is only instantiated for RInteger.
   1.187 + */
   1.188 +template <class T>
   1.189 +void CreateLC(const TDesC8& aIn, T& aOut)
   1.190 +	{
   1.191 +	RDesReadStream stream(aIn);
   1.192 +	CreateLC(stream, aOut);
   1.193 +	stream.Close();
   1.194 +	}
   1.195 +
   1.196 +/**
   1.197 + * Internalize a cryptotokens object from a descriptor.
   1.198 + */
   1.199 +template <class T>
   1.200 +void CreateL(const TDesC8& aIn, MCTToken& aToken, T& aOut)
   1.201 +	{
   1.202 +	RDesReadStream stream(aIn);
   1.203 +	CreateL(stream, aToken, aOut);
   1.204 +	stream.Close();
   1.205 +	}
   1.206 +
   1.207 +/**
   1.208 + * Internalize a cryptotoken object from a stream.  Creates an instance by
   1.209 + * calling the class' NewL(RReadStream&, MCTToken&) method.
   1.210 + */
   1.211 +template <class T>
   1.212 +inline void CreateL(RReadStream& aIn, MCTToken& aToken, T*& aOut)
   1.213 +	{
   1.214 +	aOut = T::NewL(aIn, aToken);
   1.215 +	}
   1.216 +
   1.217 +/**
   1.218 + * Internalize an array of of key info objects from a stream. 
   1.219 + */
   1.220 +void CreateL(RReadStream& aIn, MCTToken& aToken, MKeyInfoArray& aOut)
   1.221 +	{
   1.222 +	TInt count = aIn.ReadInt32L();
   1.223 +	for (TInt i = 0 ; i < count ; ++i)
   1.224 +		{
   1.225 +		CCTKeyInfo* t;
   1.226 +		CreateL(aIn, aToken, t);
   1.227 +		CleanupReleasePushL(*t);
   1.228 +		User::LeaveIfError(aOut.Append(t));
   1.229 +		CleanupStack::Pop();
   1.230 +		}
   1.231 +	}
   1.232 +
   1.233 +// can we combine this with the one above?
   1.234 +
   1.235 +/**
   1.236 + * Internalize an RMPointerArray of cryptotoken objects from a stream.
   1.237 + */
   1.238 +template <class T>
   1.239 +void CreateL(RReadStream& aIn, MCTToken& aToken, RMPointerArray<T>& aOut)
   1.240 +	{	
   1.241 +	TInt count = aIn.ReadInt32L();
   1.242 +	for (TInt i = 0 ; i < count ; ++i)
   1.243 +		{
   1.244 +		T* t;
   1.245 +		CreateL(aIn, aToken, t);
   1.246 +		CleanupReleasePushL(*t);
   1.247 +		User::LeaveIfError(aOut.Append(t));
   1.248 +		CleanupStack::Pop();
   1.249 +		}
   1.250 +	}
   1.251 +
   1.252 +// Serialization for RIntegers /////////////////////////////////////////////////
   1.253 +
   1.254 +// This is exported as it is useful itself in the server
   1.255 +
   1.256 +/**
   1.257 + * Implement a CreateL function for internalizing HBufC8s.
   1.258 + */
   1.259 +inline void CreateL(RReadStream& aIn, HBufC8*& aOut)
   1.260 +	{
   1.261 +	aOut = HBufC8::NewL(aIn, KMaxIntegerSize);
   1.262 +	}
   1.263 +
   1.264 +/**
   1.265 + * Implement a CreateLC function for internalizing RIntegers. 
   1.266 + */
   1.267 +EXPORT_C void CreateLC(RReadStream& aIn, RInteger& aOut)
   1.268 +	{	
   1.269 +	HBufC8* rBuf;
   1.270 +	CreateL(aIn, rBuf);
   1.271 +	CleanupStack::PushL(rBuf);
   1.272 +	TPtr8 rPtr(rBuf->Des());	
   1.273 +	aOut = RInteger::NewL(rPtr);
   1.274 +	CleanupStack::PopAndDestroy(rBuf);
   1.275 +	CleanupStack::PushL(aOut);
   1.276 +	}
   1.277 +
   1.278 +/**
   1.279 + * Externalize an RInteger.
   1.280 + */
   1.281 +EXPORT_C void ExternalizeL(const TInteger& aIn, RWriteStream& aOut)
   1.282 +	{
   1.283 +	HBufC8* sBuf = aIn.BufferLC();
   1.284 +	aOut << *sBuf;
   1.285 +	CleanupStack::PopAndDestroy(sBuf);	
   1.286 +	}
   1.287 +
   1.288 +// Externalization for signature objects ///////////////////////////////////////
   1.289 +
   1.290 +/**
   1.291 + * Implement Externalization selector for CDSASignature to use a function.
   1.292 + */
   1.293 +EXTERNALIZE_FUNCTION(CDSASignature)
   1.294 +
   1.295 +/**
   1.296 + * Externalise a DSA signature object.
   1.297 + */
   1.298 +void ExternalizeL(const CDSASignature& aIn, RWriteStream& aOut)
   1.299 +	{
   1.300 +	aOut << aIn.R();
   1.301 +	aOut << aIn.S();
   1.302 +	}
   1.303 +
   1.304 +/**
   1.305 + * Implement Externalization selector for CRSASignature to use a function.
   1.306 + */
   1.307 +EXTERNALIZE_FUNCTION(CRSASignature)
   1.308 +
   1.309 +/**
   1.310 + * Externalize an RSA signature object.
   1.311 + */
   1.312 +void ExternalizeL(const CRSASignature& aIn, RWriteStream& aOut)
   1.313 +	{
   1.314 +	aOut << aIn.S();
   1.315 +	}
   1.316 +
   1.317 +// Internalization for signature objects ///////////////////////////////////////
   1.318 +
   1.319 +/**
   1.320 + * Specialise CreateL for CRSASignature.
   1.321 + */
   1.322 +template <>
   1.323 +void CreateL(RReadStream& aIn, CRSASignature*& aOut)
   1.324 +	{
   1.325 +	RInteger r;
   1.326 +	CreateLC(aIn, r);
   1.327 +	aOut = CRSASignature::NewL(r);
   1.328 +	CleanupStack::Pop(); // r
   1.329 +	}
   1.330 +
   1.331 +/**
   1.332 + * Specialise CreateL for CDSASignature.
   1.333 + */
   1.334 +template <>
   1.335 +void CreateL(RReadStream& aIn, CDSASignature*& aOut)
   1.336 +	{
   1.337 +	RInteger r;
   1.338 +	CreateLC(aIn, r);
   1.339 +	RInteger s;
   1.340 +	CreateLC(aIn, s);
   1.341 +	aOut = CDSASignature::NewL(r, s);
   1.342 +	CleanupStack::Pop(2); // s, r
   1.343 +	}
   1.344 +
   1.345 +// Serialization for DH ojects /////////////////////////////////////////////////
   1.346 +
   1.347 +/**
   1.348 + * Implement Externalization selector for CDHParams to use a function.
   1.349 + */
   1.350 +EXTERNALIZE_FUNCTION(CDHParams)
   1.351 +
   1.352 +/**
   1.353 + * Externalise a TDHParams object.
   1.354 + */
   1.355 +void ExternalizeL(const CDHParams& aIn, RWriteStream& aOut)
   1.356 +	{
   1.357 +	aOut << aIn.N();
   1.358 +	aOut << aIn.G();
   1.359 +	}
   1.360 +
   1.361 +/**
   1.362 + * Specialise CreateL for CDHParams.
   1.363 + */
   1.364 +template <>
   1.365 +void CreateL(RReadStream& aIn, CDHParams*& aOut)
   1.366 +	{
   1.367 +	RInteger n;
   1.368 +	CreateLC(aIn, n);
   1.369 +	RInteger g;
   1.370 +	CreateLC(aIn, g);
   1.371 +	aOut = CDHParams::NewL(n, g);
   1.372 +	CleanupStack::PopAndDestroy(2, &n); // g, n
   1.373 +	}
   1.374 +
   1.375 +/**
   1.376 + * Implement Externalization selector for CDHPublicKey to use a function.
   1.377 + */
   1.378 +EXTERNALIZE_FUNCTION(CDHPublicKey)
   1.379 +
   1.380 +/**
   1.381 + * Externalise a CDHPublicKey object.
   1.382 + */
   1.383 +void ExternalizeL(const CDHPublicKey& aIn, RWriteStream& aOut)
   1.384 +	{
   1.385 +	aOut << aIn.N();
   1.386 +	aOut << aIn.G();
   1.387 +	aOut << aIn.X();
   1.388 +	}
   1.389 +
   1.390 +/**
   1.391 + * Specialise CreateL for CDHPublicKey.
   1.392 + */
   1.393 +template <>
   1.394 +void CreateL(RReadStream& aIn, CDHPublicKey*& aOut)
   1.395 +	{
   1.396 +	RInteger n;
   1.397 +	CreateLC(aIn, n);
   1.398 +	RInteger g;
   1.399 +	CreateLC(aIn, g);
   1.400 +	RInteger X;
   1.401 +	CreateLC(aIn, X);
   1.402 +	aOut = CDHPublicKey::NewL(n, g, X);
   1.403 +	CleanupStack::Pop(3); // X, g, n
   1.404 +	}
   1.405 +
   1.406 +// Common //////////////////////////////////////////////////////////////////////
   1.407 +
   1.408 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, RArray<TUid>& aOut)
   1.409 +	{
   1.410 +	::ReadL(aIn, aOut);
   1.411 +	}
   1.412 +
   1.413 +EXPORT_C TInt TokenDataMarshaller::Size(const CKeyInfoBase& aIn)
   1.414 +	{
   1.415 +	return ::Size(aIn);
   1.416 +	}
   1.417 +
   1.418 +EXPORT_C void TokenDataMarshaller::Write(const CKeyInfoBase& aIn, TDes8& aOut)
   1.419 +	{
   1.420 +	::Write(aIn, aOut);
   1.421 +	}
   1.422 +
   1.423 +EXPORT_C TInt TokenDataMarshaller::Size(const RArray<TUid>& aIn)
   1.424 +	{
   1.425 +	return ::Size(aIn);
   1.426 +	}
   1.427 +
   1.428 +EXPORT_C void TokenDataMarshaller::Write(const RArray<TUid>& aIn, TDes8& aOut)
   1.429 +	{
   1.430 +	::Write(aIn, aOut);
   1.431 +	}
   1.432 +
   1.433 +EXPORT_C TInt TokenDataMarshaller::Size(const MCertInfo& aIn)
   1.434 +	{
   1.435 +	return ::Size(aIn);
   1.436 +	}
   1.437 +
   1.438 +EXPORT_C void TokenDataMarshaller::Write(const MCertInfo& aIn, TDes8& aOut)
   1.439 +	{
   1.440 +	::Write(aIn, aOut);
   1.441 +	}
   1.442 +
   1.443 +// Client //////////////////////////////////////////////////////////////////////
   1.444 +
   1.445 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, MCTToken& aToken, MKeyInfoArray& aOut)
   1.446 +	{
   1.447 +	::CreateL(aIn, aToken, aOut);
   1.448 +	}
   1.449 +
   1.450 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, MCTToken& aToken, CCTKeyInfo*& aOut)
   1.451 +	{
   1.452 +	::CreateL(aIn, aToken, aOut);
   1.453 +	}
   1.454 +
   1.455 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, CDSASignature*& aOut)
   1.456 +	{
   1.457 +	::CreateL(aIn, aOut);
   1.458 +	}
   1.459 +
   1.460 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, CRSASignature*& aOut)
   1.461 +	{
   1.462 +	::CreateL(aIn, aOut);
   1.463 +	}
   1.464 +
   1.465 +EXPORT_C TInt TokenDataMarshaller::Size(const CDHParams& aIn)
   1.466 +	{
   1.467 +    return Size(aIn.N()) + Size(aIn.G());
   1.468 +	}
   1.469 +
   1.470 +EXPORT_C void TokenDataMarshaller::WriteL(const CDHParams& aIn, TDes8& aOut)
   1.471 +	{
   1.472 +	::WriteL(aIn, aOut);
   1.473 +	}
   1.474 +
   1.475 +EXPORT_C TInt TokenDataMarshaller::Size(const CDHPublicKey& aIn)
   1.476 +	{
   1.477 +	return Size(aIn.N()) + Size(aIn.G()) + Size(aIn.X());
   1.478 +	}
   1.479 +
   1.480 +EXPORT_C void TokenDataMarshaller::WriteL(const CDHPublicKey& aIn, TDes8& aOut)
   1.481 +	{
   1.482 +	::WriteL(aIn, aOut);
   1.483 +	}
   1.484 +
   1.485 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, RInteger& aInteger)
   1.486 +	{
   1.487 +	::CreateLC(aIn, aInteger);
   1.488 +	CleanupStack::Pop();
   1.489 +	}
   1.490 +	
   1.491 +EXPORT_C TInt TokenDataMarshaller::Size(const CPBEncryptParms& aIn)
   1.492 +	{
   1.493 +	return ::Size(aIn);
   1.494 +	}
   1.495 +	
   1.496 +EXPORT_C void TokenDataMarshaller::Write(const CPBEncryptParms& aIn,  TDes8& aOut)
   1.497 +	{
   1.498 +	::Write(aIn, aOut);	
   1.499 +	}
   1.500 +
   1.501 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, MCTToken& aToken, RMPointerArray<CCTCertInfo>& aOut)
   1.502 +	{
   1.503 +	::CreateL(aIn, aToken, aOut);
   1.504 +	}
   1.505 +
   1.506 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, MCTToken& aToken, CCTCertInfo*& aOut)
   1.507 +	{
   1.508 +	::CreateL(aIn, aToken, aOut);
   1.509 +	}
   1.510 +
   1.511 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, RArray<TCertificateAppInfo>& aOut)
   1.512 +	{
   1.513 +	::ReadL(aIn, aOut);
   1.514 +	}
   1.515 +
   1.516 +EXPORT_C TInt TokenDataMarshaller::Size(const CCertAttributeFilter& aIn)
   1.517 +	{
   1.518 +	return ::Size(aIn);
   1.519 +	}
   1.520 +
   1.521 +EXPORT_C void TokenDataMarshaller::WriteL(const CCertAttributeFilter& aIn, TDes8& aOut)
   1.522 +	{
   1.523 +	::WriteL(aIn, aOut);
   1.524 +	}
   1.525 +
   1.526 +// Server //////////////////////////////////////////////////////////////////////
   1.527 +
   1.528 +EXPORT_C TInt TokenDataMarshaller::Size(const RPointerArray<CKeyInfo>& aIn)
   1.529 +	{
   1.530 +	return ::Size(aIn);
   1.531 +	}
   1.532 +	
   1.533 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, CPBEncryptParms*& aOut)
   1.534 +	{
   1.535 +	::CreateL(aIn, aOut);	
   1.536 +	}
   1.537 +
   1.538 +EXPORT_C void TokenDataMarshaller::Write(const RPointerArray<CKeyInfo>& aIn, TDes8& aOut)
   1.539 +	{
   1.540 +	::Write(aIn, aOut);
   1.541 +	}
   1.542 +
   1.543 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, CKeyInfo*& aOut)
   1.544 +	{
   1.545 +	::CreateL(aIn, aOut);
   1.546 +	}
   1.547 +
   1.548 +/**
   1.549 + * Determine the size of an externalized big integer.  This assumes that the
   1.550 + * size of the buffer returned by TInteger::BufferLC() is the same as the size
   1.551 + * of the integer as returned by TInteger::ByteCount().  This is done to avoid
   1.552 + * allocating the buffer just so we can tell how big it is.
   1.553 + */
   1.554 +EXPORT_C TInt TokenDataMarshaller::Size(const TInteger& aIn)
   1.555 +	{
   1.556 +	// This is an overestimate as the length is encoded with a TCardinality
   1.557 +	return sizeof(TInt32) + aIn.ByteCount();
   1.558 +	}
   1.559 +
   1.560 +EXPORT_C TInt TokenDataMarshaller::Size(const CDSASignature& aIn)
   1.561 +	{
   1.562 +	return Size(aIn.R()) + Size(aIn.S());
   1.563 +	}
   1.564 +
   1.565 +EXPORT_C void TokenDataMarshaller::WriteL(const CDSASignature& aIn, TDes8& aOut)
   1.566 +	{
   1.567 +	::WriteL(aIn, aOut);
   1.568 +	}
   1.569 +
   1.570 +EXPORT_C TInt TokenDataMarshaller::Size(const CRSASignature& aIn)
   1.571 +	{
   1.572 +	return Size(aIn.S());
   1.573 +	}
   1.574 +
   1.575 +EXPORT_C void TokenDataMarshaller::WriteL(const CRSASignature& aIn, TDes8& aOut)
   1.576 +	{
   1.577 +	::WriteL(aIn, aOut);
   1.578 +	}
   1.579 +
   1.580 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, CDHParams*& aOut)
   1.581 +	{
   1.582 +	::CreateL(aIn, aOut);
   1.583 +	}
   1.584 +
   1.585 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, CDHPublicKey*& aOut)
   1.586 +	{
   1.587 +	::CreateL(aIn, aOut);
   1.588 +	}
   1.589 +
   1.590 +EXPORT_C void TokenDataMarshaller::WriteL(const TInteger& aIn, TDes8& aOut)
   1.591 +	{
   1.592 +	::WriteL(aIn, aOut);
   1.593 +	}
   1.594 +
   1.595 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, CCertInfo*& aOut)
   1.596 +	{
   1.597 +	::CreateL(aIn, aOut);
   1.598 +	}
   1.599 +
   1.600 +EXPORT_C TInt TokenDataMarshaller::Size(const RPointerArray<CCertInfo>& aIn)
   1.601 +	{
   1.602 +	return ::Size(aIn);
   1.603 +	}
   1.604 +
   1.605 +EXPORT_C void TokenDataMarshaller::Write(const RPointerArray<CCertInfo>& aIn, TDes8& aOut)
   1.606 +	{
   1.607 +	::Write(aIn, aOut);
   1.608 +	}
   1.609 +
   1.610 +EXPORT_C TInt TokenDataMarshaller::Size(const RArray<TCertificateAppInfo>& aIn)
   1.611 +	{
   1.612 +	return ::Size(aIn);
   1.613 +	}
   1.614 +   
   1.615 +EXPORT_C void TokenDataMarshaller::Write(const RArray<TCertificateAppInfo>& aIn, TDes8& aOut)
   1.616 +	{
   1.617 +	::Write(aIn, aOut);
   1.618 +	}   
   1.619 +
   1.620 +EXPORT_C void TokenDataMarshaller::ReadL(const TDesC8& aIn, CCertAttributeFilter*& aOut)
   1.621 +	{
   1.622 +	::CreateL(aIn, aOut);
   1.623 +	}