Skip to content

feat(curl): real in-guest TLS (mbedTLS) + gzip/brotli/zstd + CA bundle #1711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NathanFlurry wants to merge 1 commit into
base: stack/feat-toolchain-build-mbedtls-for-wasm32-wasip1-ship-ca-bundle-tls-foundation-olswtlmy
Choose a base branch
from
Open

feat(curl): real in-guest TLS (mbedTLS) + gzip/brotli/zstd + CA bundle #1711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion crates/execution/assets/runners/wasm-runner.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,12 @@ function seekGuestFileHandle(handle, offset, whence) {
} else if (numericWhence === WASI_WHENCE_CUR) {
base = BigInt(handle.position ?? 0);
} else if (numericWhence === WASI_WHENCE_END) {
base = BigInt(Number(fsModule.fstatSync(handle.targetFd).size ?? 0));
// Passthrough (read-only delegate) handles keep the real host fd in ioFd;
// targetFd is only a synthetic guest fd number and fstat'ing it reports
// size 0. Prefer ioFd so SEEK_END returns the true file size (e.g. mbedTLS
// sizing a CA bundle via fseek(SEEK_END)+ftell before reading it).
const sizeFd = typeof handle.ioFd === 'number' ? handle.ioFd : handle.targetFd;
base = BigInt(Number(fsModule.fstatSync(sizeFd).size ?? 0));
} else {
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion software/curl/native/c/overlay/lib/curl_setup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@

#if defined(USE_GNUTLS) || defined(USE_OPENSSL) || defined(USE_MBEDTLS) || \
defined(USE_WOLFSSL) || defined(USE_SCHANNEL) || defined(USE_SECTRANSP) || \
defined(USE_BEARSSL) || defined(USE_RUSTLS) || defined(USE_WASI_TLS)
defined(USE_BEARSSL) || defined(USE_RUSTLS)
#define USE_SSL /* SSL support has been enabled */
#endif

Expand Down
6 changes: 0 additions & 6 deletions software/curl/native/c/overlay/lib/vtls/vtls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
#include "mbedtls.h" /* mbedTLS versions */
#include "bearssl.h" /* BearSSL versions */
#include "rustls.h" /* Rustls versions */
#include "wasi_tls.h" /* WASI host TLS */

#include "slist.h"
#include "sendf.h"
Expand Down Expand Up @@ -1380,8 +1379,6 @@ static const struct Curl_ssl Curl_ssl_multi = {
const struct Curl_ssl *Curl_ssl =
#if defined(CURL_WITH_MULTI_SSL)
&Curl_ssl_multi;
#elif defined(USE_WASI_TLS)
&Curl_ssl_wasi_tls;
#elif defined(USE_WOLFSSL)
&Curl_ssl_wolfssl;
#elif defined(USE_GNUTLS)
Expand Down Expand Up @@ -1426,9 +1423,6 @@ static const struct Curl_ssl *available_backends[] = {
#endif
#if defined(USE_RUSTLS)
&Curl_ssl_rustls,
#endif
#if defined(USE_WASI_TLS)
&Curl_ssl_wasi_tls,
#endif
NULL
};
Expand Down
187 changes: 0 additions & 187 deletions software/curl/native/c/overlay/lib/vtls/wasi_tls.c
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions software/curl/native/c/overlay/lib/vtls/wasi_tls.h
View file
Open in desktop

This file was deleted.

Loading