Changeset 5076

Timestamp:

Apr 23, 2015 2:42:49 AM (10 years ago)

Author:

ming

Message:

Fixed #1845: Add support if OpenSSL library has more than 100 cipher suites

Location:

pjproject/trunk

Files:

• pjlib/include/pj/config.h (modified) (1 diff)
• pjlib/src/pj/ssl_sock_ossl.c (modified) (4 diffs)
• pjlib/src/pjlib-test/ssl_sock.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app_config.c (modified) (1 diff)
• pjsip/src/pjsua2/endpoint.cpp (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/config.h

@@ -862 +862 @@
 #ifndef PJ_HAS_SSL_SOCK
 #  define PJ_HAS_SSL_SOCK           0
+#endif
+
+
+/**
+ * Define the maximum number of ciphers supported by the secure socket.
+ *
+ * Default: 256
+ */
+#ifndef PJ_SSL_SOCK_MAX_CIPHERS
+#  define PJ_SSL_SOCK_MAX_CIPHERS   256
 #endif
 

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

@@ -40 +40 @@
 #define DELAYED_CLOSE_TIMEOUT   200
 
-/* Maximum ciphers */
-#define MAX_CIPHERS             100
-
 /* 
  * Include OpenSSL headers 
@@ -297 +294 @@
     pj_ssl_cipher    id;
     const char      *name;
-} openssl_ciphers[MAX_CIPHERS];
+} openssl_ciphers[PJ_SSL_SOCK_MAX_CIPHERS];
 
 /* OpenSSL application data index */
@@ -346 +343 @@
 
         ctx=SSL_CTX_new(meth);
-        SSL_CTX_set_cipher_list(ctx, "ALL");
+        SSL_CTX_set_cipher_list(ctx, "ALL:COMPLEMENTOFALL");
 
         ssl = SSL_new(ctx);
@@ -793 +790 @@
 
     /* Set SSL with ALL available ciphers */
-    SSL_set_cipher_list(ssock->ossl_ssl, "ALL");
+    SSL_set_cipher_list(ssock->ossl_ssl, "ALL:COMPLEMENTOFALL");
 
     /* Generate user specified cipher list in OpenSSL format */

pjproject/trunk/pjlib/src/pjlib-test/ssl_sock.c

@@ -41 +41 @@
 static int get_cipher_list(void) {
     pj_status_t status;
-    pj_ssl_cipher ciphers[100];
+    pj_ssl_cipher ciphers[PJ_SSL_SOCK_MAX_CIPHERS];
     unsigned cipher_num;
     unsigned i;

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_config.c

@@ -1217 +1217 @@
 
                 if (pj_ssl_cipher_is_supported(cipher)) {
-                    static pj_ssl_cipher tls_ciphers[128];
+                    static pj_ssl_cipher tls_ciphers[PJ_SSL_SOCK_MAX_CIPHERS];
 
                     tls_ciphers[cfg->udp_cfg.tls_setting.ciphers_num++] = cipher;
                     cfg->udp_cfg.tls_setting.ciphers = tls_ciphers;
                 } else {
-                    pj_ssl_cipher ciphers[128];
+                    pj_ssl_cipher ciphers[512];
                     unsigned j, ciphers_cnt;
 

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -1453 +1453 @@
 {
 #if PJ_HAS_SSL_SOCK
-    pj_ssl_cipher ciphers[64];
+    pj_ssl_cipher ciphers[PJ_SSL_SOCK_MAX_CIPHERS];
     unsigned count = PJ_ARRAY_SIZE(ciphers);