libwebsockets: Fix build without deprecated OpenSSL APIs

Signed-off-by: Rosen Penev <redacted>

diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile
index 26dc23f54a103ca0e6ef59a71091c8d5f69d65b5..b9fe6dc904c6c7dacd48ee35cb97b669aff2c379 100644 (file)
--- a/libs/libwebsockets/Makefile
+++ b/libs/libwebsockets/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwebsockets
 PKG_VERSION:=3.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

diff --git a/libs/libwebsockets/patches/010-openssl-deprecated.patch b/libs/libwebsockets/patches/010-openssl-deprecated.patch
new file mode 100644 (file)
index 0000000..6d43ece
--- /dev/null
+++ b/libs/libwebsockets/patches/010-openssl-deprecated.patch
@@ -0,0 +1,11 @@
+--- a/lib/tls/private.h
++++ b/lib/tls/private.h
+@@ -64,6 +64,8 @@
+    #include <openssl/err.h>
+    #include <openssl/md5.h>
+    #include <openssl/sha.h>
++   #include <openssl/rsa.h>
++   #include <openssl/bn.h>
+    #ifdef LWS_HAVE_OPENSSL_ECDH_H
+     #include <openssl/ecdh.h>
+    #endif

diff --git a/libs/libwebsockets/patches/020-fix-travis.patch b/libs/libwebsockets/patches/020-fix-travis.patch
index b6e287575c7226b16430a4a61f749d356bd3fb4f..9631e6e1ef1b1e27dfabc477dccfee9f582dc37f 100644 (file)
--- a/libs/libwebsockets/patches/020-fix-travis.patch
+++ b/libs/libwebsockets/patches/020-fix-travis.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index b260969..ece281d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1050,9 +1050,9 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_C_COMPILER_ID
+@@ -1055,9 +1055,9 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_C_COMPILER_ID
      endif()
  
      if (UNIX AND NOT LWS_WITH_ESP32)