root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Always return errors in ssl3_get_client_hello 

If we successfully match a cookie don't set return value to 2 as this
results in other error conditions returning 2 as well.

Instead set return value to -2 which can be checked later if everything
else is OK.
(cherry picked from commit c56f5b8edf)
This commit is contained in:
Dr. Stephen Henson 2013-04-09 15:53:38 +01:00
parent 65a87d3cc3
commit c391a74266
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssl/s3_srvr.c
View File

@ -1083,8 +1083,8 @@ int ssl3_get_client_hello(SSL *s)
SSL_R_COOKIE_MISMATCH);
goto f_err;
}
ret = 2;
/* Set to -2 so if successful we return 2 */
ret = -2;
}
p += cookie_len;
@ -1455,7 +1455,7 @@ int ssl3_get_client_hello(SSL *s)
}
}
if (ret < 0) ret=1;
if (ret < 0) ret=-ret;
if (0)
{
f_err:
@ -1463,7 +1463,7 @@ f_err:
}
err:
if (ciphers != NULL) sk_SSL_CIPHER_free(ciphers);
return(ret);
return ret < 0 ? -1 : ret;
}
int ssl3_send_server_hello(SSL *s)