You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

24 lines
945 B

  1. From 87749eb9b74d82dced807cc16fb011d4e3fb052d Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Sat, 13 Jul 2019 17:28:06 -0700
  4. Subject: [PATCH] WebServerHelper: Fix compilation - deprecated APIs
  5. OpenSSL has initialization deprecated.
  6. ---
  7. main/WebServerHelper.cpp | 2 ++
  8. 1 file changed, 2 insertions(+)
  9. diff --git a/main/WebServerHelper.cpp b/main/WebServerHelper.cpp
  10. index 98ebcf7b4..0a028595c 100644
  11. --- a/main/WebServerHelper.cpp
  12. +++ b/main/WebServerHelper.cpp
  13. @@ -37,7 +37,9 @@ namespace http {
  14. our_listener_port = web_settings.listening_port;
  15. #ifdef WWW_ENABLE_SSL
  16. if (secure_web_settings.is_enabled()) {
  17. +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
  18. SSL_library_init();
  19. +#endif
  20. secureServer_.reset(new CWebServer());
  21. bRet |= secureServer_->StartServer(secure_web_settings, serverpath, bIgnoreUsernamePassword);
  22. serverCollection.push_back(secureServer_);