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

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

File:

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

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 */