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

Update from stable branch.

parent c78bba23
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -2918,7 +2918,11 @@ static int ssl3_check_finished(SSL *s)
	{
	int ok;
	long n;
	if (!s->session->tlsext_tick)
	/* If we have no ticket or session ID is non-zero length (a match of
	 * a non-zero session length would never reach here) it cannot be a
	 * resumed session.
	 */
	if (!s->session->tlsext_tick || s->session->session_id_length)
		return 1;
	/* this function is called when we really expect a Certificate
	 * message, so permit appropriate message length */