dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibTLS: Remove key-logging debug feature

Browse source 
This attempted to save data into /home/anon even on Linux
This commit is contained in:
circl 2024-06-23 17:38:00 +02:00 committed by Andrew Kaster
parent f03e6fddf1
commit 9f7f6aa80c
5 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AK/Debug.h.in
View file

@ -242,10 +242,6 @@
# cmakedefine01 TLS_DEBUG
#endif
#ifndef TLS_SSL_KEYLOG_DEBUG
# cmakedefine01 TLS_SSL_KEYLOG_DEBUG
#endif
#ifndef TOKENIZER_TRACE_DEBUG
# cmakedefine01 TOKENIZER_TRACE_DEBUG
#endif

1
Meta/CMake/all_the_debug_macros.cmake
View file

@ -56,7 +56,6 @@ set(TEXTEDITOR_DEBUG ON)
set(TIFF_DEBUG ON)
set(TIME_ZONE_DEBUG ON)
set(TLS_DEBUG ON)
set(TLS_SSL_KEYLOG_DEBUG ON)
set(TOKENIZER_TRACE_DEBUG ON)
set(URL_PARSER_DEBUG ON)
set(UTF8_DEBUG ON)

1
Meta/gn/secondary/AK/BUILD.gn
View file

@ -268,7 +268,6 @@ write_cmake_config("ak_debug_gen") {
"TIFF_DEBUG=",
"TIME_ZONE_DEBUG=",
"TLS_DEBUG=",
"TLS_SSL_KEYLOG_DEBUG=",
"TOKENIZER_TRACE_DEBUG=",
"URL_PARSER_DEBUG=",
"UTF8_DEBUG=",

9
Userland/Libraries/LibTLS/HandshakeClient.cpp
View file

@ -151,15 +151,6 @@ bool TLSv12::compute_master_secret_from_pre_master_secret(size_t length)
print_buffer(m_context.master_key);
}
if constexpr (TLS_SSL_KEYLOG_DEBUG) {
auto file = MUST(Core::File::open("/home/anon/ssl_keylog"sv, Core::File::OpenMode::Append | Core::File::OpenMode::Write));
MUST(file->write_until_depleted("CLIENT_RANDOM "sv));
MUST(file->write_until_depleted(encode_hex({ m_context.local_random, 32 })));
MUST(file->write_until_depleted(" "sv));
MUST(file->write_until_depleted(encode_hex(m_context.master_key)));
MUST(file->write_until_depleted("\n"sv));
}
expand_key();
return true;
}

12
Userland/Services/RequestServer/main.cpp
View file

@ -18,19 +18,13 @@
ErrorOr<int> serenity_main(Main::Arguments)
{
if constexpr (TLS_SSL_KEYLOG_DEBUG)
TRY(Core::System::pledge("stdio inet accept thread unix cpath wpath rpath sendfd recvfd sigaction"));
else
TRY(Core::System::pledge("stdio inet accept thread unix rpath sendfd recvfd sigaction"));
TRY(Core::System::pledge("stdio inet accept thread unix rpath sendfd recvfd sigaction"));
#ifdef SIGINFO
signal(SIGINFO, [](int) { RequestServer::ConnectionCache::dump_jobs(); });
#endif
if constexpr (TLS_SSL_KEYLOG_DEBUG)
TRY(Core::System::pledge("stdio inet accept thread unix cpath wpath rpath sendfd recvfd"));
else
TRY(Core::System::pledge("stdio inet accept thread unix rpath sendfd recvfd"));
TRY(Core::System::pledge("stdio inet accept thread unix rpath sendfd recvfd"));
// Ensure the certificates are read out here.
// FIXME: Allow specifying extra certificates on the command line, or in other configuration.
@ -41,8 +35,6 @@ ErrorOr<int> serenity_main(Main::Arguments)
TRY(Core::System::unveil("/tmp/portal/lookup", "rw"));
TRY(Core::System::unveil("/etc/cacert.pem", "rw"));
TRY(Core::System::unveil("/etc/timezone", "r"));
if constexpr (TLS_SSL_KEYLOG_DEBUG)
TRY(Core::System::unveil("/home/anon", "rwc"));
TRY(Core::System::unveil(nullptr, nullptr));
RequestServer::HttpProtocol::install();