Fix race condition in ssl_parse_serverhello_tlsext
CVE-2014-3509 (Imported from upstream's 92aa73bcbfad44f9dd7997ae51537ac5d7dc201e) Change-Id: Ibc681897251081ae5ebfea0ff6ca9defd73fe0f5 Reviewed-on: https://boringssl-review.googlesource.com/1441 Reviewed-by: David Benjamin <davidben@chromium.org> Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
parent
0dccfbc6c7
commit
5ba06a7532
13
ssl/t1_lib.c
13
ssl/t1_lib.c
@ -2328,12 +2328,15 @@ static int ssl_scan_serverhello_tlsext(SSL *s, CBS *cbs, int *out_alert)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!CBS_stow(&ec_point_format_list,
|
if (!s->hit)
|
||||||
&s->session->tlsext_ecpointformatlist,
|
|
||||||
&s->session->tlsext_ecpointformatlist_length))
|
|
||||||
{
|
{
|
||||||
*out_alert = SSL_AD_INTERNAL_ERROR;
|
if (!CBS_stow(&ec_point_format_list,
|
||||||
return 0;
|
&s->session->tlsext_ecpointformatlist,
|
||||||
|
&s->session->tlsext_ecpointformatlist_length))
|
||||||
|
{
|
||||||
|
*out_alert = SSL_AD_INTERNAL_ERROR;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* OPENSSL_NO_EC */
|
#endif /* OPENSSL_NO_EC */
|
||||||
|
Loading…
Reference in New Issue
Block a user