openid removed

src/EterLib/NetStream.cpp

@@ -697,7 +697,6 @@ const char * GetRecvHeaderName(BYTE header)
 		stringList[135] = "HEADER_GC_DAMAGE_INFO";
 		stringList[136] = "HEADER_GC_CHAR_ADDITIONAL_INFO";
 		stringList[150] = "HEADER_GC_AUTH_SUCCESS";
-		stringList[154] = "HEADER_GC_AUTH_SUCCESS_OPENID";
 #ifdef _IMPROVED_PACKET_ENCRYPTION_
 		stringList[0xfa] = "HEADER_GC_KEY_AGREEMENT_COMPLETED";
 		stringList[0xfb] = "HEADER_GC_KEY_AGREEMENT";

src/UserInterface/AccountConnector.cpp

@@ -10,10 +10,6 @@ extern DWORD g_adwEncryptKey[4];
 extern DWORD g_adwDecryptKey[4];
 // END_OF_CHINA_CRYPT_KEY
 
-#ifdef USE_OPENID
-extern int openid_test;
-#endif
-
 void CAccountConnector::SetHandler(PyObject* poHandler)
 {
 	m_poHandler = poHandler;
@@ -177,11 +173,6 @@ bool CAccountConnector::__AuthState_Process()
 	if (!__AnalyzePacket(HEADER_GC_AUTH_SUCCESS, sizeof(TPacketGCAuthSuccess), &CAccountConnector::__AuthState_RecvAuthSuccess))
 		return true;
 
-#ifdef USE_OPENID
-	if (!__AnalyzePacket(HEADER_GC_AUTH_SUCCESS_OPENID, sizeof(TPacketGCAuthSuccess), &CAccountConnector::__AuthState_RecvAuthSuccess_OpenID))
-		return true;
-#endif /* USE_OPENID */
-
 	if (!__AnalyzePacket(HEADER_GC_LOGIN_FAILURE, sizeof(TPacketGCAuthSuccess), &CAccountConnector::__AuthState_RecvAuthFailure))
 		return true;
 
@@ -242,67 +233,6 @@ bool CAccountConnector::__AuthState_RecvPhase()
 		SetSecurityMode(true, key);
 #endif
 
-#ifdef USE_OPENID		
-		if (!openid_test)
-		{
-			//2012.07.19 OpenID : 김용욱 
-			//Ongoing : 오픈 아이디 경우-> TPacketCGLogin5
-			//클라가 가지고 있는 인증키만을 서버에 보내도록.
-
-			//const char* tempAuthKey = "d4025bc1f752b64fe5d51ae575ec4730"; //하드코딩 길이 32
-			TPacketCGLogin5 LoginPacket;
-			LoginPacket.header = HEADER_CG_LOGIN5_OPENID;
-
-			strncpy(LoginPacket.authKey, LocaleService_GetOpenIDAuthKey(), OPENID_AUTHKEY_LEN);
-			LoginPacket.authKey[OPENID_AUTHKEY_LEN] = '\0';
-			
-			for (DWORD i = 0; i < 4; ++i)
-				LoginPacket.adwClientKey[i] = g_adwEncryptKey[i];
-
-			if (!Send(sizeof(LoginPacket), &LoginPacket))
-			{
-				Tracen(" CAccountConnector::__AuthState_RecvPhase - SendLogin5 Error");
-				return false;
-			}
-
-			if (!SendSequence())
-			{
-				return false;
-			}
-		}
-		else
-		{
-			TPacketCGLogin3 LoginPacket;
-			LoginPacket.header = HEADER_CG_LOGIN3;
-
-			strncpy(LoginPacket.name, m_strID.c_str(), ID_MAX_NUM);
-			strncpy(LoginPacket.pwd, m_strPassword.c_str(), PASS_MAX_NUM);
-			LoginPacket.name[ID_MAX_NUM] = '\0';
-			LoginPacket.pwd[PASS_MAX_NUM] = '\0';
-
-			// 비밀번호를 메모리에 계속 갖고 있는 문제가 있어서, 사용 즉시 날리는 것으로 변경
-			ClearLoginInfo();
-			CPythonNetworkStream& rkNetStream=CPythonNetworkStream::Instance();
-			rkNetStream.ClearLoginInfo();
-
-			m_strPassword = "";
-
-			for (DWORD i = 0; i < 4; ++i)
-				LoginPacket.adwClientKey[i] = g_adwEncryptKey[i];
-
-			if (!Send(sizeof(LoginPacket), &LoginPacket))
-			{
-				Tracen(" CAccountConnector::__AuthState_RecvPhase - SendLogin3 Error");
-				return false;
-			}
-
-			if (!SendSequence())
-			{
-				return false;
-			}
-		}
-#else /* USE_OPENID */
-
 		TPacketCGLogin3 LoginPacket;
 		LoginPacket.header = HEADER_CG_LOGIN3;
 
@@ -331,7 +261,6 @@ bool CAccountConnector::__AuthState_RecvPhase()
 		{
 			return false;
 		}
-#endif /* USE_OPENID */
 
 		__AuthState_Set();
 	}
@@ -464,37 +393,6 @@ bool CAccountConnector::__AuthState_RecvAuthSuccess()
 	return true;
 }
 
-#ifdef USE_OPENID
-bool CAccountConnector::__AuthState_RecvAuthSuccess_OpenID()
-{
-	TPacketGCAuthSuccessOpenID kAuthSuccessOpenIDPacket;
-	if (!Recv(sizeof(kAuthSuccessOpenIDPacket), &kAuthSuccessOpenIDPacket))
-		return false;
-
-	if (!kAuthSuccessOpenIDPacket.bResult)
-	{
-		if (m_poHandler)
-			PyCallClassMemberFunc(m_poHandler, "OnLoginFailure", Py_BuildValue("(s)", "BESAMEKEY"));
-	}
-	else
-	{
-		DWORD dwPanamaKey = kAuthSuccessOpenIDPacket.dwLoginKey ^ g_adwEncryptKey[0] ^ g_adwEncryptKey[1] ^ g_adwEncryptKey[2] ^ g_adwEncryptKey[3];
-		CEterPackManager::instance().DecryptPackIV(dwPanamaKey);
-
-		CPythonNetworkStream & rkNet = CPythonNetworkStream::Instance();
-		rkNet.SetLoginInfo(kAuthSuccessOpenIDPacket.login, "0000");		//OpenID 인증 과정에서 비밀번호는 사용되지 않는다.
-		rkNet.SetLoginKey(kAuthSuccessOpenIDPacket.dwLoginKey);
-		rkNet.Connect(m_strAddr.c_str(), m_iPort);
-	}
-
-	Disconnect();
-	__OfflineState_Set();
-
-	return true;
-}
-#endif /* USE_OPENID */
-
-
 bool CAccountConnector::__AuthState_RecvAuthFailure()
 {
 	TPacketGCLoginFailure packet_failure;

src/UserInterface/AccountConnector.h

@@ -52,9 +52,6 @@ class CAccountConnector : public CNetworkStream, public CSingleton<CAccountConne
 		bool __AuthState_RecvPing();
 		bool __AuthState_SendPong();
 		bool __AuthState_RecvAuthSuccess();
-#ifdef USE_OPENID
-		bool __AuthState_RecvAuthSuccess_OpenID();
-#endif /* USE_OPENID */
 		bool __AuthState_RecvAuthFailure();
 		bool __AuthState_RecvChinaMatrixCard();
 		bool __AuthState_RecvRunupMatrixQuiz();

src/UserInterface/Locale.cpp

@@ -419,23 +419,3 @@ int LocaleService_StringCompareCI( LPCSTR szStringLeft, LPCSTR szStringRight, si
 	return strnicmp( szStringLeft, szStringRight, sizeLength );
 }
 #endif
-
-
-#ifdef USE_OPENID
-
-std::string __OPENID_AUTH_KEY_STRING__;
-int openid_test = 0;
-
-void LocaleService_SetOpenIDAuthKey(const char *authKey)
-{
-	 __OPENID_AUTH_KEY_STRING__ = authKey;
-
-	 return;
-}
-
-const char*	LocaleService_GetOpenIDAuthKey()
-{
-	return __OPENID_AUTH_KEY_STRING__.c_str();
-}
-
-#endif /* USE_OPENID */

src/UserInterface/Locale.h

@@ -29,8 +29,3 @@ int			LocaleService_GetSkillPower(unsigned level);
 void		LocaleService_SetCHEONMA(bool isEnable);
 bool		LocaleService_IsCHEONMA();
 // END_OF_CHEONMA
-
-#ifdef USE_OPENID
-void LocaleService_SetOpenIDAuthKey(const char *authKey);
-const char*	LocaleService_GetOpenIDAuthKey();
-#endif

src/UserInterface/Locale_inc_JP.h

@@ -3,4 +3,3 @@
 #define LSS_SECURITY_KEY		"1234abcd5678efgh"
 #define ENABLE_COSTUME_SYSTEM
 #define ENABLE_ENERGY_SYSTEM
-#define USE_OPENID

src/UserInterface/Packet.h

@@ -139,7 +139,6 @@ enum
 	HEADER_CG_GUILD_SYMBOL_CRC					= 113,
 	HEADER_CG_SCRIPT_SELECT_ITEM				= 114,
 	HEADER_CG_LOGIN4							= 115,
-	HEADER_CG_LOGIN5_OPENID						= 116,	//OpenID : 실행시 받은 인증키를 서버에 보냄.
 
 	HEADER_CG_RUNUP_MATRIX_ANSWER               = 201,
 	HEADER_CG_NEWCIBN_PASSPOD_ANSWER			= 202,
@@ -324,8 +323,6 @@ enum
 	HEADER_GC_HYBRIDCRYPT_SDB					= 153, // SDB means Supplmentary Data Blocks
 	//HYBRID CRYPT
 
-	HEADER_GC_AUTH_SUCCESS_OPENID				= 154,
-
 	HEADER_GC_RUNUP_MATRIX_QUIZ                 = 201,
 	HEADER_GC_NEWCIBN_PASSPOD_REQUEST			= 202,
 	HEADER_GC_NEWCIBN_PASSPOD_FAILURE			= 203,
@@ -414,8 +411,6 @@ enum
 
 	WEAR_MAX_NUM = 11,
 
-	OPENID_AUTHKEY_LEN = 32,
-
 	SHOP_TAB_NAME_MAX = 32,
 	SHOP_TAB_COUNT_MAX = 3,
 };
@@ -551,14 +546,6 @@ typedef struct command_login3
     uint32_t	adwClientKey[4];
 } TPacketCGLogin3;
 
-typedef struct command_login5
-{
-    uint8_t	header;
-    char	authKey[OPENID_AUTHKEY_LEN + 1];
-    uint32_t	adwClientKey[4];
-} TPacketCGLogin5;
-// end - 권한 서버 접속을 위한 패킷들
-
 typedef struct command_direct_enter
 {
     uint8_t        bHeader;
@@ -2465,14 +2452,6 @@ typedef struct packet_auth_success
     uint8_t        bResult;
 } TPacketGCAuthSuccess;
 
-typedef struct packet_auth_success_openid
-{
-    uint8_t        bHeader;
-    uint32_t       dwLoginKey;
-    uint8_t        bResult;
-	char		login[ID_MAX_NUM + 1];
-} TPacketGCAuthSuccessOpenID;
-
 typedef struct packet_channel
 {
     uint8_t header;

src/UserInterface/PythonApplicationModule.cpp

@@ -10,10 +10,6 @@ extern BOOL bVisibleNotice = true;
 extern BOOL bTestServerFlag = FALSE;
 extern int TWOHANDED_WEWAPON_ATT_SPEED_DECREASE_VALUE = 0;
 
-#ifdef USE_OPENID
-extern int openid_test;
-#endif
-
 PyObject* appShowWebPage(PyObject* poSelf, PyObject* poArgs)
 {
 	char* szWebPage;
@@ -1497,14 +1493,6 @@ void initapp()
 	PyModule_AddIntConstant(poModule, "ENABLE_NEW_EQUIPMENT_SYSTEM",	0);
 #endif
 
-#ifdef USE_OPENID
-	PyModule_AddIntConstant(poModule, "USE_OPENID",	1);
-	if (openid_test)
-		PyModule_AddIntConstant(poModule, "OPENID_TEST",	1);
-	else
-		PyModule_AddIntConstant(poModule, "OPENID_TEST",	0);
-#else
 	PyModule_AddIntConstant(poModule, "USE_OPENID",	0);
 	PyModule_AddIntConstant(poModule, "OPENID_TEST",	0);
-#endif /* USE_OPENID */
 }

src/UserInterface/PythonNetworkStream.cpp

@@ -154,7 +154,6 @@ class CMainPacketHeaderMap : public CNetworkPacketHeaderMap
 			Set(HEADER_GC_LOGIN_KEY, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCLoginKey), STATIC_SIZE_PACKET));
 
 			Set(HEADER_GC_AUTH_SUCCESS, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCAuthSuccess), STATIC_SIZE_PACKET));
-			Set(HEADER_GC_AUTH_SUCCESS_OPENID, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCAuthSuccessOpenID), STATIC_SIZE_PACKET));
 			Set(HEADER_GC_CHANNEL, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCChannel), STATIC_SIZE_PACKET));
 			Set(HEADER_GC_VIEW_EQUIP, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCViewEquip), STATIC_SIZE_PACKET));
 			Set(HEADER_GC_LAND_LIST, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCLandList), DYNAMIC_SIZE_PACKET));

src/UserInterface/PythonSystem.cpp

@@ -286,11 +286,7 @@ void CPythonSystem::SetDefaultConfig()
 	m_Config.height				= 768;
 	m_Config.bpp				= 32;
 
-#if defined( LOCALE_SERVICE_WE_JAPAN )
-	m_Config.bWindowed			= true;
-#else
 	m_Config.bWindowed			= false;
-#endif
 
 	m_Config.is_software_cursor	= false;
 	m_Config.is_object_culling	= true;

src/UserInterface/UserInterface.cpp

@@ -25,10 +25,6 @@ bool __IS_TEST_SERVER_MODE__=false;
 
 extern bool SetDefaultCodePage(DWORD codePage);
 
-#ifdef USE_OPENID
-extern int openid_test;
-#endif
-
 static const char * sc_apszPythonLibraryFilenames[] =
 {
 	"UserDict.pyc",
@@ -464,20 +460,6 @@ bool __IsLocaleVersion(LPSTR lpCmdLine)
 	return (strcmp(lpCmdLine, "--perforce-revision") == 0);
 }
 
-#ifdef USE_OPENID
-//2012.07.16 김용욱
-//일본 OpenID 지원. 인증키 인자 추가
-bool __IsOpenIDAuthKeyOption(LPSTR lpCmdLine)
-{
-	return (strcmp(lpCmdLine, "--openid-authkey") == 0);
-}
-
-bool __IsOpenIDTestOption(LPSTR lpCmdLine) //클라이언트에서 로그인이 가능하다.
-{
-	return (strcmp(lpCmdLine, "--openid-test") == 0);
-}
-#endif /* USE_OPENID */
-
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
 #ifdef _DEBUG
@@ -491,7 +473,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 	SetDefaultCodePage(LocaleService_GetCodePage());	
 
 	bool bQuit = false;
-	bool bAuthKeyChecked = false;	//OpenID 버전에서 인증키가 들어왔는지 알기 위한 인자.
 	int nArgc = 0;
 	PCHAR* szArgv = CommandLineToArgv( lpCmdLine, &nArgc );
 
@@ -537,44 +518,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 
 			LocaleService_ForceSetLocale(localeName, localePath);
 		}
-#ifdef USE_OPENID
-		else if (__IsOpenIDAuthKeyOption(szArgv[i]))	//2012.07.16 OpenID : 김용욱
-		{
-			// 인증키 설정엔 인자가 한 개 더 필요함 (인증키)
-			if (nArgc <= i + 1)
-			{
-				MessageBox(NULL, "Invalid arguments", ApplicationStringTable_GetStringz(IDS_APP_NAME, "APP_NAME"), MB_ICONSTOP);
-				goto Clean;
-			}
-
-			const char* authKey = szArgv[++i];
-
-			//ongoing (2012.07.16)
-			//인증키 저장하는 부분
-			LocaleService_SetOpenIDAuthKey(authKey);
-
-			bAuthKeyChecked = true;
-		}
-		else if (__IsOpenIDTestOption(szArgv[i]))
-		{
-			openid_test = 1;
-
-		}
-#endif /* USE_OPENID */
 	}
 
-#ifdef USE_OPENID
-	//OpenID
-	//OpenID 클라이언트의 경우인증키를 받아오지 않을 경우 (웹을 제외하고 실행 시) 클라이언트 종료.
-	
-	if (false == bAuthKeyChecked && !openid_test)
-	{
-		MessageBox(NULL, "Invalid execution", ApplicationStringTable_GetStringz(IDS_APP_NAME, "APP_NAME"), MB_ICONSTOP);
-		goto Clean;
-	}
-#endif /* USE_OPENID */
-
-
 	if(bQuit)
 		goto Clean;