833c429627 — curl

Subject

wolfssl: simplify wssl_send_earlydata

No binary (build failed)

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

(log yok)

lib/vtls/wolfssl.c+7 -15

@@ -1618,7 +1618,6 @@ static CURLcode wssl_send_earlydata(struct Curl_cfilter *cf,
	{
	struct ssl_connect_data *connssl = cf->ctx;
	struct wssl_ctx wssl = (struct wssl_ctx )connssl->backend;
-	CURLcode result = CURLE_OK;
	const unsigned char *buf;
	size_t blen;

@@ -1633,23 +1632,17 @@ static CURLcode wssl_send_earlydata(struct Curl_cfilter *cf,
	blen, rc, nwritten);
	if(rc < 0) {
	int err = wolfSSL_get_error(wssl->ssl, rc);
+	char error_buffer[256];
	switch(err) {
	case WOLFSSL_ERROR_NONE: /* just did not get anything */
	case WOLFSSL_ERROR_WANT_READ:
	case WOLFSSL_ERROR_WANT_WRITE:
-	result = CURLE_AGAIN;
-	break;
-	default: {
-	char error_buffer[256];
-	CURL_TRC_CF(data, cf, "SSL send early data, error: '%s'(%d)",
-	wssl_strerror((unsigned long)err, error_buffer,
-	sizeof(error_buffer)),
-	err);
-	result = CURLE_SEND_ERROR;
-	break;
-	}
+	return CURLE_AGAIN;
	}
-	goto out;
+	CURL_TRC_CF(data, cf, "SSL send early data, error: '%s'(%d)",
+	wssl_strerror((unsigned long)err, error_buffer,
+	sizeof(error_buffer)), err);
+	return CURLE_SEND_ERROR;
	}

	Curl_bufq_skip(&connssl->earlydata, (size_t)nwritten);
@@ -1659,8 +1652,7 @@ static CURLcode wssl_send_earlydata(struct Curl_cfilter *cf,
	if(!Curl_ssl_cf_is_proxy(cf))
	Curl_pgrsEarlyData(data, (curl_off_t)connssl->earlydata_skip);
	infof(data, "SSL sending %zu bytes of early data", connssl->earlydata_skip);
-	out:
-	return result;
+	return CURLE_OK;
	}
	#endif /* WOLFSSL_EARLY_DATA */