vrr/TrustTunnel
2
0
Fork 0
mirror of https://github.com/TrustTunnel/TrustTunnel.git synced 2026-07-09 17:18:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

TRUST-582 Fix bench tests PR 6
Some checks failed
Check CHANGELOG and auto-tag / Check CHANGELOG and auto-tag (push) Has been cancelled
Details
Lint Rust / lint (push) Has been cancelled
Details
Mirror to public repository / Mirror to public repository (push) Has been cancelled
Details
Run tests / Linux build (push) Has been cancelled
Details
Run tests / Mac build (push) Has been cancelled
Details
Run tests (public) / Linux (push) Has been cancelled
Details
Run tests (public) / macOS (push) Has been cancelled
Details

Browse source 
* Update verify patch

* Remove parasitic requirements installation for client
This commit is contained in:
Andrei Iakushin 2026-06-26 14:50:13 +04:00 • committed by GitHub
parent 06d7f4cfc9
commit 96df686263
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bench/local-side/trusttunnel/Dockerfile
View file

@ -21,7 +21,6 @@ COPY $CLIENT_DIR /bench/$CLIENT_DIR
WORKDIR /bench/$CLIENT_DIR/build
RUN --mount=type=cache,target=/root/.conan2 \
pipreqs . && \
pip install -r ../scripts/requirements.txt && \
../scripts/bootstrap_conan_deps.py
RUN --mount=type=cache,target=/root/.conan2 \
--mount=type=cache,target=/root/.cargo/registry \

14
bench/local-side/trusttunnel/ssl_verify.patch
View file

@ -1,8 +1,8 @@
diff --git a/core/src/vpn_manager.cpp b/core/src/vpn_manager.cpp
index d596dee..e2b8410 100644
index 6694f6e..6ab4e7e 100644
--- a/core/src/vpn_manager.cpp
+++ b/core/src/vpn_manager.cpp
@@ -711,18 +711,20 @@ static int ssl_verify_callback(
@@ -715,21 +715,23 @@ static int ssl_verify_callback(const char *host_name, const sockaddr *host_ip, c
#endif
}
@ -10,7 +10,10 @@ index d596dee..e2b8410 100644
- && (host_name == nullptr || !tls_verify_cert_host_name(ctx.cert, host_name))
- && (host_ip == nullptr || host_ip->sa_family == AF_UNSPEC
- || !tls_verify_cert_ip(ctx.cert, SocketAddress(host_ip).str().c_str()))) {
- log_vpn(vpn, err, "Server host name or IP doesn't match certificate");
- log_vpn(vpn, warn, "Server host name or IP doesn't match certificate. Expected host: '{}', IP: '{}'",
- host_name ? host_name : "<null>",
- (host_ip && host_ip->sa_family != AF_UNSPEC) ? SocketAddress(host_ip).str().c_str() : "<none>");
- log_vpn(vpn, warn, " {}", ag::tls::get_cert_diagnostic_info(ctx.cert, nullptr));
-#ifdef OPENSSL_IS_BORINGSSL
- if (ctx.ssl) {
- SSL_send_fatal_alert(ctx.ssl, SSL_AD_CERTIFICATE_UNKNOWN);
@ -24,7 +27,10 @@ index d596dee..e2b8410 100644
+// && (host_name == nullptr || !tls_verify_cert_host_name(ctx.cert, host_name))
+// && (host_ip == nullptr || host_ip->sa_family == AF_UNSPEC
+// || !tls_verify_cert_ip(ctx.cert, SocketAddress(host_ip).str().c_str()))) {
+// log_vpn(vpn, err, "Server host name or IP doesn't match certificate");
+// log_vpn(vpn, warn, "Server host name or IP doesn't match certificate. Expected host: '{}', IP: '{}'",
+// host_name ? host_name : "<null>",
+// (host_ip && host_ip->sa_family != AF_UNSPEC) ? SocketAddress(host_ip).str().c_str() : "<none>");
+// log_vpn(vpn, warn, " {}", ag::tls::get_cert_diagnostic_info(ctx.cert, nullptr));
+// #ifdef OPENSSL_IS_BORINGSSL
+// if (ctx.ssl) {
+// SSL_send_fatal_alert(ctx.ssl, SSL_AD_CERTIFICATE_UNKNOWN);