From 2f3ea36ab4c53b6d89b7293d8de9f8bfa10b05f0 Mon Sep 17 00:00:00 2001 From: ading2210 Date: Thu, 3 Oct 2024 09:57:20 -0400 Subject: [PATCH] don't include certs in wasm --- client/exported_funcs.txt | 1 - client/javascript/main.js | 2 +- client/libcurl/request.c | 11 ----------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/client/exported_funcs.txt b/client/exported_funcs.txt index 7659fd2..1b132a4 100644 --- a/client/exported_funcs.txt +++ b/client/exported_funcs.txt @@ -11,7 +11,6 @@ request_cleanup create_request request_set_proxy get_version -get_cacert get_error_str http_set_options diff --git a/client/javascript/main.js b/client/javascript/main.js index a5252ce..87c71ed 100644 --- a/client/javascript/main.js +++ b/client/javascript/main.js @@ -65,7 +65,7 @@ function get_version() { } function get_cacert() { - return UTF8ToString(_get_cacert()); + return ":("; } function setup_main_session() { diff --git a/client/libcurl/request.c b/client/libcurl/request.c index a6f7c20..8472ba7 100644 --- a/client/libcurl/request.c +++ b/client/libcurl/request.c @@ -7,15 +7,12 @@ #include "curl/easy.h" #include "curl/multi.h" -#include "cacert.h" #include "util.h" #include "types.h" void finish_request(CURLMsg *curl_msg); void forward_headers(struct RequestInfo *request_info); -struct curl_blob cacert_blob; - size_t write_function(char *data, size_t size, size_t nmemb, struct RequestInfo *request_info) { size_t real_size = size * nmemb; (*request_info->data_callback)(request_info->request_id, data, real_size); @@ -43,7 +40,6 @@ CURL* create_request(const char* url, int request_id, DataCallback data_callback curl_easy_setopt(http_handle, CURLOPT_PRIVATE, request_info); curl_easy_setopt(http_handle, CURLOPT_URL, url); - curl_easy_setopt(http_handle, CURLOPT_CAINFO_BLOB , cacert_blob); //callbacks to pass the response data back to js curl_easy_setopt(http_handle, CURLOPT_WRITEFUNCTION, &write_function); @@ -79,13 +75,6 @@ void request_set_proxy(CURL* http_handle, const char* proxy_url) { curl_easy_setopt(http_handle, CURLOPT_PROXY, proxy_url); } -unsigned char* get_cacert() { - return _cacert_pem; -} - void init_curl() { curl_global_init(CURL_GLOBAL_DEFAULT); - cacert_blob.data = _cacert_pem; - cacert_blob.len = _cacert_pem_len; - cacert_blob.flags = CURL_BLOB_NOCOPY; } \ No newline at end of file