Commit 2045d83d authored by Alessandro Ghedini's avatar Alessandro Ghedini Committed by Daniel Stenberg
Browse files

gnutls: fix the error_is_fatal logic

parent 0da6c113
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -299,23 +299,23 @@ 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;
  }
}
}

static gnutls_x509_crt_fmt do_file_type(const char *type)
{