Imported Upstream version 4.5.2

3 files changed, 46 insertions, 11 deletions

diff --git a/src/libstrongswan/plugins/curl/Makefile.in b/src/libstrongswan/plugins/curl/Makefile.in
index e61c73041..cdfb2b801 100644
--- a/src/libstrongswan/plugins/curl/Makefile.in
+++ b/src/libstrongswan/plugins/curl/Makefile.in
@@ -240,6 +240,8 @@ nm_ca_dir = @nm_ca_dir@
 oldincludedir = @oldincludedir@
 openac_plugins = @openac_plugins@
 p_plugins = @p_plugins@
+pcsclite_CFLAGS = @pcsclite_CFLAGS@
+pcsclite_LIBS = @pcsclite_LIBS@
 pdfdir = @pdfdir@
 piddir = @piddir@
 pki_plugins = @pki_plugins@
@@ -263,6 +265,7 @@ soup_LIBS = @soup_LIBS@
 srcdir = @srcdir@
 strongswan_conf = @strongswan_conf@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
diff --git a/src/libstrongswan/plugins/curl/curl_fetcher.c b/src/libstrongswan/plugins/curl/curl_fetcher.c
index 82e24e810..7f8c0aec2 100644
--- a/src/libstrongswan/plugins/curl/curl_fetcher.c
+++ b/src/libstrongswan/plugins/curl/curl_fetcher.c
@@ -43,31 +43,49 @@ struct private_curl_fetcher_t {
 	 * Optional HTTP headers
 	 */
 	struct curl_slist *headers;
+
+	/**
+	 * Callback function
+	 */
+	fetcher_callback_t cb;
 };
 
 /**
- * writes data into a dynamically resizeable chunk_t
+ * Data to pass to curl callback
+ */
+typedef struct {
+	fetcher_callback_t cb;
+	void *user;
+} cb_data_t;
+
+/**
+ * Curl callback function, invokes fetcher_callback_t function
  */
-static size_t append(void *ptr, size_t size, size_t nmemb, chunk_t *data)
+static size_t curl_cb(void *ptr, size_t size, size_t nmemb, cb_data_t *data)
 {
 	size_t realsize = size * nmemb;
 
-	data->ptr = (u_char*)realloc(data->ptr, data->len + realsize);
-	if (data->ptr)
+	if (data->cb(data->user, chunk_create(ptr, realsize)))
 	{
-		memcpy(&data->ptr[data->len], ptr, realsize);
-		data->len += realsize;
+		return realsize;
 	}
-	return realsize;
+	return 0;
 }
 
 METHOD(fetcher_t, fetch, status_t,
-	private_curl_fetcher_t *this, char *uri, chunk_t *result)
+	private_curl_fetcher_t *this, char *uri, void *userdata)
 {
 	char error[CURL_ERROR_SIZE];
 	status_t status;
+	cb_data_t data = {
+		.cb = this->cb,
+		.user = userdata,
+	};
 
-	*result = chunk_empty;
+	if (this->cb == fetcher_default_callback)
+	{
+		*(chunk_t*)userdata = chunk_empty;
+	}
 
 	if (curl_easy_setopt(this->curl, CURLOPT_URL, uri) != CURLE_OK)
 	{	/* URL type not supported by curl */
@@ -77,8 +95,8 @@ METHOD(fetcher_t, fetch, status_t,
 	curl_easy_setopt(this->curl, CURLOPT_FAILONERROR, TRUE);
 	curl_easy_setopt(this->curl, CURLOPT_NOSIGNAL, TRUE);
 	curl_easy_setopt(this->curl, CURLOPT_CONNECTTIMEOUT, DEFAULT_TIMEOUT);
-	curl_easy_setopt(this->curl, CURLOPT_WRITEFUNCTION, (void*)append);
-	curl_easy_setopt(this->curl, CURLOPT_WRITEDATA, (void*)result);
+	curl_easy_setopt(this->curl, CURLOPT_WRITEFUNCTION, (void*)curl_cb);
+	curl_easy_setopt(this->curl, CURLOPT_WRITEDATA, &data);
 	if (this->headers)
 	{
 		curl_easy_setopt(this->curl, CURLOPT_HTTPHEADER, this->headers);
@@ -146,6 +164,11 @@ METHOD(fetcher_t, set_option, bool,
 							 va_arg(args, u_int));
 			break;
 		}
+		case FETCH_CALLBACK:
+		{
+			this->cb = va_arg(args, fetcher_callback_t);
+			break;
+		}
 		default:
 			supported = FALSE;
 			break;
@@ -178,6 +201,7 @@ curl_fetcher_t *curl_fetcher_create()
 			},
 		},
 		.curl = curl_easy_init(),
+		.cb = fetcher_default_callback,
 	);
 
 	if (!this->curl)
diff --git a/src/libstrongswan/plugins/curl/curl_plugin.c b/src/libstrongswan/plugins/curl/curl_plugin.c
index 387da03aa..d0e532055 100644
--- a/src/libstrongswan/plugins/curl/curl_plugin.c
+++ b/src/libstrongswan/plugins/curl/curl_plugin.c
@@ -34,6 +34,12 @@ struct private_curl_plugin_t {
 	curl_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+	private_curl_plugin_t *this)
+{
+	return "curl";
+}
+
 METHOD(plugin_t, destroy, void,
 	private_curl_plugin_t *this)
 {
@@ -54,6 +60,8 @@ plugin_t *curl_plugin_create()
 	INIT(this,
 		.public = {
 			.plugin = {
+				.get_name = _get_name,
+				.reload = (void*)return_false,
 				.destroy = _destroy,
 			},
 		},