Changeset 5078 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Apr 23, 2015 10:18:52 AM (9 years ago)

Author:

ming

Message:

Fixed #1846: Update to use 'HIGH' ciphers as default in OpenSSL

File:

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

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

@@ -784 +784 @@
     int j, ret;
 
-    if (ssock->param.ciphers_num == 0)
+    if (ssock->param.ciphers_num == 0) {
+        ret = SSL_set_cipher_list(ssock->ossl_ssl, PJ_SSL_SOCK_OSSL_CIPHERS);
+        if (ret < 1) {
+            return GET_SSL_STATUS(ssock);
+        }    
+        
         return PJ_SUCCESS;
+    }
 
     pj_strset(&cipher_list, buf, 0);
@@ -806 +812 @@
 
                 /* Check buffer size */
-                if (cipher_list.slen + pj_ansi_strlen(c_name) + 2 > sizeof(buf)) {
+                if (cipher_list.slen + pj_ansi_strlen(c_name) + 2 >
+                    sizeof(buf))
+                {
                     pj_assert(!"Insufficient temporary buffer for cipher");
                     return PJ_ETOOMANY;