diff --git a/rpm/build.settings.sh b/rpm/build.settings.sh index dea4584..cddc93e 100755 --- a/rpm/build.settings.sh +++ b/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 diff --git a/rpm/turnserver.spec b/rpm/turnserver.spec index d1007bb..2082984 100644 --- a/rpm/turnserver.spec +++ b/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 + - Sync to 4.5.0.3 * Tue Sep 29 2015 Oleg Moskalenko - Sync to 4.5.0.2 * Sun Sep 13 2015 Oleg Moskalenko diff --git a/src/apps/common/apputils.c b/src/apps/common/apputils.c index 9b91d89..b3cc386 100644 --- a/src/apps/common/apputils.c +++ b/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"; diff --git a/src/apps/uclient/mainuclient.c b/src/apps/uclient/mainuclient.c index 39bc96d..8ac09be 100644 --- a/src/apps/uclient/mainuclient.c +++ b/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++; diff --git a/src/ns_turn_defs.h b/src/ns_turn_defs.h index 3f1ad14..864e464 100644 --- a/src/ns_turn_defs.h +++ b/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 "'"