From c681e21777e546b48d2e6a7197756321cdb637d7 Mon Sep 17 00:00:00 2001 From: ading2210 Date: Tue, 5 Mar 2024 21:48:35 -0500 Subject: [PATCH] add function to get cert bundle --- client/exported_funcs.txt | 1 + client/javascript/main.js | 5 +++++ client/libcurl/main.c | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/client/exported_funcs.txt b/client/exported_funcs.txt index ccd56dc..d1b4b83 100644 --- a/client/exported_funcs.txt +++ b/client/exported_funcs.txt @@ -4,6 +4,7 @@ tick_request active_requests get_version +get_cacert recv_from_websocket send_to_websocket diff --git a/client/javascript/main.js b/client/javascript/main.js index 211f7d3..0b8d6ab 100644 --- a/client/javascript/main.js +++ b/client/javascript/main.js @@ -252,6 +252,10 @@ function get_version() { return version_dict; } +function get_cacert() { + return UTF8ToString(_get_cacert()); +} + function main() { wasm_ready = true; _init_curl(); @@ -277,6 +281,7 @@ api = { load_wasm: load_wasm, WebSocket: CurlWebSocket, TLSSocket: TLSSocket, + get_cacert: get_cacert, wisp_connections: _wisp_connections, WispConnection: WispConnection, diff --git a/client/libcurl/main.c b/client/libcurl/main.c index 7725ad3..47a5dd4 100644 --- a/client/libcurl/main.c +++ b/client/libcurl/main.c @@ -7,9 +7,9 @@ #include "curl/easy.h" #include "curl/header.h" #include "cjson/cJSON.h" -#include "cacert.h" #include "curl/multi.h" +#include "cacert.h" #include "util.h" #include "types.h" @@ -196,6 +196,10 @@ void finish_request(CURLMsg *curl_msg) { free(request_info); } +unsigned char* get_cacert() { + return _cacert_pem; +} + void init_curl() { curl_global_init(CURL_GLOBAL_DEFAULT); multi_handle = curl_multi_init();