From 5e7f5dd840995fb806433e2eacefce74fb3d92a1 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 14 Mar 2026 16:43:19 -0700 Subject: [PATCH] replay/cabana: remove unused openssl dependency (#37680) --- SConstruct | 2 +- tools/cabana/SConscript | 2 +- tools/replay/SConscript | 2 +- tools/replay/util.cc | 10 ---------- tools/replay/util.h | 1 - 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/SConstruct b/SConstruct index e649a6be1..9d3dc8526 100644 --- a/SConstruct +++ b/SConstruct @@ -48,7 +48,7 @@ pkgs = [importlib.import_module(name) for name in pkg_names] # vendored in commaai/dependencies. allowed_system_libs = { "EGL", "GLESv2", "GL", "Qt5Charts", "Qt5Core", "Qt5Gui", "Qt5Widgets", - "crypto", "dl", "drm", "gbm", "m", "pthread", "ssl", "usb-1.0", + "dl", "drm", "gbm", "m", "pthread", "usb-1.0", } def _resolve_lib(env, name): diff --git a/tools/cabana/SConscript b/tools/cabana/SConscript index ad77231ea..d604fe67e 100644 --- a/tools/cabana/SConscript +++ b/tools/cabana/SConscript @@ -64,7 +64,7 @@ qt_env['LIBPATH'] += ['#selfdrive/ui', ] qt_env['LIBS'] = qt_libs base_frameworks = qt_env['FRAMEWORKS'] -base_libs = [common, messaging, cereal, visionipc, 'm', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"] +base_libs = [common, messaging, cereal, visionipc, 'm', 'pthread'] + qt_env["LIBS"] if arch == "Darwin": base_frameworks.append('QtCharts') diff --git a/tools/replay/SConscript b/tools/replay/SConscript index 3efa970b3..757f3fec4 100644 --- a/tools/replay/SConscript +++ b/tools/replay/SConscript @@ -4,7 +4,7 @@ replay_env = env.Clone() replay_env['CCFLAGS'] += ['-Wno-deprecated-declarations'] base_frameworks = [] -base_libs = [common, messaging, cereal, visionipc, 'm', 'ssl', 'crypto', 'pthread'] +base_libs = [common, messaging, cereal, visionipc, 'm', 'pthread'] replay_lib_src = ["replay.cc", "consoleui.cc", "camera.cc", "filereader.cc", "logreader.cc", "framereader.cc", "route.cc", "util.cc", "seg_mgr.cc", "timeline.cc", "py_downloader.cc"] diff --git a/tools/replay/util.cc b/tools/replay/util.cc index 7294de828..7b308b5c3 100644 --- a/tools/replay/util.cc +++ b/tools/replay/util.cc @@ -1,7 +1,6 @@ #include "tools/replay/util.h" #include -#include #include #include @@ -162,15 +161,6 @@ void precise_nano_sleep(int64_t nanoseconds, std::atomic &interrupt_reques } } -std::string sha256(const std::string &str) { - unsigned char hash[SHA256_DIGEST_LENGTH]; - SHA256_CTX sha256; - SHA256_Init(&sha256); - SHA256_Update(&sha256, str.c_str(), str.size()); - SHA256_Final(hash, &sha256); - return util::hexdump(hash, SHA256_DIGEST_LENGTH); -} - std::vector split(std::string_view source, char delimiter) { std::vector fields; size_t last = 0; diff --git a/tools/replay/util.h b/tools/replay/util.h index ee9219033..a2d0f6203 100644 --- a/tools/replay/util.h +++ b/tools/replay/util.h @@ -46,7 +46,6 @@ private: static constexpr float growth_factor = 1.5; }; -std::string sha256(const std::string &str); void precise_nano_sleep(int64_t nanoseconds, std::atomic &interrupt_requested); std::string decompressBZ2(const std::string &in, std::atomic *abort = nullptr); std::string decompressBZ2(const std::byte *in, size_t in_size, std::atomic *abort = nullptr);