summaryrefslogtreecommitdiff
path: root/res/res_pjsip
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-05-13 17:57:52 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-05-13 17:57:52 -0500
commitc735ce1a0527310a51ec39b410cbc27ea1563818 (patch)
tree9b6ea4b89346cef21adb14ed1ed9bad39766d1c1 /res/res_pjsip
parent1705c5d2ba8bfbb96e260a26a4d412bb16c60d9d (diff)
parentfb6227a37289e51931574ba33dd836e10ea5e5c7 (diff)
Merge "config_transport: Tell pjproject to allow all SSL/TLS protocols" into 13
Diffstat (limited to 'res/res_pjsip')
-rw-r--r--res/res_pjsip/config_transport.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c
index d2c087487..3a5afb6bc 100644
--- a/res/res_pjsip/config_transport.c
+++ b/res/res_pjsip/config_transport.c
@@ -378,6 +378,10 @@ static struct ast_sip_transport_state *find_or_create_temporary_state(struct ast
new_state->type = transport->type;
pjsip_tls_setting_default(&new_state->tls);
+#ifdef HAVE_PJSIP_TLS_TRANSPORT_PROTO
+ /* proto must be forced to 0 to enable all protocols otherwise only TLS will work */
+ new_state->tls.proto = 0;
+#endif
new_state->tls.ciphers = new_state->ciphers;
ao2_ref(new_state, +1);