Changeset 5285

Timestamp:

May 10, 2016 6:32:30 AM (8 years ago)

Author:

riza

Message:

Misc (re #1882): Fixed buffer size not sufficient when setting cipher list.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -838 +838 @@
 static pj_status_t set_cipher_list(pj_ssl_sock_t *ssock)
 {
-    char buf[1024];
+    pj_pool_t *tmp_pool = NULL;
+    char *buf = NULL;
+    enum { BUF_SIZE = 8192 };
     pj_str_t cipher_list;
     STACK_OF(SSL_CIPHER) *sk_cipher;
@@ -852 +854 @@
         return PJ_SUCCESS;
     }
+
+    /* Create temporary pool. */
+    tmp_pool = pj_pool_create(ssock->pool->factory, "ciphpool", BUF_SIZE, 
+                              BUF_SIZE/2 , NULL);
+    if (!tmp_pool)
+        return PJ_ENOMEM;
+
+    buf = (char *)pj_pool_zalloc(tmp_pool, BUF_SIZE);
 
     pj_strset(&cipher_list, buf, 0);
@@ -873 +883 @@
                 /* Check buffer size */
                 if (cipher_list.slen + pj_ansi_strlen(c_name) + 2 >
-                    sizeof(buf))
+                    BUF_SIZE)
                 {
                     pj_assert(!"Insufficient temporary buffer for cipher");
@@ -896 +906 @@
     ret = SSL_set_cipher_list(ssock->ossl_ssl, buf);
     if (ret < 1) {
+        pj_pool_release(tmp_pool);
         return GET_SSL_STATUS(ssock);
     }
 
+    pj_pool_release(tmp_pool);
     return PJ_SUCCESS;
 }