Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 331977, No error dialog is presented if an SSL rehandshake fails

Browse Source 
r=rrelyea


git-svn-id: svn://10.0.0.236/trunk@201378 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kaie%kuix.de 2006-06-30 21:22:22 +00:00
parent 1b302573e1
commit 2173cc63f5
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp
View File

@ -1076,19 +1076,18 @@ nsSSLThread::checkHandshake(PRInt32 bytesTransfered, PRFileDesc* ssl_layer_fd, n
PRBool handleHandshakeResultNow;
socketInfo->GetHandshakePending(&handleHandshakeResultNow);
if (0 > bytesTransfered && handleHandshakeResultNow) {
if (0 > bytesTransfered) {
PRInt32 err = PR_GetError();
// Let's see if there was an error set by the SSL libraries that we
// should tell the user about.
if (PR_WOULD_BLOCK_ERROR == err) {
// we are not yet ready to handle the result code from the
// first transfer after the handshake
handleHandshakeResultNow = PR_FALSE;
socketInfo->SetHandshakeInProgress(PR_TRUE);
}
else {
PRBool wantRetry = PR_FALSE;
PRBool wantRetry = PR_FALSE;
if (handleHandshakeResultNow) {
// Let's see if there was an error set by the SSL libraries that we
// should tell the user about.
if (PR_WOULD_BLOCK_ERROR == err) {
socketInfo->SetHandshakeInProgress(PR_TRUE);
return bytesTransfered;
}
PRBool withInitialCleartext = socketInfo->GetHasCleartextPhase();
// When not using a proxy we'll see a connection reset error.
@ -1104,10 +1103,10 @@ nsSSLThread::checkHandshake(PRInt32 bytesTransfered, PRFileDesc* ssl_layer_fd, n
PR_SetError(PR_CONNECT_RESET_ERROR, 0);
}
}
if (!wantRetry && (IS_SSL_ERROR(err) || IS_SEC_ERROR(err))) {
nsHandleSSLError(socketInfo, err);
}
}
if (!wantRetry && (IS_SSL_ERROR(err) || IS_SEC_ERROR(err))) {
nsHandleSSLError(socketInfo, err);
}
}