Changeset 5821 for pjproject/trunk/pjsip/src/pjsua2/siptypes.cpp

Timestamp:

Jul 15, 2018 2:09:23 PM (2 years ago)

Author:

riza

Message:

Close #484: Allow to use binary certificate in TLS transport.

File:

• pjproject/trunk/pjsip/src/pjsua2/siptypes.cpp (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsua2/siptypes.cpp

@@ -164 +164 @@
     ts.privkey_file     = str2Pj(this->privKeyFile);
     ts.password         = str2Pj(this->password);
+    ts.ca_buf           = str2Pj(this->CaBuf);
+    ts.cert_buf         = str2Pj(this->certBuf);
+    ts.privkey_buf      = str2Pj(this->privKeyBuf);
     ts.method           = this->method;
     ts.ciphers_num      = (unsigned)this->ciphers.size();
@@ -189 +192 @@
     this->privKeyFile   = pj2Str(prm.privkey_file);
     this->password      = pj2Str(prm.password);
+    this->CaBuf         = pj2Str(prm.ca_buf);
+    this->certBuf       = pj2Str(prm.cert_buf);
+    this->privKeyBuf    = pj2Str(prm.privkey_buf);
     this->method        = (pjsip_ssl_method)prm.method;
     this->proto         = prm.proto;
@@ -211 +217 @@
     NODE_READ_STRING  ( this_node, privKeyFile);
     NODE_READ_STRING  ( this_node, password);
+    NODE_READ_STRING  ( this_node, CaBuf);
+    NODE_READ_STRING  ( this_node, certBuf);
+    NODE_READ_STRING  ( this_node, privKeyBuf);
     NODE_READ_NUM_T   ( this_node, pjsip_ssl_method, method);
     readIntVector     ( this_node, "ciphers", ciphers);
@@ -230 +239 @@
     NODE_WRITE_STRING  ( this_node, privKeyFile);
     NODE_WRITE_STRING  ( this_node, password);
+    NODE_WRITE_STRING  ( this_node, CaBuf);
+    NODE_WRITE_STRING  ( this_node, certBuf);
+    NODE_WRITE_STRING  ( this_node, privKeyBuf);
     NODE_WRITE_NUM_T   ( this_node, pjsip_ssl_method, method);
     writeIntVector     ( this_node, "ciphers", ciphers);