r3166 - trunk/libmikey/keyagreement

[erik at minisip.org]

Author: erik
Date: 2007-01-31 14:36:06 +0100 (Wed, 31 Jan 2007)
New Revision: 3166

Modified:
   trunk/libmikey/keyagreement/KeyAgreementDH.cxx
Log:

 * Compile fix for last commit (use new additions only if configured with
   "--enable-scsim").



Modified: trunk/libmikey/keyagreement/KeyAgreementDH.cxx
===================================================================
--- trunk/libmikey/keyagreement/KeyAgreementDH.cxx	2007-01-31 13:13:30 UTC (rev 3165)
+++ trunk/libmikey/keyagreement/KeyAgreementDH.cxx	2007-01-31 13:36:06 UTC (rev 3166)
@@ -30,7 +30,10 @@
 #include<libmikey/MikeyMessage.h>
 #include<libmcrypto/OakleyDH.h>
 #include<libmcrypto/SipSim.h>
+
+#ifdef SCSIM_SUPPORT
 #include<libmcrypto/SipSimSmartCardGD.h>
+#endif
 
 using namespace std;
 
@@ -117,6 +120,7 @@
 
 
 int KeyAgreementDHBase::setGroup( int groupValue ){
+#ifdef SCSIM_SUPPORT
 	if (dynamic_cast<SipSimSmartCardGD*>(*sim)){
 		SipSimSmartCardGD* gd = dynamic_cast<SipSimSmartCardGD*>(*sim);
 
@@ -126,7 +130,10 @@
 
 		unsigned long length;
 		gd->getDHPublicValue(length, publicKeyPtr);
-	}else{
+	}
+	else
+#endif
+	{
 
 		if( !dh->setGroup( groupValue ) )
 			return 1;
@@ -175,6 +182,7 @@
 int KeyAgreementDHBase::computeTgk(){
 	assert( peerKeyPtr );
 
+#ifdef SCSIM_SUPPORT
 	if (dynamic_cast<SipSimSmartCardGD*>(*sim)){
 		SipSimSmartCardGD *gd = dynamic_cast<SipSimSmartCardGD*>(*sim);
 		unsigned long len;
@@ -182,7 +190,10 @@
 		gd->getDHPublicValue(len, dhval);
 		gd->genTgk( dhval, len );
 		return true;
-	}else{
+	}
+	else
+#endif
+	{
 		int res = dh->computeSecret( peerKeyPtr, peerKeyLengthValue, tgk(), tgkLength() );
 		return res;
 	}