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

Remove one unnecessary transition from the SSL3 state machine.

Browse Source 
Reduce the number of reallocations of the SSL3 handshake message buffer.
Bugscape bugs 53287 and 53337


git-svn-id: svn://10.0.0.236/trunk@148646 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelsonb%netscape.com 2003-10-31 07:01:05 +00:00
parent 7e3e91b55c
commit 517ef7b660
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/security/nss/lib/ssl/ssl3con.c
View File

@ -38,7 +38,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: ssl3con.c,v 1.59 2003-10-19 01:55:50 nelsonb%netscape.com Exp $
* $Id: ssl3con.c,v 1.60 2003-10-31 07:01:05 nelsonb%netscape.com Exp $
*/
#include "nssrenam.h"
@ -2240,7 +2240,7 @@ ssl3_HandleChangeCipherSpecs(sslSocket *ss, sslBuffer *buf)
SSL_TRC(3, ("%d: SSL3[%d]: handle change_cipher_spec record",
SSL_GETPID(), ss->fd));
if (ws != wait_change_cipher && ws != wait_cert_verify) {
if (ws != wait_change_cipher) {
(void)SSL3_SendAlert(ss, alert_fatal, unexpected_message);
PORT_SetError(SSL_ERROR_RX_UNEXPECTED_CHANGE_CIPHER);
return SECFailure;
@ -8171,23 +8171,22 @@ ssl3_HandleHandshake(sslSocket *ss, sslBuffer *origBuf)
/* must be copied to msg_body and dealt with from there */
unsigned int bytes;
bytes = PR_MIN(buf->len, ssl3->hs.msg_len);
PORT_Assert(ssl3->hs.msg_body.len <= ssl3->hs.msg_len);
bytes = PR_MIN(buf->len, ssl3->hs.msg_len - ssl3->hs.msg_body.len);
/* Grow the buffer if needed */
if (bytes > ssl3->hs.msg_body.space - ssl3->hs.msg_body.len) {
rv = sslBuffer_Grow(&ssl3->hs.msg_body,
ssl3->hs.msg_body.len + bytes);
if (rv != SECSuccess) {
/* sslBuffer_Grow has set a memory error code. */
return SECFailure;
}
rv = sslBuffer_Grow(&ssl3->hs.msg_body, ssl3->hs.msg_len);
if (rv != SECSuccess) {
/* sslBuffer_Grow has set a memory error code. */
return SECFailure;
}
PORT_Memcpy(ssl3->hs.msg_body.buf + ssl3->hs.msg_body.len,
buf->buf, buf->len);
buf->buf, bytes);
ssl3->hs.msg_body.len += bytes;
buf->buf += bytes;
buf->len -= bytes;
/* should not be more than one message in msg_body */
PORT_Assert(ssl3->hs.msg_body.len <= ssl3->hs.msg_len);
/* if we have a whole message, do it */