diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp
--- a/networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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 "Eclipse Public License v1.0"
@@ -16,8 +16,6 @@
 #include "Tlsprovinterface.h"
 #include "tlsprovider.h"
 #include <badesca.h>
-#include <featdiscovery.h>
-#include <featureuids.h>
 
 //
 //                                   CTlsProvider
@@ -251,8 +249,7 @@
 */
 EXPORT_C void CTLSProvider::CancelRequest()
 	{
-    if (iTlsProviderImpl)
-        iTlsProviderImpl->CancelRequest();
+	iTlsProviderImpl->CancelRequest();
 	}
 
 
@@ -285,9 +282,6 @@
       ((TlsSessionPtr()->Attributes())->iMasterSecretInput).iClientRandom = (Attributes()->iMasterSecretInput).iClientRandom;
    	}
 
-	TBool allowUntrustedCertificates = EFalse;
-	allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
-
 	// Save old implementation object
 	CTlsProviderImpl *oldTlsProviderImpl = iTlsProviderImpl;
 	iTlsProviderImpl = NULL;	
@@ -305,16 +299,7 @@
 
 		Attributes()->iProposedProtocol = oldAttr->iProposedProtocol;
 		Attributes()->iProposedCiphers = oldAttr->iProposedCiphers;
-		
-		if( allowUntrustedCertificates )
-			{
-			Attributes()->iDialogMode = oldAttr->iDialogMode;
-			}
-		else
-			{
-			Attributes()->iDialogNonAttendedMode = oldAttr->iDialogNonAttendedMode;
-			}
-
+		Attributes()->iDialogNonAttendedMode = oldAttr->iDialogNonAttendedMode;
 		Attributes()->idomainName = oldAttr->idomainName;
 
 		// Copy NULL ciphersuite setting
@@ -353,15 +338,7 @@
 		(Attributes()->iMasterSecretInput).iClientRandom = ((TlsSessionPtr()->Attributes())->iMasterSecretInput).iClientRandom;
 		Attributes()->iProposedProtocol = (TlsSessionPtr()->Attributes())->iProposedProtocol;
 		Attributes()->iNegotiatedProtocol = (TlsSessionPtr()->Attributes())->iNegotiatedProtocol;
-		if( allowUntrustedCertificates )
-			{
-			Attributes()->iDialogMode = (TlsSessionPtr()->Attributes())->iDialogMode;
-			}
-		else
-			{
-			Attributes()->iDialogNonAttendedMode = (TlsSessionPtr()->Attributes())->iDialogNonAttendedMode;
-			}
-
+		Attributes()->iDialogNonAttendedMode = (TlsSessionPtr()->Attributes())->iDialogNonAttendedMode;
       	Attributes()->iSessionNameAndID.iServerName = (TlsSessionPtr()->Attributes())->iSessionNameAndID.iServerName;
       	Attributes()->iSessionNameAndID.iSessionId = (TlsSessionPtr()->Attributes())->iSessionNameAndID.iSessionId;
 
@@ -668,13 +645,11 @@
 */
 EXPORT_C void CTLSSession::CancelRequest()
 	{
-    if (iTlsSessionImpl)
-        iTlsSessionImpl->CancelRequest();
+	iTlsSessionImpl->CancelRequest();
 	}
 
 EXPORT_C CTLSSession::~CTLSSession()
 	{
 	delete iTlsSessionImpl;
-	iTlsSessionImpl = NULL;
 	}