Move MAC computations for Finished from ssl3_read_bytes into
ssl3_get_message, which is more logical (and avoids a bug, in addition to the one that I introduced yesterday :-) and makes Microsoft "fast SGC" less special. MS SGC should still work now without an extra state of its own (it goes directly to SSL3_ST_SR_CLNT_HELLO_C, which is the usual state for reading the body of a Client Hello message), however this should be tested to make sure, and I don't have a MS SGC client.
This commit is contained in:
@@ -161,7 +161,6 @@ case SSL3_ST_SW_FLUSH: str="SSLv3 flush data"; break;
|
||||
case SSL3_ST_SR_CLNT_HELLO_A: str="SSLv3 read client hello A"; break;
|
||||
case SSL3_ST_SR_CLNT_HELLO_B: str="SSLv3 read client hello B"; break;
|
||||
case SSL3_ST_SR_CLNT_HELLO_C: str="SSLv3 read client hello C"; break;
|
||||
case SSL3_ST_SR_MS_SGC: str="SSLv3 read second client hello (MS SGC)"; break;
|
||||
case SSL3_ST_SW_HELLO_REQ_A: str="SSLv3 write hello request A"; break;
|
||||
case SSL3_ST_SW_HELLO_REQ_B: str="SSLv3 write hello request B"; break;
|
||||
case SSL3_ST_SW_HELLO_REQ_C: str="SSLv3 write hello request C"; break;
|
||||
@@ -313,7 +312,6 @@ case SSL3_ST_SW_HELLO_REQ_C: str="3WHR_C"; break;
|
||||
case SSL3_ST_SR_CLNT_HELLO_A: str="3RCH_A"; break;
|
||||
case SSL3_ST_SR_CLNT_HELLO_B: str="3RCH_B"; break;
|
||||
case SSL3_ST_SR_CLNT_HELLO_C: str="3RCH_C"; break;
|
||||
case SSL3_ST_SR_MS_SGC: str="3RMSSG"; break;
|
||||
case SSL3_ST_SW_SRVR_HELLO_A: str="3WSH_A"; break;
|
||||
case SSL3_ST_SW_SRVR_HELLO_B: str="3WSH_B"; break;
|
||||
case SSL3_ST_SW_CERT_A: str="3WSC_A"; break;
|
||||
|
Reference in New Issue
Block a user