From: Ryan Tandy <ryan@nardis.ca>
Date: Sat, 6 May 2017 22:50:13 +0000 (+0000)
Subject: ITS#8650 retry gnutls_handshake after GNUTLS_E_AGAIN
X-Git-Tag: OPENLDAP_REL_ENG_2_4_46~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78d47382dc5eabf9027e27a06cb08118ed1b3c91;p=thirdparty%2Fopenldap.git

ITS#8650 retry gnutls_handshake after GNUTLS_E_AGAIN
---

diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
index 2fe2777da7..c9d18f52bd 100644
--- a/libraries/libldap/tls_g.c
+++ b/libraries/libldap/tls_g.c
@@ -358,7 +358,9 @@ tlsg_session_accept( tls_session *session )
 	tlsg_session *s = (tlsg_session *)session;
 	int rc;
 
-	rc = gnutls_handshake( s->session );
+	for ( rc = gnutls_handshake ( s->session );
+	      rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN;
+	      rc = gnutls_handshake ( s->session ) );
 	if ( rc == 0 && s->ctx->reqcert != LDAP_OPT_X_TLS_NEVER ) {
 		const gnutls_datum_t *peer_cert_list;
 		unsigned int list_size;