Commit c391a742 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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 c56f5b8e)
parent 65a87d3c

ssl/s3_srvr.c

+4 −4
Original line number Diff line number Diff line
@@ -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)