r3109 - trunk/libminisip/source/sip

[erik at minisip.org]

Author: erik
Date: 2007-01-10 23:49:02 +0100 (Wed, 10 Jan 2007)
New Revision: 3109

Modified:
   trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx
Log:

 * Fix: Initialize the SIM with the CA DB and certificate chain loaded from
   the config.
  



Modified: trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx
===================================================================
--- trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx	2007-01-10 22:47:05 UTC (rev 3108)
+++ trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx	2007-01-10 22:49:02 UTC (rev 3109)
@@ -488,7 +488,6 @@
 		 ****************************************************************/
 #ifdef SCSIM_SUPPORT
 		string pin = backend->loadString(accountPath + "hwsim_pin","");
-
 		if (pin.size()>0){
 			MRef<SipSimSmartCardGD*> sim = new SipSimSmartCardGD;
 			sim ->setPin(pin.c_str());
@@ -544,6 +543,7 @@
 		certFile = backend->loadString(accountPath + "certificate_chain[0]","");
 
 
+
 #ifdef ONLINECONF_SUPPORT
 		if(certFile.substr(0,10)=="httpsrp://") {
 			OnlineConfBack *conf;
@@ -640,6 +640,9 @@
 
 		if (!ident->getSim()){
 			ident->setSim(new SipSimSoft(certchain, cert_db));
+		}else{
+			ident->getSim()->setCertificateChain(certchain);	//TODO: certchain and cert_db should not be attributes in SipSoftPhoneConfig any more?!
+			ident->getSim()->setCAs(cert_db);
 		}
 
 /*From SipDialogSecurity above*/