Changeset 5513 for pjproject/branches/projects/uwp/pjlib/src/pjlib-test/ssl_sock.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjlib/src/pjlib-test/ssl_sock.c (modified) (2 diffs)

pjproject/branches/projects/uwp/pjlib/src/pjlib-test/ssl_sock.c

@@ -1319 +1319 @@
         pj_ssl_sock_close(ssock_serv);
 
-    for (i = 0; i < clients; ++i) {
-        if (ssock_cli[i] && !state_cli[i].err && !state_cli[i].done)
-            pj_ssl_sock_close(ssock_cli[i]);
+    if (ssock_cli && state_cli) {
+        for (i = 0; i < clients; ++i) {
+            if (ssock_cli[i] && !state_cli[i].err && !state_cli[i].done)
+                pj_ssl_sock_close(ssock_cli[i]);
+        }
     }
     if (ioqueue)
@@ -1377 +1379 @@
      */
 
-    PJ_LOG(3,("", "..echo test w/ TLSv1 and PJ_TLS_RSA_WITH_DES_CBC_SHA cipher"));
+    PJ_LOG(3,("", "..echo test w/ TLSv1 and PJ_TLS_RSA_WITH_AES_256_CBC_SHA cipher"));
     ret = echo_test(PJ_SSL_SOCK_PROTO_TLS1, PJ_SSL_SOCK_PROTO_TLS1, 
-                    PJ_TLS_RSA_WITH_DES_CBC_SHA, PJ_TLS_RSA_WITH_DES_CBC_SHA, 
+                    PJ_TLS_RSA_WITH_AES_256_CBC_SHA, PJ_TLS_RSA_WITH_AES_256_CBC_SHA, 
                     PJ_FALSE, PJ_FALSE);
     if (ret != 0)