From: Piotr Sikora <piotr@cloudflare.com>
Date: Tue, 18 Mar 2014 23:55:32 +0000 (+0000)
Subject: Retry callback only after ClientHello received.
X-Git-Tag: master-pre-reformat~847
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f04665a653665cd6432b9adfeb7c7f12a7447d26;p=thirdparty%2Fopenssl.git

Retry callback only after ClientHello received.
---

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 3f43dcc4be4..a787c6d32d8 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -949,7 +949,7 @@ int ssl3_get_client_hello(SSL *s)
 #endif
 	STACK_OF(SSL_CIPHER) *ciphers=NULL;
 
-	if (s->state == SSL3_ST_SR_CLNT_HELLO_C)
+	if (s->state == SSL3_ST_SR_CLNT_HELLO_C && !s->first_packet)
 		goto retry_cert;
 
 	/* We do this so that we will respond with our native type.