r3110 - trunk/libminisip/source/mediahandler

[erik at minisip.org]

Author: erik
Date: 2007-01-10 23:51:32 +0100 (Wed, 10 Jan 2007)
New Revision: 3110

Modified:
   trunk/libminisip/source/mediahandler/KeyAgreement.cxx
   trunk/libminisip/source/mediahandler/Session.cxx
Log:

 * Switch to using the SIM objects instead of the certificate chain and CA
   DB (they are now in the SIM).



Modified: trunk/libminisip/source/mediahandler/KeyAgreement.cxx
===================================================================
--- trunk/libminisip/source/mediahandler/KeyAgreement.cxx	2007-01-10 22:49:02 UTC (rev 3109)
+++ trunk/libminisip/source/mediahandler/KeyAgreement.cxx	2007-01-10 22:51:32 UTC (rev 3110)
@@ -85,9 +85,12 @@
 						}
 
 						if( !ka ){
-							ka = new KeyAgreementDH( /*securityConfig.cert*/ identity->getSim()->getCertificateChain(), 
-										 /*securityConfig.cert_db*/ identity->getSim()->getCAs() );
+							//ka = new KeyAgreementDH( /*securityConfig.cert*/ identity->getSim()->getCertificateChain(), 
+							//			 /*securityConfig.cert_db*/ identity->getSim()->getCAs() );
+							ka = new KeyAgreementDH( identity->getSim() );
+
 							((KeyAgreementDH*)*ka)->setGroup( DH_GROUP_OAKLEY5 );
+
 						}
 						ka->setInitiatorData( init_mes );
 
@@ -316,8 +319,9 @@
 					ka = NULL;
 				}
 				if( !ka ){
-					ka = new KeyAgreementDH( /*securityConfig.cert*/ identity->getSim()->getCertificateChain() , 
-								 /*securityConfig.cert_db*/ identity->getSim()->getCAs() );
+					//ka = new KeyAgreementDH( /*securityConfig.cert*/ identity->getSim()->getCertificateChain() , 
+					//			 /*securityConfig.cert_db*/ identity->getSim()->getCAs() );
+					ka = new KeyAgreementDH( identity->getSim() );
 					((KeyAgreementDH*)*ka)->setGroup( DH_GROUP_OAKLEY5 );
 				}
 				addStreamsToKa();

Modified: trunk/libminisip/source/mediahandler/Session.cxx
===================================================================
--- trunk/libminisip/source/mediahandler/Session.cxx	2007-01-10 22:49:02 UTC (rev 3109)
+++ trunk/libminisip/source/mediahandler/Session.cxx	2007-01-10 22:51:32 UTC (rev 3110)
@@ -91,8 +91,9 @@
 	if( Session::precomputedKa.isNull()
 	    && identity && identity->getSim() ){
 		KeyAgreementDH* ka = NULL;
-		ka = new KeyAgreementDH( identity->getSim()->getCertificateChain(), 
-					 identity->getSim()->getCAs() );
+		//ka = new KeyAgreementDH( identity->getSim()->getCertificateChain(), 
+		//			 identity->getSim()->getCAs() );
+		ka = new KeyAgreementDH( identity->getSim() );
 		ka->setGroup( DH_GROUP_OAKLEY5 );
 		Session::precomputedKa = ka;
 	}