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

Timestamp:

Nov 6, 2009 1:31:37 PM (13 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.

File:

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

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);
 }