diff -r 093cf0757204 -r 938269283a16 eapol/eapol_framework/eapol_symbian/am/include/EapolUID.h
--- a/eapol/eapol_framework/eapol_symbian/am/include/EapolUID.h	Fri May 14 15:54:13 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/include/EapolUID.h	Fri Jun 11 13:40:22 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 12.1.2 %
+* %version: 23 %
 */
 
 #ifndef _EAPOLUID_H_
@@ -55,8 +55,8 @@
 #define EAP_MSCHAPV2_CHANGE_PASSWORD_NOTIFIER_UID 0x101f8e6a
 
 // EAP-SecurID
+#define EAP_SECURID_DLL_UID 0x101f8e74
 #define EAP_SECURID_NOTIFIERS_DLL_UID 0x101f8e6c
-#define EAP_SECURID_DLL_UID 0x101f8e74
 #define EAP_SECURID_IMPLEMENTATION_UID 0x101f8e75
 #define EAP_SECURID_IDENTITY_NOTIFIER_UID 0x101f8e76
 #define EAP_SECURID_PASSCODE_NOTIFIER_UID 0x101f8e77
@@ -81,6 +81,51 @@
 #define EAP_PROTECTED_SETUP_DLL_UID 0x2000b003
 #define EAP_PROTECTED_SETUP_IMPLEMENTATION_UID 0x2000b004	 
 
+// EAP-Generic IF
+#define EAP_GENERIC_DLL_UID 0x20026FD1
+#define EAP_GENERIC_IMPLEMENTATION_UID 0x20026FD2
+#define EAP_GENERIC_INTERFACE_UID 0x20026FF7
+
+// EAP-General-Settings IF
+#define EAP_GENERAL_SETTINGS_DLL_UID 0x20026FD6
+#define EAP_GENERAL_SETTINGS_IMPLEMENTATION_UID 0x20026FD8
+#define EAP_GENERAL_SETTINGS_INTERFACE_UID 0x20026FF8
+
+#define EAP_PLUGIN_DLL_UID 0x20026FD3
+#define EAP_PLUGIN_IMPLEMENTATION_UID 0x20026FD5
+#define EAP_PLUGIN_INTERFACE_UID 0x20026FD4
+
+#define EAP_CORE_INTERFACEIMPLEMENTATION_DLL_UID 0x20026FCD
+#define EAP_CORE_INTERFACEIMPLEMENTATION_IMPLEMENTATION_UID 0x20026FCC
+#define EAP_CORE_INTERFACEIMPLEMENTATION_INTERFACE_UID 0x20026FC7
+
+#define EAP_TOOLS_DLL_UID 0x20026FC8
+#define EAP_SYMBIAN_TOOLS_UID 0x20026FD0
+#define EAP_TOOLS_INTERFACE_UID 0x20026FCF
+
+#define EAP_SERVER_UID 0x20026FCB
+
+#define EAP_CORE_INTERFACE_DLL_UID 0x20026FEC
+
+// WAPI Security Settings
+#define WAPI_SETTINGS_CLIENT_PLUGIN_DLL_UID 0x2002DC6C
+#define WAPI_SETTINGS_CLIENT_IMPLEMENTATION_UID 0x2002DC6E
+#define WAPI_SETTINGS_CLIENT_INTERFACE_UID 0x2002DC6D
+
+#define WAPI_SETTINGS_SERVER_PLUGIN_DLL_UID 0x2002DC90
+#define WAPI_SETTINGS_SERVER_IMPLEMENTATION_UID 0x2002DC92
+#define WAPI_SETTINGS_SERVER_INTERFACE_UID 0x2002DC91
+
+// WAPI Core
+#define WAPI_CORE_INTERFACE_DLL_UID 0x2002E6E3
+
+#define WAPI_CORE_INTERFACEIMPLEMENTATION_DLL_UID 0x2002E6E4
+#define WAPI_CORE_INTERFACEIMPLEMENTATION_IMPLEMENTATION_UID 0x2002E6E6
+#define WAPI_CORE_INTERFACEIMPLEMENTATION_INTERFACE_UID 0x2002E6E5
+
+#define WAPI_CORE_SERVER_PLUGIN_DLL_UID 0x2002E6EE
+#define WAPI_CORE_SERVER_IMPLEMENTATION_UID 0x2002E6F0
+#define WAPI_CORE_SERVER_INTERFACE_UID 0x2002E6EF
 
 // FREE UIDS