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: OpenSSL_1_0_2-beta2~278
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa10982c49c941799b4229cc9b081dcc738f6ee8;p=openssl

Retry callback only after ClientHello received.
(cherry picked from commit f04665a653665cd6432b9adfeb7c7f12a7447d26)
---

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index bea6e2750b..8d0e54315f 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -950,7 +950,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.