diff --git a/contrib/src/pjproject/gnutls.patch b/contrib/src/pjproject/gnutls.patch index 778baf59d7ee7564a4e02fe56511e310a785ecd2..4d2123a8aa28715f8d20a87066c01275a0ac1702 100644 --- a/contrib/src/pjproject/gnutls.patch +++ b/contrib/src/pjproject/gnutls.patch @@ -460,7 +460,7 @@ new file mode 100644 index 0000000..6864740 --- /dev/null +++ b/pjlib/src/pj/ssl_sock_gtls.c -@@ -0,0 +1,2869 @@ +@@ -0,0 +1,2865 @@ +/* $Id$ */ +/* + * Copyright (C) 2014-2015 Savoir-faire Linux. (http://www.savoirfairelinux.com) @@ -1155,11 +1155,7 @@ index 0000000..6864740 + if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1) { + pj_strcat2(&priority, "+VERS-TLS1.0:"); + } -+ if (ssock->param.proto & PJ_SSL_SOCK_PROTO_SSL3) { -+ pj_strcat2(&priority, "+VERS-SSL3.0:"); -+ } else { -+ pj_strcat2(&priority, "-VERS-SSL3.0:"); -+ } ++ pj_strcat2(&priority, "-VERS-SSL3.0:"); + pj_strcat2(&priority, "%LATEST_RECORD_VERSION"); + + pj_strcat(&cipher_list, &priority); diff --git a/src/sip/sipaccount.cpp b/src/sip/sipaccount.cpp index 712480e259b500f539a927822416a37d4b9965e0..85e6ad1aff117d24f5543095db47086ceea1f069 100644 --- a/src/sip/sipaccount.cpp +++ b/src/sip/sipaccount.cpp @@ -86,7 +86,7 @@ static constexpr int MIN_REGISTRATION_TIME = 60; // seconds static constexpr unsigned DEFAULT_REGISTRATION_TIME = 3600; // seconds static constexpr unsigned REGISTRATION_FIRST_RETRY_INTERVAL = 60; // seconds static constexpr unsigned REGISTRATION_RETRY_INTERVAL = 300; // seconds -static const char *const VALID_TLS_PROTOS[] = {"Default", "TLSv1.2", "TLSv1.1", "TLSv1", "SSLv3"}; +static const char *const VALID_TLS_PROTOS[] = {"Default", "TLSv1.2", "TLSv1.1", "TLSv1"}; constexpr const char * const SIPAccount::ACCOUNT_TYPE; @@ -1144,8 +1144,6 @@ SIPAccount::tlsProtocolFromString(const std::string& method) return PJ_SSL_SOCK_PROTO_TLS1_2 | PJ_SSL_SOCK_PROTO_TLS1_1; if (method == "TLSv1") return PJ_SSL_SOCK_PROTO_TLS1_2 | PJ_SSL_SOCK_PROTO_TLS1_1 | PJ_SSL_SOCK_PROTO_TLS1; - if (method == "SSLv3") - return PJ_SSL_SOCK_PROTO_SSL3; return PJSIP_SSL_DEFAULT_PROTO; }