r3079 - trunk/libmikey/keyagreement

[mikma at minisip.org]

Author: mikma
Date: 2007-01-02 23:30:47 +0100 (Tue, 02 Jan 2007)
New Revision: 3079

Modified:
   trunk/libmikey/keyagreement/keyagreement_dh.cxx
Log:
* Set useSim to false in constructor
  KeyAgreementDH::KeyAgreementDH(MRef<certificate_chain*>, MRef<ca_db *>,int)
  Fixes crash.
* Fix order of initialization expressions in KeyAgreementDH constructors,
  gets rid of the warnings.



Modified: trunk/libmikey/keyagreement/keyagreement_dh.cxx
===================================================================
--- trunk/libmikey/keyagreement/keyagreement_dh.cxx	2007-01-02 22:23:57 UTC (rev 3078)
+++ trunk/libmikey/keyagreement/keyagreement_dh.cxx	2007-01-02 22:30:47 UTC (rev 3079)
@@ -35,11 +35,11 @@
 KeyAgreementDH::KeyAgreementDH( MRef<certificate_chain *> certChainPtr,
 		MRef<ca_db *> certDbPtr ):
 	KeyAgreement(),
+	useSim(false),
 	peerKeyPtr( NULL ),
 	peerKeyLengthValue( 0 ),
 	certChainPtr( certChainPtr ),
-	certDbPtr( certDbPtr ),
-	useSim(false)
+	certDbPtr( certDbPtr )
 {
 	//policy = list<Policy_type *>::list();
 	typeValue = KEY_AGREEMENT_TYPE_DH;
@@ -50,12 +50,12 @@
 
 KeyAgreementDH::KeyAgreementDH( MRef<SipSim*> s ):
 	KeyAgreement(),
+	useSim(true),
 	peerKeyPtr( NULL ),
 	peerKeyLengthValue( 0 ),
 	certChainPtr( NULL ),
 	certDbPtr( NULL ),
-	sim(s),
-	useSim(true)
+	sim(s)
 {
 	//policy = list<Policy_type *>::list();
 	typeValue = KEY_AGREEMENT_TYPE_DH;
@@ -74,6 +74,7 @@
 
 KeyAgreementDH::KeyAgreementDH( MRef<certificate_chain *> certChainPtr,
 		MRef<ca_db *> certDbPtr, int groupValue ):
+	useSim(false),
 	peerKeyPtr( NULL ),
 	peerKeyLengthValue( 0 ),
 	certChainPtr( certChainPtr ),
@@ -97,13 +98,13 @@
 
 
 KeyAgreementDH::KeyAgreementDH( MRef<SipSim*> s, int groupValue ):
+	useSim(true),
 	peerKeyPtr( NULL ),
 	peerKeyLengthValue( 0 ),
 	certChainPtr( NULL ),
 	peerCertChainPtr( NULL ),
 	certDbPtr( NULL ),
-	sim(s),
-	useSim(true)
+	sim(s)
 {
 	//policy = list<Policy_type *>::list();
 	typeValue = KEY_AGREEMENT_TYPE_DH;