<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8907">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Corey Farrell: Looks good to me, but someone else must approve
  Richard Mudgett: 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;">pjsip: Increase maximum number of usable ciphers & other cleanups<br><br>* Increase maximum number of ciphers from 100 to 256 (or whatever<br>  PJ_SSL_SOCK_MAX_CIPHERS is #define'd to)<br><br>* Simplify logic in cipher_name_to_id()<br><br>* Make signed/unsigned comparison consistent<br><br>Re: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=897412<br><br>Reported by: Ondřej Holas<br><br>Change-Id: Iea620f03915a1b873e79743154255c3148a514e7<br>---<br>M res/res_pjsip/config_transport.c<br>1 file changed, 8 insertions(+), 13 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 959fb19..55ef3c5 100644<br>--- a/res/res_pjsip/config_transport.c<br>+++ b/res/res_pjsip/config_transport.c<br>@@ -976,27 +976,22 @@<br> /*! \brief Helper function which turns a cipher name into an identifier */<br> static pj_ssl_cipher cipher_name_to_id(const char *name)<br> {<br>-     pj_ssl_cipher ciphers[100];<br>-  pj_ssl_cipher id = 0;<br>+        pj_ssl_cipher ciphers[PJ_SSL_SOCK_MAX_CIPHERS];<br>       unsigned int cipher_num = PJ_ARRAY_SIZE(ciphers);<br>-    int pos;<br>-     const char *pos_name;<br>+        unsigned int pos;<br> <br>  if (pj_ssl_cipher_get_availables(ciphers, &cipher_num)) {<br>                 return 0;<br>     }<br> <br>  for (pos = 0; pos < cipher_num; ++pos) {<br>-          pos_name = pj_ssl_cipher_name(ciphers[pos]);<br>-         if (!pos_name || strcmp(pos_name, name)) {<br>-                   continue;<br>+            const char *pos_name = pj_ssl_cipher_name(ciphers[pos]);<br>+             if (pos_name && !strcmp(pos_name, name)) {<br>+                   return ciphers[pos];<br>          }<br>-<br>-         id = ciphers[pos];<br>-           break;<br>        }<br> <br>- return id;<br>+   return 0;<br> }<br> <br> /*!<br>@@ -1071,7 +1066,7 @@<br> static void cipher_to_str(char **buf, const pj_ssl_cipher *ciphers, unsigned int cipher_num)<br> {<br>      struct ast_str *str;<br>- int idx;<br>+     unsigned int idx;<br> <br>  str = ast_str_create(128);<br>    if (!str) {<br>@@ -1105,7 +1100,7 @@<br> <br> static char *handle_pjsip_list_ciphers(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)<br> {<br>- pj_ssl_cipher ciphers[100];<br>+  pj_ssl_cipher ciphers[PJ_SSL_SOCK_MAX_CIPHERS];<br>       unsigned int cipher_num = PJ_ARRAY_SIZE(ciphers);<br>     char *buf;<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8907">change 8907</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/8907"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iea620f03915a1b873e79743154255c3148a514e7 </div>
<div style="display:none"> Gerrit-Change-Number: 8907 </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: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>