Simplify RI+SCSV logic:
1. Send SCSV is not renegotiating, never empty RI. 2. Send RI if renegotiating.
This commit is contained in:
@@ -1300,10 +1300,9 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p,
|
||||
p+=j;
|
||||
}
|
||||
/* If p == q, no ciphers and caller indicates an error. Otherwise
|
||||
* add SCSV if no extensions (i.e. SSL3 is client_version)
|
||||
* since spec RECOMMENDS not sending both RI and SCSV.
|
||||
* add SCSV if not renegotiating.
|
||||
*/
|
||||
if (p != q)
|
||||
if (p != q && !s->new_session)
|
||||
{
|
||||
static SSL_CIPHER scsv =
|
||||
{
|
||||
|
Reference in New Issue
Block a user