r3390 - in trunk/libmikey: include/libmikey mikey

[erik at minisip.org]

Author: erik
Date: 2007-08-22 23:12:57 +0200 (Wed, 22 Aug 2007)
New Revision: 3390

Modified:
   trunk/libmikey/include/libmikey/KeyAgreement.h
   trunk/libmikey/include/libmikey/KeyAgreementDH.h
   trunk/libmikey/include/libmikey/MikeyMessage.h
   trunk/libmikey/mikey/MikeyMessageDH.cxx
Log:

 * It's a bit hard to please both GCC and MSVS when we use MRefs.
   MSVS wants us to include more header files which broke the
   linux builds (basically, when ever we have a reference to
   a MObject as an attribute in a class, then I think we need
   to include the header file for that MObject subclass).





Modified: trunk/libmikey/include/libmikey/KeyAgreement.h
===================================================================
--- trunk/libmikey/include/libmikey/KeyAgreement.h	2007-08-22 20:41:00 UTC (rev 3389)
+++ trunk/libmikey/include/libmikey/KeyAgreement.h	2007-08-22 21:12:57 UTC (rev 3390)
@@ -34,6 +34,7 @@
 #include<libmutil/MemObject.h>
 #include<libmikey/KeyValidity.h>
 #include<libmikey/MikeyCsIdMap.h>
+#include<libmikey/MikeyMessage.h>
 #include<libmcrypto/SipSim.h>
 
 #include<iostream>
@@ -52,6 +53,7 @@
 #define KEY_AGREEMENT_TYPE_DHHMAC 3
 #define KEY_AGREEMENT_TYPE_RSA_R 4
 
+class MikeyMessage;
 
 // Class to hold Security Policy (SP) info
 class LIBMIKEY_API Policy_type {
@@ -66,7 +68,6 @@
 	private:
 };
 
-class LIBMIKEY_API MikeyMessage;
 
 class LIBMIKEY_API ITgk{
 	public:

Modified: trunk/libmikey/include/libmikey/KeyAgreementDH.h
===================================================================
--- trunk/libmikey/include/libmikey/KeyAgreementDH.h	2007-08-22 20:41:00 UTC (rev 3389)
+++ trunk/libmikey/include/libmikey/KeyAgreementDH.h	2007-08-22 21:12:57 UTC (rev 3390)
@@ -27,8 +27,8 @@
 
 #include<libmikey/libmikey_config.h>
 
+#include<libmcrypto/SipSim.h>
 #include<libmikey/KeyAgreement.h>
-#include<libmcrypto/SipSim.h>
 
 #define DH_GROUP_OAKLEY5 0
 #define DH_GROUP_OAKLEY1 1
@@ -40,6 +40,7 @@
 class certificate;
 class CertificateSet;
 
+
 class LIBMIKEY_API PeerCertificates {
 	public:
 		PeerCertificates( MRef<CertificateChain*> aCert,
@@ -58,7 +59,7 @@
 		MRef<CertificateSet *> certDbPtr;
 };
 
-class LIBMIKEY_API KeyAgreementDHBase: virtual public ITgk{
+class LIBMIKEY_API KeyAgreementDHBase : virtual public ITgk {
 	public:
 		KeyAgreementDHBase(MRef<SipSim* > sim);
 		~KeyAgreementDHBase();
@@ -83,6 +84,7 @@
 		int publicKeyLengthValue;
 };
 
+
 class LIBMIKEY_API KeyAgreementDH : public KeyAgreement,
 				    public KeyAgreementDHBase,
 				    public PeerCertificates{

Modified: trunk/libmikey/include/libmikey/MikeyMessage.h
===================================================================
--- trunk/libmikey/include/libmikey/MikeyMessage.h	2007-08-22 20:41:00 UTC (rev 3389)
+++ trunk/libmikey/include/libmikey/MikeyMessage.h	2007-08-22 21:12:57 UTC (rev 3390)
@@ -37,8 +37,8 @@
 #include<libmikey/MikeyPayloadSIGN.h>
 
 #include<libmikey/KeyAgreement.h>
-#include<libmikey/KeyAgreementDH.h>
-#include<libmikey/KeyAgreementPSK.h>
+//#include<libmikey/KeyAgreementDH.h>
+//#include<libmikey/KeyAgreementPSK.h>
 #include<libmcrypto/cert.h>
 
 #include<list>
@@ -69,11 +69,14 @@
 class SipSim;
 class Certificate;
 class CertificateSet;
+class KeyAgreement;
 class KeyAgreementDH;
 class KeyAgreementDHHMAC;
 class KeyAgreementPKE;
+class KeyAgreementPSK;
 class KeyAgreementRSAR;
 class MikeyPayloadID;
+class MikeyMessage;
 
 class LIBMIKEY_API MikeyPayloads: public MObject{
 	public:

Modified: trunk/libmikey/mikey/MikeyMessageDH.cxx
===================================================================
--- trunk/libmikey/mikey/MikeyMessageDH.cxx	2007-08-22 20:41:00 UTC (rev 3389)
+++ trunk/libmikey/mikey/MikeyMessageDH.cxx	2007-08-22 21:12:57 UTC (rev 3390)
@@ -36,6 +36,7 @@
 #include<libmikey/MikeyPayloadCERT.h>
 #include<libmikey/MikeyPayloadDH.h>
 #include<libmikey/MikeyPayloadERR.h>
+#include<libmikey/KeyAgreementDH.h>
 #include<libmcrypto/SipSim.h>
 #include<libmcrypto/rand.h>