--- a/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/inc/EapTlsPeapDbDefaults.h	Tue Aug 31 15:16:37 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/inc/EapTlsPeapDbDefaults.h	Wed Sep 01 12:23:57 2010 +0100
@@ -16,19 +16,82 @@
 */
 
 /*
-* %version: 36.1.8 %
+* %version: 39 %
 */
 
 #if !defined(_EAPTLSPEAPDBDEFAULTS_H_)
 #define _EAPTLSPEAPDBDEFAULTS_H_
 
-#include "EapPluginDbDefaults.h"
-#include "tls_peap_types.h"
+enum TTLSPEAPUseManualRealm 
+{
+	ETLSPEAPUseManualRealmNo,		// False. Don't use Manual Realm.
+	ETLSPEAPUseManualRealmYes,		// True. Use Manual Realm.
+};
+
+enum TTLSPEAPUseManualUsername 
+{
+	ETLSPEAPUseManualUsernameNo,		// False. Don't use Manual Username.
+	ETLSPEAPUseManualUsernameYes,		// True. Use Manual Username.
+};
+
+enum TTLSPEAPVerifyCertRealm 
+{
+	ETLSPEAPVerifyCertRealmNo,		// False. Don't Verify Certificate Realm.
+	ETLSPEAPVerifyCertRealmYes,		// True. Verify Certificate Realm.
+};
+
+enum TTLSPEAPServerAuthenticatesClientPolicy
+{
+	ETLSPEAPServerAuthenticatesClientPolicyNo,		// False.
+	ETLSPEAPServerAuthenticatesClientPolicyYes,		// True.
+};
+
+enum TTLSPEAPTLSPrivacy
+{
+	ETLSPEAPTLSPrivacyNo,		// False. TLS Privacy OFF.
+	ETLSPEAPTLSPrivacyYes,		// True. TLS Privacy ON.
+};
+
+#ifdef USE_FAST_EAP_TYPE		
+
+enum TFASTAuthProvModeAllowed
+{
+	EFASTAuthProvModeAllowedNo,			// False. Authenticated provisioning mode NOT allowed.
+	EFASTAuthProvModeAllowedYes,		// True. Authenticated provisioning mode allowed.
+};
+
+enum TFASTUnauthProvModeAllowed
+{
+	EFASTUnauthProvModeAllowedNo,		// False. Unauthenticated provisioning mode NOT allowed.
+	EFASTUnauthProvModeAllowedYes,		// True. Unauthenticated provisioning mode allowed.
+};
+
+enum TFASTWarnADHPNoPAC
+{
+	EFASTWarnADHPNoPACNo,		// False. Warnings or prompts NOT allowed.
+	EFASTWarnADHPNoPACYes,		// True. Warnings or prompts allowed.
+};
+
+enum TFASTWarnADHPNoMatchingPAC
+{
+	EFASTWarnADHPNoMatchingPACNo,		// False. Warnings or prompts NOT allowed.
+	EFASTWarnADHPNoMatchingPACYes,		// True. Warnings or prompts allowed.
+};
+
+enum TFASTWarnNotDefaultServer
+{
+	EFASTWarnNotDefaultServerNo,		// False. Warnings or prompts NOT allowed.
+	EFASTWarnNotDefaultServerYes,		// True. Warnings or prompts allowed.
+};
+
+#endif //#ifdef USE_FAST_EAP_TYPE
 
 // LOCAL CONSTANTS
-const TInt default_EAP_TLS_PEAP_use_manual_realm = EEapDbFalse;
+const TInt default_EAP_TLS_PEAP_use_manual_realm = ETLSPEAPUseManualRealmNo;
+_LIT(default_EAP_TLS_PEAP_manual_realm, "");
 
-const TInt default_EAP_TLS_PEAP_use_manual_username = EEapDbFalse;
+const TInt default_EAP_TLS_PEAP_use_manual_username = ETLSPEAPUseManualUsernameNo;
+_LIT(default_EAP_TLS_PEAP_manual_username, "");
 
 const TInt default_EAP_TLS_PEAP_cipher_suite = tls_cipher_suites_TLS_RSA_WITH_3DES_EDE_CBC_SHA;
 
@@ -40,22 +103,23 @@
 const TInt default_EAP_TLS_server_authenticates_client = 1;
 const TInt default_EAP_PEAP_TTLS_server_authenticates_client = 0;
 
-_LIT(default_CA_cert_label, "");
-_LIT(default_client_cert_label, "");
+_LIT(default_CA_cert_label, "rsaca.eapsim.foo");
+_LIT(default_client_cert_label, "rsaclient@eapsim.foo");
 
 const TInt default_EAP_TLS_PEAP_verify_certificate_realm = 0;
 
-const TUint default_EAP_TLS_PEAP_TTLS_Privacy = EEapDbFalse;
+const TUint default_EAP_TLS_PEAP_TLS_Privacy = ETLSPEAPTLSPrivacyNo;
 
-const TUint default_EAP_TLS_PEAP_use_automatic_ca_certificate = EEapDbTrue;
+const TInt64 default_MaxSessionTime = 0; // 0 means read from configuration file.
+const TInt64 default_FullAuthTime = 0;
 
 // Defaults for EAP-FAST specific items
 #ifdef USE_FAST_EAP_TYPE
-const TUint default_EAP_FAST_Auth_Prov_Mode_Allowed = EEapDbFalse; // Default is NO
-const TUint default_EAP_FAST_Unauth_Prov_Mode_Allowed = EEapDbFalse; // Default is NO
-const TUint default_EAP_FAST_Warn_ADHP_No_PAC = EEapDbTrue; // Default is YES
-const TUint default_EAP_FAST_Warn_ADHP_No_Matching_PAC = EEapDbTrue; // Default is YES
-const TUint default_EAP_FAST_Warn_Not_Default_Server = EEapDbTrue; // Default is YES
+const TUint default_EAP_FAST_Auth_Prov_Mode_Allowed = EFASTAuthProvModeAllowedNo; // Default is NO
+const TUint default_EAP_FAST_Unauth_Prov_Mode_Allowed = EFASTUnauthProvModeAllowedNo; // Default is NO
+const TUint default_EAP_FAST_Warn_ADHP_No_PAC = EFASTWarnADHPNoPACNo; // Default is NO
+const TUint default_EAP_FAST_Warn_ADHP_No_Matching_PAC = EFASTWarnADHPNoMatchingPACNo; // Default is NO
+const TUint default_EAP_FAST_Warn_Not_Default_Server = EFASTWarnNotDefaultServerNo; // Default is NO
 #endif //#ifdef USE_FAST_EAP_TYPE
 
 // Add here the cipher suites you want to be allowed by default. Note that the last
@@ -82,6 +146,8 @@
 	0
 };
 
+const TUint KMaxManualUsernameLengthInDB = 255;
+const TUint KMaxManualRealmLengthInDB = 255;
 const TUint KMaxCertLabelLengthInDB = 255;
 const TUint KMaxSubjectKeyIdLengthInDB = 255; // Not using KKeyIdentifierLength (EapSettings.h) as this is
 											 // Symbian's subjectkey id (hash of actual subjectkey id), though the lengths are same.