--- a/vpnengine/ikepolparser/inc/ikepolparser.h	Wed Sep 01 12:23:21 2010 +0100
+++ b/vpnengine/ikepolparser/inc/ikepolparser.h	Tue Sep 14 23:16:15 2010 +0300
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description:   IKE policy parser main module
+* Description:  IKE policy parser main module
 *
 */
 
@@ -22,6 +22,9 @@
 #include <badesca.h>
 #include <in_sock.h>
 
+#include "pkidefs.h"
+
+
 #define FIRST_SEC_PARSER_VERSION    1
 #define SEC_PARSER_VERSION          3
 
@@ -79,7 +82,6 @@
 const TInt KSecParserErrUnknown             = -5297;
 
 
-
 //Values for the choice lists used in the .RSS
 enum {IKE_PARSER_MAIN,
       IKE_PARSER_AGGRESSIVE};       //Modes
@@ -154,11 +156,11 @@
 };
 
 
-//RSA Encryption peer public keys
+// RSA Encryption peer public keys
 struct TCertInfo
 {
-    TCertFormat iFormat;
-    TFileName   iData;    
+    TCertFormat       iFormat;
+    TBuf<KMaxX500DN>  iData;    
 };
 
 
@@ -172,13 +174,13 @@
 //Own certificates
 struct TOwnCertInfo
 {
-    TCertFormat iFormat;
-    TFileName iData;    //File containing the peer RSA public key
-    TBuf<128> iRfc822NameFqdn;
-    TIdentityAsRfc822Name iIdentityAsRfc822Name;
-    TBuf<256> iSubjectDnSuffix;
-    TInt iPrivateKeyLength;
-    TInt iOwnCertExists;                     // 0 = no own cert   1 = own cert exists
+    TCertFormat            iFormat;
+    TFileName              iData;  // File containing the peer cert
+    TBuf<KMaxRfc822>       iRfc822NameFqdn;
+    TIdentityAsRfc822Name  iIdentityAsRfc822Name;
+    TBuf<KMaxX500DN>       iSubjectDnSuffix;
+    TInt                   iPrivateKeyLength;
+    TInt                   iOwnCertExists;  // 0=no own cert, 1=own cert exists
 };
 
 class TStringData