Changeset 2990

Timestamp:

Nov 6, 2009 1:31:37 PM (14 years ago)

Author:

nanang

Message:

Ticket #957:

• Updated Symbian PJLIB test build setting to enable SSL sock test.
• Fixed ciphers enumeration in Symbian SSL sock.
• Fixed OpenSSL SSL sock to avoid initializing OpenSSL multiple times.
• Fixed SSL unit test to avoid divide-by-zero in setting random seed.

Location:

pjproject/trunk

Files:

• build.symbian/pjlib_test.mmp (modified) (3 diffs)
• pjlib/src/pj/ssl_sock_ossl.c (modified) (3 diffs)
• pjlib/src/pj/ssl_sock_symbian.cpp (modified) (1 diff)
• pjlib/src/pjlib-test/ssl_sock.c (modified) (2 diffs)

pjproject/trunk/build.symbian/pjlib_test.mmp

@@ -47 +47 @@
 SOURCE  sock.c
 SOURCE  sock_perf.c
+SOURCE  ssl_sock.c
 SOURCE  string.c
 SOURCE  test_wrap.cpp
@@ -69 +70 @@
 SYSTEMINCLUDE   \epoc32\include\libc
 
-LIBRARY         esock.lib insock.lib charconv.lib euser.lib estlib.lib 
+LIBRARY         esock.lib insock.lib charconv.lib euser.lib estlib.lib securesocket.lib 
 #ifdef WINSCW
 STATICLIBRARY   eexe.lib ecrt0.lib
@@ -77 +78 @@
 EPOCSTACKSIZE           32768
 
+CAPABILITY      NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment

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

@@ -249 +249 @@
     errstr.ptr = buf;
     errstr.slen = pj_ansi_snprintf(buf, bufsize, 
-                                   "Unknown OpenSSL error %d",
+                                   "Unknown OpenSSL error %ul",
                                    ssl_err);
 
@@ -268 +268 @@
 static pj_status_t init_openssl(void)
 {
-    if (++openssl_init_count != 1)
+    if (openssl_init_count)
         return PJ_SUCCESS;
+
+    openssl_init_count = 1;
 
     /* Register error subsystem */
@@ -335 +337 @@
 static void shutdown_openssl(void)
 {
-    if (--openssl_init_count != 0)
-        return;
+    PJ_UNUSED_ARG(openssl_init_count);
 }
 

pjproject/trunk/pjlib/src/pj/ssl_sock_symbian.cpp

@@ -448 +448 @@
                 ciphers_num_ = PJ_ARRAY_SIZE(ciphers_);
             for (i = 0; i < ciphers_num_; ++i)
-                ciphers_[i] = (pj_ssl_cipher)ciphers_buf[i*2];
+                ciphers_[i] = (pj_ssl_cipher)(ciphers_buf[i*2]*10 + 
+                                              ciphers_buf[i*2+1]);
         }
         

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

@@ -611 +611 @@
 
         pj_gettimeofday(&now);
-        pj_srand((pj_rand()%now.sec) * (pj_rand()%now.msec));
+        pj_srand((unsigned)now.sec);
         state_cli.send_str_len = (pj_rand() % 5 + 1) * 1024 + pj_rand() % 1024;
     }
@@ -1007 +1007 @@
 
         pj_gettimeofday(&now);
-        pj_srand((pj_rand()%now.sec) * (pj_rand()%now.msec));
+        pj_srand((unsigned)now.sec);
     }