OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6146 from neheb/libshout 

libshout: Fix OpenSSL 1.1.0 without deprecated APIs
This commit is contained in:
Ted Hess 2018-05-30 17:04:42 +00:00 committed by GitHub
parent 4bacddbbed f51d3846d8
commit 9764354572
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/libshout/Makefile
View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libshout PKG_NAME:=libshout
PKG_VERSION:=2.4.1 PKG_VERSION:=2.4.1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

10
libs/libshout/patches/150-openssl-1.1.patch
View File

@ -1,6 +1,8 @@
diff --git a/src/tls.c b/src/tls.c
index 4562c73..f946946 100644
--- a/src/tls.c --- a/src/tls.c
+++ b/src/tls.c +++ b/src/tls.c
@@ -63,10 +63,12 @@ static inline int tls_setup(shout_tls_t @@ -63,12 +63,16 @@ static inline int tls_setup(shout_tls_t *tls)
{ {
SSL_METHOD *meth; SSL_METHOD *meth;
@ -9,7 +11,11 @@
SSL_load_error_strings(); SSL_load_error_strings();
SSLeay_add_all_algorithms(); SSLeay_add_all_algorithms();
SSLeay_add_ssl_algorithms(); SSLeay_add_ssl_algorithms();
+#endif
meth = TLSv1_client_method(); meth = TLSv1_client_method();
+#else
+ meth = TLS_client_method();
+#endif
if (!meth) if (!meth)
goto error;