r3188 - in trunk: libmcrypto/source libmcrypto/source/openssl libmikey/mikey libminisip/source/sip

[xuan at minisip.org]

Author: xuan
Date: 2007-02-02 18:30:52 +0100 (Fri, 02 Feb 2007)
New Revision: 3188

Modified:
   trunk/libmcrypto/source/SipSimSmartCardGD.cxx
   trunk/libmcrypto/source/openssl/cert.cxx
   trunk/libmikey/mikey/Mikey.cxx
   trunk/libmikey/mikey/MikeyMessageDH.cxx
   trunk/libminisip/source/sip/DefaultDialogHandler.cxx
   trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx
Log:
bug fix:
In the getPublicKey response APDU, the first byte of data field is the length of data.
It applies to this APDU when getting both the exponent, e and the modulus n.



Modified: trunk/libmcrypto/source/SipSimSmartCardGD.cxx
===================================================================
--- trunk/libmcrypto/source/SipSimSmartCardGD.cxx	2007-02-02 17:25:38 UTC (rev 3187)
+++ trunk/libmcrypto/source/SipSimSmartCardGD.cxx	2007-02-02 17:30:52 UTC (rev 3188)
@@ -580,7 +580,7 @@
  
                  switch(sw_1_2){
 		 	case 0x9000:
-				memcpy(publicKeyPtr, recvBuffer, (recvBufferLength - 2));
+				memcpy(publicKeyPtr, &recvBuffer[1], recvBuffer[0]);
 				clearBuffer();
 		        	return true;
 		        case 0x6982:

Modified: trunk/libmcrypto/source/openssl/cert.cxx
===================================================================
--- trunk/libmcrypto/source/openssl/cert.cxx	2007-02-02 17:25:38 UTC (rev 3187)
+++ trunk/libmcrypto/source/openssl/cert.cxx	2007-02-02 17:30:52 UTC (rev 3188)
@@ -346,7 +346,6 @@
 
 		ERR_print_errors_fp( stderr );
 	}
-
 	return err;
 }
 	

Modified: trunk/libmikey/mikey/Mikey.cxx
===================================================================
--- trunk/libmikey/mikey/Mikey.cxx	2007-02-02 17:25:38 UTC (rev 3187)
+++ trunk/libmikey/mikey/Mikey.cxx	2007-02-02 17:30:52 UTC (rev 3188)
@@ -80,7 +80,6 @@
 		else {
 			try{
 				MRef<MikeyMessage *> init_mes = MikeyMessage::parse(b64Message);
-				
 				createKeyAgreement( init_mes->keyAgreementType() );
 				if( !ka ){
 					throw MikeyException(

Modified: trunk/libmikey/mikey/MikeyMessageDH.cxx
===================================================================
--- trunk/libmikey/mikey/MikeyMessageDH.cxx	2007-02-02 17:25:38 UTC (rev 3187)
+++ trunk/libmikey/mikey/MikeyMessageDH.cxx	2007-02-02 17:30:52 UTC (rev 3188)
@@ -414,7 +414,6 @@
 
 bool MikeyMessageDH::authenticate( KeyAgreement * kaBase ){
 	KeyAgreementDH* ka = dynamic_cast<KeyAgreementDH*>(kaBase);
-
 	if( !ka ){
 		throw MikeyExceptionMessageContent( 
 				"Not a DH keyagreement" );

Modified: trunk/libminisip/source/sip/DefaultDialogHandler.cxx
===================================================================
--- trunk/libminisip/source/sip/DefaultDialogHandler.cxx	2007-02-02 17:25:38 UTC (rev 3187)
+++ trunk/libminisip/source/sip/DefaultDialogHandler.cxx	2007-02-02 17:30:52 UTC (rev 3188)
@@ -38,6 +38,7 @@
 #include<libmsip/SipRequest.h>
 #include<libmsip/SipCommandString.h>
 #include<libmutil/massert.h>
+#include<libmutil/Timestamp.h>
 
 #include<libminisip/sip/SipDialogVoipClient.h>
 #include<libminisip/sip/SipDialogVoipServer.h>

Modified: trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx
===================================================================
--- trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx	2007-02-02 17:25:38 UTC (rev 3187)
+++ trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx	2007-02-02 17:30:52 UTC (rev 3188)
@@ -864,6 +864,7 @@
 	//<network_interface> into networkInterfaceName
 	networkInterfaceName = backend->loadString("network_interface", "");
 	
+	//cerr << "EEEE: SIM: sim is "<< (sipStackConfig?"not NULL":"NULL")<< endl;
 	return ret;
 
 }