From 80907d7dc770b2e673d51308fb2b28a68783734d Mon Sep 17 00:00:00 2001 From: Alessandro Ghedini Date: Wed, 24 Oct 2012 11:47:32 +0200 Subject: [PATCH 1/2] gnutls: fix the error_is_fatal logic --- lib/gtls.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/gtls.c b/lib/gtls.c index f5f95ae..dbf568c 100644 --- a/lib/gtls.c +++ b/lib/gtls.c @@ -299,21 +299,21 @@ static CURLcode handshake(struct connectdata *conn, connssl->connecting_state = gnutls_record_get_direction(session)? ssl_connect_2_writing:ssl_connect_2_reading; + continue; if(nonblocking) return CURLE_OK; } - else if((rc < 0) && gnutls_error_is_fatal(rc)) { + else if((rc < 0) && !gnutls_error_is_fatal(rc)) { failf(data, "gnutls_handshake() warning: %s", gnutls_strerror(rc)); } else if(rc < 0) { failf(data, "gnutls_handshake() failed: %s", gnutls_strerror(rc)); return CURLE_SSL_CONNECT_ERROR; } - else { - /* Reset our connect state machine */ - connssl->connecting_state = ssl_connect_1; - return CURLE_OK; - } + + /* Reset our connect state machine */ + connssl->connecting_state = ssl_connect_1; + return CURLE_OK; } } -- 1.7.10.4