FCL/sf/mw/securitysrv: comparison pkiutilities/CertSaver/src/certparser.cpp

equal deleted inserted replaced

-:09b1ac925e3f
+:03674e5abf46
 #include <x509certext.h>
 #include <hash.h>
 #include <X509CertNameParser.h>
 #include <featmgr.h>
 #include <data_caging_path_literals.hrh>
+#include <AknQueryDialog.h>
 #include <CertSaver.rsg>
 #include <StringLoader.h>
 #include <securityerr.h>
+#include <aknnotewrappers.h>              // Note dialogs
 #include <apmrec.h>
-#include <eikenv.h>                       // CEikonEnv
 #include "certparser.h"
-#include "SecQueryUi.h"                   // needed for password dialog
-#include <hbdevicemessageboxsymbian.h>    // needed for Note dialogs
 // CONSTANTS
 _LIT( KPKCS12DllName, "crpkcs12.dll" );   // PKCS12 DLL name
 const TInt KX509Version3 = 3;
 const TInt KPwMaxLength = 32;
 // sets member data accordingly.
 // ----------------------------------------------------------
 //
 void CCertParser::SetContentL( RFile& aFile )
 {
 delete iCert;
 iCert = NULL;
 TInt fileSize = 0;
 CleanupClosePushL( aFile );
 User::LeaveIfError( aFile.Size( fileSize ) );
 // Creates PKCS#12 DLL
 // ----------------------------------------------------------
 //
 void CCertParser::CreatePKCS12L()
 {
+// Load PKCS#12 dll
-// Load PKCS#12 dll
 #ifdef __WINS__
 User::LeaveIfError ( iLibrary.Load( KPKCS12DllName ) );
 #else
 User::LeaveIfError ( iLibrary.Load( KPKCS12DllName, KDC_SHARED_LIB_DIR ) );
 #endif
 //
 TBool CCertParser::CheckIfPKCS12L(
 const TDesC8& aPKCS12,
 const TDesC& aFileName )
 {
 CreatePKCS12L();
 if ( !iPKCS12->IsPKCS12Data( aPKCS12 ) )
 {
 ShowErrorNoteL( R_CERTSAVER_PKCS12_FILE_CORRUPTED );
 return EFalse;
 }
 TBool done = EFalse;
 TBuf<KPwMaxLength> password;
+HBufC* buffer = NULL;
+if ( !iEikEnv )
+{
+iEikEnv = CEikonEnv::Static();
+}
 while ( !done )
 {
 if ( !GetPasswordL( password, aFileName ) )
 {
-ShowErrorNoteL(R_CERTSAVER_PKCS12_DISCARDED);
+buffer = iEikEnv->AllocReadResourceLC( R_CERTSAVER_PKCS12_DISCARDED );
+CAknInformationNote* note = new (ELeave) CAknInformationNote( ETrue );
+note->ExecuteLD(buffer->Des());
+CleanupStack::PopAndDestroy( buffer );
 User::Leave( KErrExitApp );
 }
 TRAPD( err, iPKCS12->ParseL( aPKCS12, password ) );
 if ( err != KErrBadPassphrase )
 {
 //
 // ----------------------------------------------------------
 //
 TInt CCertParser::GetPasswordL( TDes& aPassword, const TDesC& aFileName )
 {
-CSecQueryUi* SecQueryUi = CSecQueryUi::NewL();
+CAknTextQueryDialog* query = CAknTextQueryDialog::NewL( aPassword );
-HBufC* prompt =StringLoader::LoadLC( R_QTN_CM_TITLE_P12_PASSWORD, aFileName );
+CleanupStack::PushL( query );
-TInt queryAccepted = SecQueryUi->SecQueryDialog(prompt->Des(), aPassword,
+HBufC* prompt =
-1,KPwMaxLength,
+StringLoader::LoadLC( R_QTN_CM_TITLE_P12_PASSWORD, aFileName );
-ESecUiAlphaSupported |
+query->SetPromptL( *prompt );
-ESecUiCancelSupported |
+CleanupStack::PopAndDestroy( prompt );
-ESecUiSecretSupported |
+CleanupStack::Pop( query );
-ESecUiEmergencyNotSupported);
+return query->ExecuteLD( R_PKCS12_PW_QUERY_DIALOG );
-CleanupStack::PopAndDestroy( prompt );
+}
-delete SecQueryUi;
-SecQueryUi=NULL;
-return (queryAccepted==KErrNone);
-}
 // ----------------------------------------------------------
 // CCertParser::CheckIfX509CertificateL()
 // Returns the type of the certificate.
 // ----------------------------------------------------------
 //
 TBool CCertParser::CheckIfX509CertificateL(const TDesC8& aCert)
 {
 TRAPD( err,
 iCert = CX509Certificate::NewL(aCert);
 );
 if ( err != KErrNone )
 // CCertParser::CACertificates()
 // ----------------------------------------------------------
 //
 const CArrayPtr<CX509Certificate>&  CCertParser::CACertificates() const
 {
 __ASSERT_ALWAYS( iPKCS12, User::Panic( KCertSaverPanic, KPanicNullPointer ) );
 return iPKCS12->CACertificates();
 }
 // ----------------------------------------------------------
 // CCertParser::UserCertificates()
 // ----------------------------------------------------------
 //
 const CArrayPtr<CX509Certificate>&  CCertParser::UserCertificates() const
 {
 __ASSERT_ALWAYS( iPKCS12, User::Panic( KCertSaverPanic, KPanicNullPointer ) );
 return iPKCS12->UserCertificates();
 }
 // ----------------------------------------------------------
 // CCertParser::Keys()
 // ----------------------------------------------------------
 //
 const CArrayPtr<HBufC8>& CCertParser::Keys() const
 {
 __ASSERT_ALWAYS( iPKCS12, User::Panic( KCertSaverPanic, KPanicNullPointer ) );
 return iPKCS12->PrivateKeys();
 }
 // ----------------------------------------------------------
 // CCertParser::CertType()
 // ----------------------------------------------------------
 //
 CCertParser::TCertType CCertParser::CertType() const
 {
 return iCertType;
 }
 // ----------------------------------------------------------
 // CCertParser::CertificateBuf()
 // Returns the content of the certificate.
 // ----------------------------------------------------------
 //
 const TPtrC8 CCertParser::CertificateBuf() const
 {
 __ASSERT_ALWAYS( iCert, User::Panic( KCertSaverPanic, KPanicNullPointer ) );
 return iCert->Encoding();
 }
 // ----------------------------------------------------------
 // Returns the X.509 certificate object.
 // ----------------------------------------------------------
 //
 const CX509Certificate& CCertParser::Certificate() const
 {
 __ASSERT_ALWAYS( iCert, User::Panic( KCertSaverPanic, KPanicNullPointer ) );
 return *((CX509Certificate*)iCert);
 }
 // ----------------------------------------------------------
 if ( !iEikEnv )
 {
 iEikEnv = CEikonEnv::Static();
 }
 HBufC* buffer = iEikEnv->AllocReadResourceLC( aResourceID );
-CHbDeviceMessageBoxSymbian* iMessageBox = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning);
+CAknErrorNote* note = new (ELeave) CAknErrorNote( ETrue );
-CleanupStack::PushL(iMessageBox);
+note->ExecuteLD(buffer->Des());
-iMessageBox->SetTextL(buffer->Des());
+CleanupStack::PopAndDestroy( buffer );
-iMessageBox->SetTimeout(6000);
-iMessageBox->ExecL();
-CleanupStack::PopAndDestroy(iMessageBox);
-CleanupStack::PopAndDestroy( buffer );
 }
 //  End of File

branch	RCL_3
changeset 50	03674e5abf46
parent 49	09b1ac925e3f