Merge branch 'master' into turnbis

ChangeLog

@@ -1,3 +1,8 @@
+10/11/2015 Oleg Moskalenko <[email protected]>
+Version 4.5.0.3 'dan Eider':
+	- Compatibility with OpenSSL that does not
+	support SSLv3 (like LibreSSL 2.3.0).
+
 9/29/2015 Oleg Moskalenko <[email protected]>
 Version 4.5.0.2 'dan Eider':
 	- DTLS segmentation fault fixed;

rpm/build.settings.sh

@@ -2,7 +2,7 @@
 
 # Common settings script.
 
-TURNVERSION=4.5.0.2
+TURNVERSION=4.5.0.3
 BUILDDIR=~/rpmbuild
 ARCH=`uname -p`
 TURNSERVER_GIT_URL=https://github.com/coturn/coturn.git

rpm/turnserver.spec

@@ -1,5 +1,5 @@
 Name:		turnserver
-Version:	4.5.0.2
+Version:	4.5.0.3
 Release:	0%{dist}
 Summary:	Coturn TURN Server
 
@@ -289,6 +289,8 @@ fi
 %{_includedir}/turn/client/TurnMsgLib.h
 
 %changelog
+* Sun Oct 11 2015 Oleg Moskalenko <[email protected]>
+  - Sync to 4.5.0.3
 * Tue Sep 29 2015 Oleg Moskalenko <[email protected]>
   - Sync to 4.5.0.2
 * Sun Sep 13 2015 Oleg Moskalenko <[email protected]>

src/apps/common/apputils.c

@@ -1037,12 +1037,14 @@ static const char* turn_get_method(const SSL_METHOD *method, const char* mdefaul
 		if(!method)
 			return mdefault;
 		else {
-
+#ifndef OPENSSL_NO_SSL3
 			if(method == SSLv3_server_method()) {
 				return "SSLv3";
 			} else if(method == SSLv3_client_method()) {
 				return "SSLv3";
-			} else if(method == SSLv23_server_method()) {
+			} else
+#endif
+			if(method == SSLv23_server_method()) {
 					return "SSLv23";
 			} else if(method == SSLv23_client_method()) {
 					return "SSLv23";

src/apps/uclient/mainuclient.c

@@ -483,9 +483,11 @@ int main(int argc, char **argv)
 		  root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv23_client_method());
 		  SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite);
 		  root_tls_ctx_num++;
+#ifndef OPENSSL_NO_SSL3
 		  root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv3_client_method());
 		  SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite);
 		  root_tls_ctx_num++;
+#endif
 		  root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(TLSv1_client_method());
 		  SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite);
 		  root_tls_ctx_num++;

src/ns_turn_defs.h

@@ -31,7 +31,7 @@
 #ifndef __IOADEFS__
 #define __IOADEFS__
 
-#define TURN_SERVER_VERSION "4.5.0.2"
+#define TURN_SERVER_VERSION "4.5.0.3"
 #define TURN_SERVER_VERSION_NAME "dan Eider"
 #define TURN_SOFTWARE "Coturn-" TURN_SERVER_VERSION " '" TURN_SERVER_VERSION_NAME "'"