<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7525">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip: Add TLSv1.1 and TLSv1.2 support<br><br>Support for these protocols was added in the same commit as the 'proto'<br>field, so we can safely use the same ./configure check.<br><br>For reference: https://trac.pjsip.org/repos/changeset/4968<br><br>Change-Id: Icf4975d785d6bfb8f30ac7ffa695a0adf9382dac<br>---<br>M res/res_pjsip/config_transport.c<br>1 file changed, 10 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c<br>index 2f29456..a9a90ac 100644<br>--- a/res/res_pjsip/config_transport.c<br>+++ b/res/res_pjsip/config_transport.c<br>@@ -917,6 +917,12 @@<br>          state->tls.method = PJSIP_SSL_UNSPECIFIED_METHOD;<br>  } else if (!strcasecmp(var->value, "tlsv1")) {<br>           state->tls.method = PJSIP_TLSV1_METHOD;<br>+#ifdef HAVE_PJSIP_TLS_TRANSPORT_PROTO<br>+   } else if (!strcasecmp(var->value, "tlsv1_1")) {<br>+                state->tls.method = PJSIP_TLSV1_1_METHOD;<br>+ } else if (!strcasecmp(var->value, "tlsv1_2")) {<br>+                state->tls.method = PJSIP_TLSV1_2_METHOD;<br>+#endif<br>         } else if (!strcasecmp(var->value, "sslv2")) {<br>           state->tls.method = PJSIP_SSLV2_METHOD;<br>    } else if (!strcasecmp(var->value, "sslv3")) {<br>@@ -933,6 +939,10 @@<br> static const char *tls_method_map[] = {<br>   [PJSIP_SSL_UNSPECIFIED_METHOD] = "unspecified",<br>     [PJSIP_TLSV1_METHOD] = "tlsv1",<br>+#ifdef HAVE_PJSIP_TLS_TRANSPORT_PROTO<br>+    [PJSIP_TLSV1_1_METHOD] = "tlsv1_1",<br>+        [PJSIP_TLSV1_2_METHOD] = "tlsv1_2",<br>+#endif<br>        [PJSIP_SSLV2_METHOD] = "sslv2",<br>     [PJSIP_SSLV3_METHOD] = "sslv3",<br>     [PJSIP_SSLV23_METHOD] = "sslv23",<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7525">change 7525</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7525"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Icf4975d785d6bfb8f30ac7ffa695a0adf9382dac </div>
<div style="display:none"> Gerrit-Change-Number: 7525 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>