Changeset 3999 for pjproject/trunk/pjsip/include/pjsip/sip_transport_tls.h

Timestamp:

Mar 30, 2012 7:10:13 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/include/pjsip/sip_transport_tls.h (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_transport_tls.h

@@ -27 +27 @@
 
 #include <pjsip/sip_transport.h>
+#include <pj/pool.h>
 #include <pj/ssl_sock.h>
 #include <pj/string.h>
@@ -107 +108 @@
 
     /**
-     * TLS cipher list string in OpenSSL format. If empty, then default
-     * cipher list of the backend will be used.
-     */
-    pj_str_t    ciphers;
-
-    /**
-     * Optionally specify the server name instance to be contacted when
-     * making outgoing TLS connection. This setting is useful when the
-     * server is hosting multiple domains for the same TLS listening
-     * socket.
-     *
-     * Default: empty.
-     */
-    pj_str_t    server_name;
+     * Number of ciphers contained in the specified cipher preference. 
+     * If this is set to zero, then default cipher list of the backend 
+     * will be used.
+     *
+     * Default: 0 (zero).
+     */
+    unsigned ciphers_num;
+
+    /**
+     * Ciphers and order preference. The #pj_ssl_cipher_get_availables()
+     * can be used to check the available ciphers supported by backend.
+     */
+    pj_ssl_cipher *ciphers;
 
     /**
@@ -247 +247 @@
     pj_strdup_with_null(pool, &dst->privkey_file, &src->privkey_file);
     pj_strdup_with_null(pool, &dst->password, &src->password);
-    pj_strdup_with_null(pool, &dst->ciphers, &src->ciphers);
+    if (src->ciphers_num) {
+        unsigned i;
+        dst->ciphers = (pj_ssl_cipher*) pj_pool_calloc(pool, src->ciphers_num,
+                                                       sizeof(pj_ssl_cipher));
+        for (i=0; i<src->ciphers_num; ++i)
+            dst->ciphers[i] = src->ciphers[i];
+    }
 }