Changeset 3110 for pjproject/trunk/pjlib/src/pj/ssl_sock_symbian.cpp

Timestamp:

Feb 25, 2010 11:58:19 AM (14 years ago)

Author:

nanang

Message:

More ticket #1032:

• Updated transport state notification callback to return void.
• Updated transport state enum to only contain connected and disconnected, no more bitmask value.
• Added direction field to SIP transport.
• Removed remote hostname hash from transport key.
• Updated cert info dump to return -1 when buffer is insufficient.
• Added new error code PJSIP_TLS_ECERTVERIF.
• Updated get_cert_name() in ssl_sock_symbian.c to use heap buffer instead of stack.
• Minors, e.g: added prefix PJ in cipher types, docs.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_symbian.cpp (modified) (6 diffs)

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

@@ -445 +445 @@
 
 
-static pj_str_t get_cert_name(pj_pool_t *pool,
+static pj_str_t get_cert_name(char *buf, unsigned buf_len,
                               const CX500DistinguishedName &name)
 {
     TInt i;
-    char buf[1024];
     TUint8 *p;
-    TInt l = sizeof(buf);
+    TInt l = buf_len;
     
     p = (TUint8*)buf;
@@ -480 +479 @@
     }
     
-    pj_str_t src, res;
-    pj_strset(&src, buf, sizeof(buf) - l);
-    pj_strdup(pool, &res, &src);
-    
-    return res;
+    pj_str_t src;
+    pj_strset(&src, buf, buf_len - l);
+    
+    return src;
 }
                             
@@ -492 +490 @@
                           const CX509Certificate *x)
 {
+    enum { tmp_buf_len = 512 };
+    char *tmp_buf;
     unsigned len;
     
     pj_assert(pool && ci && x);
     
+    /* Init */
+    tmp_buf = new char[tmp_buf_len];
     pj_bzero(ci, sizeof(*ci));
     
@@ -519 +521 @@
             pj_strset(&ci->subject.cn, (char*)ptr8.Ptr(), ptr8.Length());
         }
-        ci->subject.info = get_cert_name(pool, x->SubjectName());
+        pj_str_t tmp = get_cert_name(tmp_buf, tmp_buf_len,
+                                     x->SubjectName());
+        pj_strdup(pool, &ci->subject.info, &tmp);
     }
 
@@ -533 +537 @@
             pj_strset(&ci->issuer.cn, (char*)ptr8.Ptr(), ptr8.Length());
         }
-        ci->issuer.info = get_cert_name(pool, x->IssuerName());
+        pj_str_t tmp = get_cert_name(tmp_buf, tmp_buf_len,
+                                     x->IssuerName());
+        pj_strdup(pool, &ci->issuer.info, &tmp);
     }
     
@@ -544 +550 @@
     valid_period.Finish().SecondsFrom(base_time, tmp_sec);
     ci->validity.end.sec = tmp_sec.Int();
+    
+    /* Deinit */
+    delete [] tmp_buf;
 }