mawei/lukasloetkolben
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

replay/cabana: remove unused openssl dependency (#37680)

Browse Source
This commit is contained in:
Adeeb Shihadeh
2026-03-14 16:43:19 -07:00
committed by GitHub
parent cc4f786846
commit 5e7f5dd840
5 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@@ -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):

2
tools/cabana/SConscript
View File

@@ -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')

2
tools/replay/SConscript
View File

@@ -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"]

10
tools/replay/util.cc
View File

@@ -1,7 +1,6 @@
#include "tools/replay/util.h"
#include <bzlib.h>
#include <openssl/sha.h>
#include <cassert>
#include <cstdarg>
@@ -162,15 +161,6 @@ void precise_nano_sleep(int64_t nanoseconds, std::atomic<bool> &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<std::string> split(std::string_view source, char delimiter) {
std::vector<std::string> fields;
size_t last = 0;

1
tools/replay/util.h
View File

@@ -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<bool> &interrupt_requested);
std::string decompressBZ2(const std::string &in, std::atomic<bool> *abort = nullptr);
std::string decompressBZ2(const std::byte *in, size_t in_size, std::atomic<bool> *abort = nullptr);