generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify RI+SCSV logic:

Browse Source 
1. Send SCSV is not renegotiating, never empty RI.
2. Send RI if renegotiating.
This commit is contained in:
Dr. Stephen Henson 2010-01-07 19:05:03 +00:00
parent 0d8ffc2007
commit 73ff97ad76
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/ssl_lib.c
View File

@ -1370,10 +1370,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 && !s->new_session && s->client_version == SSL3_VERSION)
if (p != q && !s->new_session)
{
static SSL_CIPHER scsv =
{

5
ssl/t1_lib.c
View File

@ -316,8 +316,9 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
ret+=size_str;
}
/* Add the renegotiation option: TODOEKR switch */
{
/* Add RI if renegotiating */
if (s->new_session)
{
int el;
if(!ssl_add_clienthello_renegotiate_ext(s, 0, &el, 0))