r3249 - in trunk: libmcrypto/source libmikey/keyagreement

[xuan at minisip.org]

Author: xuan
Date: 2007-03-22 17:41:17 +0100 (Thu, 22 Mar 2007)
New Revision: 3249

Modified:
   trunk/libmcrypto/source/SipSimSmartCardGD.cxx
   trunk/libmikey/keyagreement/KeyAgreementDH.cxx
Log:
remove some debug information



Modified: trunk/libmcrypto/source/SipSimSmartCardGD.cxx
===================================================================
--- trunk/libmcrypto/source/SipSimSmartCardGD.cxx	2007-03-22 16:27:41 UTC (rev 3248)
+++ trunk/libmcrypto/source/SipSimSmartCardGD.cxx	2007-03-22 16:41:17 UTC (rev 3249)
@@ -137,23 +137,23 @@
 			switch (sw_1_2){
 			case GDEnum::SUCCESS:
 				userAttemptTimer = 3;
-				blockedCard = 0;
+				blockedCard = GDEunm::UNBLOCKED;
 				verifiedCard = GDEnum::USER_VERIFIED;
 				return true;
 			
 			case GDEnum::PIN_RETRY_TIMER_2:
 				userAttemptTimer = 2;
-				blockedCard = 0;
+				blockedCard = GDEunm::UNBLOCKED;
 				break;
 			
 			case GDEnum::PIN_RETRY_TIMER_1:
 				userAttemptTimer = 1;
-				blockedCard = 0;
+				blockedCard = GDEunm::UNBLOCKED;
 				break;
 			
 			case GDEnum::PIN_RETRY_TIMER_0:
 				userAttemptTimer = 0;
-				blockedCard = 1;
+				blockedCard = GDEunm::USER_BLOCKED;
 				break;
 
 			case GDEnum::PIN_NOT_FOUND:
@@ -191,23 +191,23 @@
 			case GDEnum::SUCCESS:
 				adminAttemptTimer = 3;
 				userAttemptTimer = 3;
-				blockedCard = 0;								// to validate the userPinCode by a right adminPinCode
+				blockedCard = GDEunm::UNBLOCKED;								// to validate the userPinCode by a right adminPinCode
 				verifiedCard = GDEnum::ADMIN_VERIFIED;
 				return true;
 
 			case GDEnum::PIN_RETRY_TIMER_2:
 				adminAttemptTimer = 2;
-				blockedCard = 1;
+				blockedCard = GDEunm::USER_BLOCKED;
 				break;
 
 			case GDEnum::PIN_RETRY_TIMER_1:
 				adminAttemptTimer = 1;
-				blockedCard = 1;
+				blockedCard = GDEunm::USER_BLOCKED;
 				break;
 
 			case GDEnum::PIN_RETRY_TIMER_0:
 				adminAttemptTimer = 0;
-				blockedCard = 2;
+				blockedCard = GDEunm::ADMIN_BLOCKED;;
 				break;
 
 			case GDEnum::PIN_NOT_FOUND:

Modified: trunk/libmikey/keyagreement/KeyAgreementDH.cxx
===================================================================
--- trunk/libmikey/keyagreement/KeyAgreementDH.cxx	2007-03-22 16:27:41 UTC (rev 3248)
+++ trunk/libmikey/keyagreement/KeyAgreementDH.cxx	2007-03-22 16:41:17 UTC (rev 3249)
@@ -236,7 +236,6 @@
 }
 
 int PeerCertificates::controlPeerCertificate( const std::string &peerUri ){
-	cerr << "start0000000000000000 peerUri is: " << peerUri <<endl;
 	if( peerCertChainPtr.isNull() || certDbPtr.isNull() )
 		return 0;