equal
deleted
inserted
replaced
138 CTlsCryptoAttributes* CTlsCryptoAttributes::NewL() |
138 CTlsCryptoAttributes* CTlsCryptoAttributes::NewL() |
139 { |
139 { |
140 CTlsCryptoAttributes* tPtr = new (ELeave)CTlsCryptoAttributes; |
140 CTlsCryptoAttributes* tPtr = new (ELeave)CTlsCryptoAttributes; |
141 CleanupStack::PushL(tPtr); |
141 CleanupStack::PushL(tPtr); |
142 tPtr->iPublicKeyParams = new (ELeave)CTLSPublicKeyParams; |
142 tPtr->iPublicKeyParams = new (ELeave)CTLSPublicKeyParams; |
143 CleanupStack::Pop(); |
143 CleanupStack::Pop(tPtr); |
144 return tPtr; |
144 return tPtr; |
145 } |
145 } |
146 |
146 |
147 CTlsCryptoAttributes::CTlsCryptoAttributes() |
147 CTlsCryptoAttributes::CTlsCryptoAttributes() |
148 { |
148 { |
1315 switch(iCurrentState) |
1315 switch(iCurrentState) |
1316 { |
1316 { |
1317 |
1317 |
1318 case EGetSessionInterface: |
1318 case EGetSessionInterface: |
1319 { |
1319 { |
1320 iPtrTokenSearch->CancelRequest(); |
1320 if (iPtrTokenSearch) |
1321 break; |
1321 iPtrTokenSearch->CancelRequest(); |
1322 } |
1322 } |
|
1323 break; |
1323 case EGetCiphers: |
1324 case EGetCiphers: |
1324 { |
1325 { |
1325 if(iListAllTokensAndTypes[iCurrentTokentype].iProviderInterface) |
1326 if(iListAllTokensAndTypes[iCurrentTokentype].iProviderInterface) |
1326 iListAllTokensAndTypes[iCurrentTokentype].iProviderInterface->CancelCryptoCapabilities(); |
1327 iListAllTokensAndTypes[iCurrentTokentype].iProviderInterface->CancelCryptoCapabilities(); |
1327 } |
1328 } |
1369 case EUserDialog: |
1370 case EUserDialog: |
1370 { |
1371 { |
1371 #ifdef _USESECDLGSV_ |
1372 #ifdef _USESECDLGSV_ |
1372 iDialogServ.Cancel(); |
1373 iDialogServ.Cancel(); |
1373 #else |
1374 #else |
1374 iSecurityDialog->Cancel(); |
1375 if (iSecurityDialog) |
|
1376 iSecurityDialog->Cancel(); |
1375 #endif |
1377 #endif |
1376 } |
1378 } |
1377 break; |
1379 break; |
1378 |
1380 |
1379 default: |
1381 default: |