Browse Source

Remove redundant s->s3 check.

s->s3 is never NULL if an ssl3_* function is called, and we'll crash later
anyway. (This also makes scan-build stop believing it can be NULL.)

Change-Id: Ibf8433bd4d945f9bf5416d72946102a9e50d2787
Reviewed-on: https://boringssl-review.googlesource.com/2206
Reviewed-by: Adam Langley <agl@google.com>
kris/onging/CECPQ3_patch15
David Benjamin 10 years ago
committed by Adam Langley
parent
commit
e2793a7189
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      ssl/s3_srvr.c

+ 1
- 2
ssl/s3_srvr.c View File

@@ -1181,8 +1181,7 @@ int ssl3_send_server_hello(SSL *s)
{
/* We only accept ChannelIDs on connections with ECDHE in order
* to avoid a known attack while we fix ChannelID itself. */
if (s->s3 &&
s->s3->tlsext_channel_id_valid &&
if (s->s3->tlsext_channel_id_valid &&
(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kEECDH) == 0)
s->s3->tlsext_channel_id_valid = 0;



Loading…
Cancel
Save