networksecurity/tls/ts_tls/T_TLS_cntrl.cpp
branchRCL_3
changeset 75 c1029e558ef5
parent 58 8d540f55e491
equal deleted inserted replaced
67:bb2423252ea3 75:c1029e558ef5
     1 // Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
     1 // Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
     2 // All rights reserved.
     2 // All rights reserved.
     3 // This component and the accompanying materials are made available
     3 // This component and the accompanying materials are made available
     4 // under the terms of "Eclipse Public License v1.0"
     4 // under the terms of "Eclipse Public License v1.0"
     5 // which accompanies this distribution, and is available
     5 // which accompanies this distribution, and is available
     6 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
     6 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
   213 			if (!iTestStep->GetBoolFromConfig(KSectionName, KCfgEAPKeyDerivation, iEAPKeyDerivation ))
   213 			if (!iTestStep->GetBoolFromConfig(KSectionName, KCfgEAPKeyDerivation, iEAPKeyDerivation ))
   214 				{
   214 				{
   215 				iEAPKeyDerivation = KDefEAPKeyDerivation;
   215 				iEAPKeyDerivation = KDefEAPKeyDerivation;
   216 				}
   216 				}
   217 			iTestStep->Log( _L("EAPKeyDerivation: %D"), iEAPKeyDerivation);
   217 			iTestStep->Log( _L("EAPKeyDerivation: %D"), iEAPKeyDerivation);
   218 #ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
       
   219 			// iTLSDialogMode;
       
   220             if (!iTestStep->GetBoolFromConfig(KSectionName, KCfgSSLDialogMode, iTLSDialogMode ))
       
   221                 {
       
   222                 iTLSDialogMode = KDefSSLDialogMode;
       
   223                 }
       
   224             iTestStep->Log( _L("TLSDialogMode: %D"), iTLSDialogMode);
       
   225             
       
   226             // iTLSDialogModeValue;
       
   227             if (!iTestStep->GetIntFromConfig(KSectionName, KCfgSSLDialogModeValue, iTLSDialogModeValue ))
       
   228                 {
       
   229                 iTLSDialogModeValue = KDefSSLDialogModeValue;
       
   230                 }
       
   231             iTestStep->Log( _L("TLSDialogModeValue: %D"), iTLSDialogModeValue);
       
   232             
       
   233             // iExpectedErrorCode (-7548: KErrSSLAlertUnknownCA)
       
   234             if (!iTestStep->GetIntFromConfig(KSectionName, KCfgExpectedErrorCode, iExpectedErrorCode ))
       
   235                 {
       
   236                 iExpectedErrorCode = KDefErrorValue;
       
   237                 }
       
   238             iTestStep->Log( _L("ExpectedErrorCode: %D"), iExpectedErrorCode);
       
   239 #endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
       
   240 
   218 
   241 			// On to next state 
   219 			// On to next state 
   242 			iRunState = EFindFreeTest;			
   220 			iRunState = EFindFreeTest;			
   243 
   221 
   244 			iTimer.After( iStatus, KControllerDelayTime );
   222 			iTimer.After( iStatus, KControllerDelayTime );
   273 						TInt maxConnections = KMaxSSLConnections;
   251 						TInt maxConnections = KMaxSSLConnections;
   274 						if ( maxConnections != 1 )
   252 						if ( maxConnections != 1 )
   275 							{
   253 							{
   276 							iTestStep->Log( _L("Using test object %d"), i );
   254 							iTestStep->Log( _L("Using test object %d"), i );
   277 							}
   255 							}
   278 #ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
   256 
   279 						iTLSTest[i]->ConnectL( iAddress, iPortNum, iPage, iCipherSuites, 
   257 						iTLSTest[i]->ConnectL( iAddress, iPortNum, iPage, iCipherSuites, 
   280                                                     iCipher, iSimpleGet, iTestEndDelay, iDNSName, iProtocol, iUseGenericSocket, iEAPKeyDerivation, iTLSDialogMode, iTLSDialogModeValue, iExpectedErrorCode ); //ajit
   258 							iCipher, iSimpleGet, iTestEndDelay, iDNSName, iProtocol, iUseGenericSocket, iEAPKeyDerivation );
   281 #else
       
   282 						iTLSTest[i]->ConnectL( iAddress, iPortNum, iPage, iCipherSuites, 
       
   283 						                            iCipher, iSimpleGet, iTestEndDelay, iDNSName, iProtocol, iUseGenericSocket, iEAPKeyDerivation ); //ajit
       
   284 #endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
       
   285 
   259 
   286 						iRunState = EWaitForComplete;
   260 						iRunState = EWaitForComplete;
   287 						break; // break from the for loop
   261 						break; // break from the for loop
   288 					}
   262 					}
   289 				} // 'for' statement
   263 				} // 'for' statement