Simplify RI+SCSV logic:
1. Send SCSV is not renegotiating, never empty RI. 2. Send RI if renegotiating.
This commit is contained in:
parent
74f2260694
commit
423c66f10e
@ -1370,10 +1370,9 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p,
|
|||||||
p+=j;
|
p+=j;
|
||||||
}
|
}
|
||||||
/* If p == q, no ciphers and caller indicates an error. Otherwise
|
/* If p == q, no ciphers and caller indicates an error. Otherwise
|
||||||
* add SCSV if no extensions (i.e. SSL3 is client_version)
|
* add SCSV if not renegotiating.
|
||||||
* since spec RECOMMENDS not sending both RI and SCSV.
|
|
||||||
*/
|
*/
|
||||||
if (p != q && !s->new_session && s->client_version == SSL3_VERSION)
|
if (p != q && !s->new_session)
|
||||||
{
|
{
|
||||||
static SSL_CIPHER scsv =
|
static SSL_CIPHER scsv =
|
||||||
{
|
{
|
||||||
|
@ -316,7 +316,8 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
|
|||||||
ret+=size_str;
|
ret+=size_str;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Add the renegotiation option: TODOEKR switch */
|
/* Add RI if renegotiating */
|
||||||
|
if (s->new_session)
|
||||||
{
|
{
|
||||||
int el;
|
int el;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user