diff options
| author | Wan-Teh Chang <wtc@google.com> | 2015-08-30 13:36:02 -0700 |
|---|---|---|
| committer | Wan-Teh Chang <wtc@google.com> | 2015-08-30 13:36:02 -0700 |
| commit | 5aeac8e0722ed2a5fd9cbb849579fbb70dfeebc3 (patch) | |
| tree | 6715bffacd04093f196010609f4c3456944e8b1c | |
| parent | 175f3167bb8cec194d81322e6598ca2e01af028b (diff) | |
| download | nss-hg-5aeac8e0722ed2a5fd9cbb849579fbb70dfeebc3.tar.gz | |
Bug 1117022: Declare variables at the beginning of a block in
ssl3_ComputeHandshakeHashes. r=ekr.
| -rw-r--r-- | lib/ssl/ssl3con.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c index ee08faec6..b058e2238 100644 --- a/lib/ssl/ssl3con.c +++ b/lib/ssl/ssl3con.c @@ -4717,13 +4717,14 @@ ssl3_ComputeHandshakeHashes(sslSocket * ss, SHA1_Clone(shacx, (SHA1Context *)ss->ssl3.hs.sha_cx); if (!isTLS) { + /* compute hashes for SSL3. */ + unsigned char s[4]; + if (!spec->msItem.data) { PORT_SetError(SSL_ERROR_RX_UNEXPECTED_HANDSHAKE); return SECFailure; } - /* compute hashes for SSL3. */ - unsigned char s[4]; s[0] = (unsigned char)(sender >> 24); s[1] = (unsigned char)(sender >> 16); @@ -4853,13 +4854,14 @@ tls12_loser: sha = ss->ssl3.hs.sha; if (!isTLS) { + /* compute hashes for SSL3. */ + unsigned char s[4]; + if (!spec->master_secret) { PORT_SetError(SSL_ERROR_RX_UNEXPECTED_HANDSHAKE); return SECFailure; } - /* compute hashes for SSL3. */ - unsigned char s[4]; s[0] = (unsigned char)(sender >> 24); s[1] = (unsigned char)(sender >> 16); |