Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up TLS intolerant restart code: but 191417 p=darin r=kaie sr=bryner

Browse Source
This commit is contained in:
jgmyers%speakeasy.net 2004-03-10 05:28:39 +00:00
parent 24f965c47d
commit ca499f96dc
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
security/manager/ssl/src/nsNSSIOLayer.cpp
View File

@ -1014,8 +1014,7 @@ isTLSIntoleranceError(PRInt32 err, PRBool withInitialCleartext)
} }
static PRInt32 static PRInt32
checkHandshake(PRBool calledFromRead, PRInt32 bytesTransfered, checkHandshake(PRInt32 bytesTransfered, PRFileDesc* fd, nsNSSSocketInfo *socketInfo)
PRFileDesc* fd, nsNSSSocketInfo *socketInfo)
{ {
// This is where we work around all of those SSL servers that don't // This is where we work around all of those SSL servers that don't
// conform to the SSL spec and shutdown a connection when we request // conform to the SSL spec and shutdown a connection when we request
@ -1059,13 +1058,7 @@ checkHandshake(PRBool calledFromRead, PRInt32 bytesTransfered,
if (wantRetry) { if (wantRetry) {
// We want to cause the network layer to retry the connection. // We want to cause the network layer to retry the connection.
if (calledFromRead) { PR_SetError(PR_CONNECT_RESET_ERROR, 0);
// This will cause a premature EOF
bytesTransfered = 0;
}
else { // called from write
PR_SetError(PR_CONNECT_RESET_ERROR, 0);
}
} }
} }
@ -1113,7 +1106,7 @@ nsSSLIOLayerRead(PRFileDesc* fd, void* buf, PRInt32 amount)
DEBUG_DUMP_BUFFER((unsigned char*)buf, bytesRead); DEBUG_DUMP_BUFFER((unsigned char*)buf, bytesRead);
#endif #endif
return checkHandshake(PR_TRUE, bytesRead, fd, socketInfo); return checkHandshake(bytesRead, fd, socketInfo);
} }
static PRInt32 PR_CALLBACK static PRInt32 PR_CALLBACK
@ -1145,7 +1138,7 @@ nsSSLIOLayerWrite(PRFileDesc* fd, const void* buf, PRInt32 amount)
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] wrote %d bytes\n", (void*)fd, bytesWritten)); PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("[%p] wrote %d bytes\n", (void*)fd, bytesWritten));
#endif #endif
return checkHandshake(PR_FALSE, bytesWritten, fd, socketInfo); return checkHandshake(bytesWritten, fd, socketInfo);
} }
static void InitNSSMethods() static void InitNSSMethods()