Changeset 4968 for pjproject/trunk/pjlib/include/pj/ssl_sock.h

Timestamp:

Dec 18, 2014 4:40:35 AM (9 years ago)

Author:

riza

Message:

Re #1806: Implement SSL/TLS setting to set protocol operation.

File:

• pjproject/trunk/pjlib/include/pj/ssl_sock.h (modified) (3 diffs)

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

@@ -488 +488 @@
 /** 
  * Enumeration of secure socket protocol types.
+ * This can be combined using bitwise OR operation.
  */
 typedef enum pj_ssl_sock_proto
 {
-    PJ_SSL_SOCK_PROTO_DEFAULT,      /**< Default protocol of backend.   */
-    PJ_SSL_SOCK_PROTO_TLS1,         /**< TLSv1.0 protocol.              */
-    PJ_SSL_SOCK_PROTO_SSL3,         /**< SSLv3.0 protocol.              */
-    PJ_SSL_SOCK_PROTO_SSL23,        /**< SSLv3.0 but can roll back to 
-                                         SSLv2.0.                       */
-    PJ_SSL_SOCK_PROTO_SSL2,         /**< SSLv2.0 protocol.              */
-    PJ_SSL_SOCK_PROTO_DTLS1         /**< DTLSv1.0 protocol.             */
+    /**
+     * Default protocol of backend. 
+     */   
+    PJ_SSL_SOCK_PROTO_DEFAULT = 0,
+
+    /** 
+     * SSLv2.0 protocol.          
+     */
+    PJ_SSL_SOCK_PROTO_SSL2    = (1 << 0),
+
+    /** 
+     * SSLv3.0 protocol.          
+     */
+    PJ_SSL_SOCK_PROTO_SSL3    = (1 << 1),
+
+    /**
+     * TLSv1.0 protocol.          
+     */
+    PJ_SSL_SOCK_PROTO_TLS1    = (1 << 2),
+
+    /** 
+     * TLSv1.1 protocol.
+     */
+    PJ_SSL_SOCK_PROTO_TLS1_1  = (1 << 3),
+
+    /**
+     * TLSv1.2 protocol.
+     */
+    PJ_SSL_SOCK_PROTO_TLS1_2  = (1 << 4),
+
+    /** 
+     * Certain backend implementation e.g:OpenSSL, has feature to enable all
+     * protocol. 
+     */
+    PJ_SSL_SOCK_PROTO_SSL23   = (1 << 16) - 1,
+
+    /**
+     * DTLSv1.0 protocol.         
+     */
+    PJ_SSL_SOCK_PROTO_DTLS1   = (1 << 16),
+
 } pj_ssl_sock_proto;
 
@@ -513 +548 @@
 
     /**
-     * Describes secure socket protocol being used.
-     */
-    pj_ssl_sock_proto proto;
+     * Describes secure socket protocol being used, see #pj_ssl_sock_proto. 
+     * Use bitwise OR operation to combine the protocol type.
+     */
+    pj_uint32_t proto;
 
     /**
@@ -615 +651 @@
 
     /**
-     * Specify security protocol to use, see #pj_ssl_sock_proto.
+     * Specify security protocol to use, see #pj_ssl_sock_proto. Use bitwise OR 
+     * operation to combine the protocol type.
      *
      * Default is PJ_SSL_SOCK_PROTO_DEFAULT.
      */
-    pj_ssl_sock_proto proto;
+    pj_uint32_t proto;
 
     /**