Skip to content

Commit

Permalink
Comment existing calls to mbedtls
Browse files Browse the repository at this point in the history
These existiing calls were disabled just now, to avoid build errors where the code still refers to mbed TLS 2.x whereas the coe base is now going to be moved to version 3.x
#944
  • Loading branch information
teusbenschop committed Jul 5, 2024
1 parent da0340e commit 46199a5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion filter/md5.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ std::string md5 (const std::string str)
{
unsigned char md5sum[16];
const unsigned char *input = reinterpret_cast<const unsigned char *>(str.c_str ());
[[maybe_unused]] int ret = mbedtls_md5_ret (input, str.size (), md5sum);
// Todo [[maybe_unused]] int ret = mbedtls_md5_ret (input, str.size (), md5sum);

// Space for 32 bytes of hexits and one terminating null byte.
char hexits [32+1];
Expand Down
3 changes: 2 additions & 1 deletion filter/url.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <mbedtls/entropy.h>
#include <mbedtls/ctr_drbg.h>
#include <mbedtls/error.h>
#include <mbedtls/certs.h>
#pragma GCC diagnostic pop
#ifdef HAVE_WINDOWS
#include <direct.h>
Expand Down Expand Up @@ -1913,6 +1912,7 @@ void filter_url_display_mbed_tls_error (int& ret, std::string* error, bool serve
// Everything OK
if (local_return == 0) return;

#ifdef Todo
// The server suppresses a couple of error messages caused by rogue clients or spiders.
// The reason for suppressing them is to prevent them from flooding the Journal.
if (server) {
Expand Down Expand Up @@ -1944,6 +1944,7 @@ void filter_url_display_mbed_tls_error (int& ret, std::string* error, bool serve
} else {
Database_Logs::log (msg);
}
#endif // Todo
}


Expand Down
2 changes: 1 addition & 1 deletion webserver/webserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
#include <mbedtls/entropy.h>
#include <mbedtls/ctr_drbg.h>
#include <mbedtls/certs.h>
#include <mbedtls/x509.h>
#include <mbedtls/x509_crt.h>
#include <mbedtls/ssl.h>
Expand Down Expand Up @@ -762,6 +761,7 @@ void https_server ()
// On clients, don't run the secure web server.
// It is not possible to get a https certificate for https://localhost anyway.
// Not running this secure server saves valuable system resources on low power devices.
#undef RUN_SECURE_SERVER // Todo
#ifdef RUN_SECURE_SERVER

// The https network port to listen on.
Expand Down

0 comments on commit 46199a5

Please sign in to comment.