r3000 - in trunk/libminisip/source: mediahandler sip

[mikma at minisip.org]

Author: mikma
Date: 2006-12-10 14:19:19 +0100 (Sun, 10 Dec 2006)
New Revision: 3000

Modified:
   trunk/libminisip/source/mediahandler/Session.cxx
   trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx
Log:
Fix some bugs which prevents MIKEY PSK from working.
MIKEY DH still has config problems.


Modified: trunk/libminisip/source/mediahandler/Session.cxx
===================================================================
--- trunk/libminisip/source/mediahandler/Session.cxx	2006-12-06 23:27:17 UTC (rev 2999)
+++ trunk/libminisip/source/mediahandler/Session.cxx	2006-12-10 13:19:19 UTC (rev 3000)
@@ -88,7 +88,8 @@
 		registry->unregisterSession( this );
 	}
 
-	if( Session::precomputedKa.isNull() ){
+	if( Session::precomputedKa.isNull()
+	    && identity && identity->getSim() ){
 		Session::precomputedKa = new KeyAgreementDH( /*securityConfig.cert*/ identity->getSim()->getCertificateChain(), 
 				/*securityConfig.cert_db*/ identity->getSim()->getCAs(), DH_GROUP_OAKLEY5 );
 	}

Modified: trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx
===================================================================
--- trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx	2006-12-06 23:27:17 UTC (rev 2999)
+++ trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx	2006-12-10 13:19:19 UTC (rev 3000)
@@ -123,6 +123,7 @@
 		
 
 /*From SipDialogSecurity below*/
+		backend->save(accountPath + "secured", (*iIdent)->securityEnabled ? string("yes") : string("no"));
 		backend->save(accountPath + "use_zrtp", /*use_zrtp*/ (*iIdent)->use_zrtp ? string("yes") : string("no"));
 		backend->save(accountPath + "psk_enabled", (*iIdent)->pskEnabled ? string("yes") : string("no"));
 		backend->save(accountPath + "dh_enabled", (*iIdent)->dhEnabled ? string("yes") : string("no"));
@@ -674,7 +675,7 @@
 		if (backend->loadString(accountPath + "pstn_account","")=="yes"){
 			pstnIdentity = ident;
 			usePSTNProxy = true;
-			ident->securityEnabled= false;
+// 			ident->securityEnabled= false;
 		}
 
 		if (backend->loadString(accountPath + "default_account","")=="yes"){