diff -r 675a964f4eb5 -r 35751d3474b7 cryptoservices/certificateandkeymgmt/pkcs7/pkcs7asn1.cpp --- a/cryptoservices/certificateandkeymgmt/pkcs7/pkcs7asn1.cpp Tue Jul 21 01:04:32 2009 +0100 +++ b/cryptoservices/certificateandkeymgmt/pkcs7/pkcs7asn1.cpp Thu Sep 10 14:01:51 2009 +0300 @@ -1,56 +1,54 @@ -/* -* Copyright (c) 2003-2009 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" -* 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: -* -*/ - - - - -#include "pkcs7asn1.h" -#include - -CArrayPtr* PKCS7ASN1::DecodeSequenceLC(const TDesC8& aRawData) - { - CArrayPtr* items = NULL; - - // Check we've got a sequence - TASN1DecGeneric decGen(aRawData); - decGen.InitL(); - if(decGen.Tag() != EASN1Sequence && decGen.Tag() != EASN1Set) - { - User::Leave(KErrArgument); - } - else - { - // Decode the sequence - TASN1DecSequence decSeq; - items = decSeq.DecodeDERLC(decGen); - } - return items; - } - -CArrayPtr* PKCS7ASN1::DecodeSequenceLC(const TDesC8& aRawData, - const TInt aMinTerms, - const TInt aMaxTerms) - { - CArrayPtr* items = DecodeSequenceLC(aRawData); - TInt count = items->Count(); - if(count < aMinTerms || count > aMaxTerms) - { - User::Leave(KErrArgument); - } - - return items; - } +/* +* Copyright (c) 2003-2009 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" +* 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: +* +*/ + + +#include "pkcs7asn1.h" +#include + +CArrayPtr* PKCS7ASN1::DecodeSequenceLC(const TDesC8& aRawData) + { + CArrayPtr* items = NULL; + + // Check we've got a sequence + TASN1DecGeneric decGen(aRawData); + decGen.InitL(); + if(decGen.Tag() != EASN1Sequence && decGen.Tag() != EASN1Set) + { + User::Leave(KErrArgument); + } + else + { + // Decode the sequence + TASN1DecSequence decSeq; + items = decSeq.DecodeDERLC(decGen); + } + return items; + } + +CArrayPtr* PKCS7ASN1::DecodeSequenceLC(const TDesC8& aRawData, + const TInt aMinTerms, + const TInt aMaxTerms) + { + CArrayPtr* items = DecodeSequenceLC(aRawData); + TInt count = items->Count(); + if(count < aMinTerms || count > aMaxTerms) + { + User::Leave(KErrArgument); + } + + return items; + }