Changeset 1799

Timestamp:

Feb 15, 2008 8:08:06 AM (17 years ago)

Author:

bennylp

Message:

Ticket #481: Default TLS version should be TLSv1 (thanks Klaus Darilion)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transport_tls.h (modified) (2 diffs)
• src/pjsip/sip_transport_tls_ossl.c (modified) (2 diffs)

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

@@ -40 +40 @@
  */
 
+/**
+ * The default SSL method to be used by PJSIP.
+ * Default is PJSIP_TLSV1_METHOD
+ */
+#ifndef PJSIP_SSL_DEFAULT_METHOD
+#   define PJSIP_SSL_DEFAULT_METHOD     PJSIP_TLSV1_METHOD
+#endif
+
 /** SSL protocol method constants. */
 typedef enum pjsip_ssl_method
 {
-    PJSIP_SSL_DEFAULT_METHOD    = 0,    /**< Default protocol method.   */
-    PJSIP_TLSV1_METHOD          = 1,    /**< Use SSLv1 method.          */
-    PJSIP_SSLV2_METHOD          = 2,    /**< Use SSLv2 method.          */
-    PJSIP_SSLV3_METHOD          = 3,    /**< Use SSLv3 method.          */
+    PJSIP_SSL_UNSPECIFIED_METHOD= 0,    /**< Default protocol method.   */
+    PJSIP_TLSV1_METHOD          = 31,   /**< Use SSLv1 method.          */
+    PJSIP_SSLV2_METHOD          = 20,   /**< Use SSLv2 method.          */
+    PJSIP_SSLV3_METHOD          = 30,   /**< Use SSLv3 method.          */
     PJSIP_SSLV23_METHOD         = 23    /**< Use SSLv23 method.         */
 } pjsip_ssl_method;
+
+
 
 
@@ -80 +90 @@
     /**
      * TLS protocol method from #pjsip_ssl_method, which can be:
-     *  - PJSIP_SSL_DEFAULT_METHOD(0):  default (which will use SSLv23)
-     *  - PJSIP_TLSV1_METHOD(1):        TLSv1
-     *  - PJSIP_SSLV2_METHOD(2):        TLSv2
-     *  - PJSIP_SSLV3_METHOD(3):        TLSv3
-     *  - PJSIP_SSLV23_METHOD(23):      TLSv23
-     *
-     * Default is PJSIP_SSL_DEFAULT_METHOD (0), which will use SSLv23
-     * protocol method.
+     *  - PJSIP_SSL_UNSPECIFIED_METHOD(0): default (which will use 
+     *                                     PJSIP_SSL_DEFAULT_METHOD)
+     *  - PJSIP_TLSV1_METHOD(1):           TLSv1
+     *  - PJSIP_SSLV2_METHOD(2):           SSLv2
+     *  - PJSIP_SSLV3_METHOD(3):           SSL3
+     *  - PJSIP_SSLV23_METHOD(23):         SSL23
+     *
+     * Default is PJSIP_SSL_UNSPECIFIED_METHOD (0), which in turn will
+     * use PJSIP_SSL_DEFAULT_METHOD, which default value is 
+     * PJSIP_TLSV1_METHOD.
      */
     int         method;

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls_ossl.c

@@ -316 +316 @@
 {
     struct pjsip_tls_setting *opt = &lis->setting;
+    int method;
     char *lis_name = lis->factory.obj_name;
     SSL_METHOD *ssl_method;
@@ -327 +328 @@
 
     /* Determine SSL method to use */
-    switch (opt->method) {
-    case PJSIP_SSL_DEFAULT_METHOD:
+    method = opt->method;
+    if (method == PJSIP_SSL_UNSPECIFIED_METHOD)
+        method = PJSIP_SSL_DEFAULT_METHOD;
+
+    switch (method) {
     case PJSIP_SSLV23_METHOD:
         ssl_method = SSLv23_method();