diff -r 675a964f4eb5 -r 35751d3474b7 cryptoservices/certificateandkeymgmt/tpkcs7/tpkcs7stepbase.h --- a/cryptoservices/certificateandkeymgmt/tpkcs7/tpkcs7stepbase.h Tue Jul 21 01:04:32 2009 +0100 +++ b/cryptoservices/certificateandkeymgmt/tpkcs7/tpkcs7stepbase.h Thu Sep 10 14:01:51 2009 +0300 @@ -1,57 +1,55 @@ -/* -* Copyright (c) 2002-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: -* -*/ - - - - -/** - @file - @internalTechnology -*/ - -#if (!defined __TPKCS7_STEP_BASE_H__) -#define __TPKCS7_STEP_BASE_H__ -#include <testexecutestepbase.h> -#include "tpkcs7server.h" -#include <x509cert.h> - -class CTPKCS7StepBase : public CTestStep - { -public: - CTPKCS7StepBase (); - ~CTPKCS7StepBase(); - inline void SetServer(CTPKCS7Server * aServer); - - // From CTestStep - TVerdict doTestStepPreambleL (); - HBufC8* readFileL (TPtrC tag); -protected: - HBufC8* iRawData; - HBufC8* iSaltValue; - HBufC8* iContentData; - HBufC8* iDigest; - HBufC8* iEncodedParams; - CX509Certificate* iRootCertificate; - RFs iFs; - CTPKCS7Server* iServer; - }; - -inline void CTPKCS7StepBase::SetServer(CTPKCS7Server* aServer) - { - iServer = aServer; - } -#endif +/* +* Copyright (c) 2002-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: +* +*/ + + +/** + @file + @internalTechnology +*/ + +#if (!defined __TPKCS7_STEP_BASE_H__) +#define __TPKCS7_STEP_BASE_H__ +#include <test/testexecutestepbase.h> +#include "tpkcs7server.h" +#include <x509cert.h> + +class CTPKCS7StepBase : public CTestStep + { +public: + CTPKCS7StepBase (); + ~CTPKCS7StepBase(); + inline void SetServer(CTPKCS7Server * aServer); + + // From CTestStep + TVerdict doTestStepPreambleL (); + HBufC8* readFileL (TPtrC tag); +protected: + HBufC8* iRawData; + HBufC8* iSaltValue; + HBufC8* iContentData; + HBufC8* iDigest; + HBufC8* iEncodedParams; + CX509Certificate* iRootCertificate; + RFs iFs; + CTPKCS7Server* iServer; + }; + +inline void CTPKCS7StepBase::SetServer(CTPKCS7Server* aServer) + { + iServer = aServer; + } +#endif