equal
deleted
inserted
replaced
342 return iSecureSocketController->CipherSuite(aCipherSuite); |
342 return iSecureSocketController->CipherSuite(aCipherSuite); |
343 //else |
343 //else |
344 return KErrNotSupported; |
344 return KErrNotSupported; |
345 } |
345 } |
346 |
346 |
347 void CSocket::UpgradeToSecureL(TRequestStatus& aStatus, const TDesC8& aHostName) |
347 void CSocket::UpgradeToSecureL(TRequestStatus& aStatus, const TDesC8& aHostName,const TDesC& aProtocol) |
348 /** |
348 /** |
349 Asynchronous request to upgrade the socket to a secure socket. |
349 Asynchronous request to upgrade the socket to a secure socket. |
350 @param aStatus The request status, this will complete with KErrNone on the successful |
350 @param aStatus The request status, this will complete with KErrNone on the successful |
351 upgrade to a secure connection. |
351 upgrade to a secure connection. |
352 @param aHostName The host name of the server used for domain name checking |
352 @param aHostName The host name of the server used for domain name checking |
366 TRAPD(error, iSecureSocketController = CHttpSecureSocket::NewL(iSocket, iCommsInfoProvider)); |
366 TRAPD(error, iSecureSocketController = CHttpSecureSocket::NewL(iSocket, iCommsInfoProvider)); |
367 if (error == KErrNotFound || error == KEComErrNoInterfaceIdentified) |
367 if (error == KErrNotFound || error == KEComErrNoInterfaceIdentified) |
368 User::Leave(KErrNotSupported); |
368 User::Leave(KErrNotSupported); |
369 else if (error != KErrNone) |
369 else if (error != KErrNone) |
370 User::Leave(error); |
370 User::Leave(error); |
371 iSecureSocketController->StartSecureHandshakeL(aStatus, aHostName); |
371 iSecureSocketController->StartSecureHandshakeL(aStatus, aHostName,aProtocol); |
372 } |
372 } |
373 } |
373 } |
374 |
374 |
375 void CSocket::CancelUpgradeToSecure() |
375 void CSocket::CancelUpgradeToSecure() |
376 /** |
376 /** |