Applied source code semantic modification.

Removed unusable function.
multitheftauto · Jan 16, 2016 · 008c70f · 008c70f
1 parent 375c775
commit 008c70f
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 26 deletions.
diff --git a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Resource.cpp b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Resource.cpp
@@ -427,10 +427,10 @@ int CLuaFunctionDefs::LoadString( lua_State* luaVM )
         const char* cpInBuffer = strInput;
         uint uiInSize = strInput.length();
 
-        // Decrypt if required
+        // Deobfuscate if required
         const char* cpBuffer;
         uint uiSize;
-        if ( !g_pNet->DecryptScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, m_pResourceManager->GetResourceName( luaVM ) + "/loadstring" ) )
+        if ( !g_pNet->DeobfuscateScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, m_pResourceManager->GetResourceName( luaVM ) + "/loadstring" ) )
         {
             SString strMessage( "argument 1 is invalid. Please re-compile at http://luac.mtasa.com/", 0 ); 
             argStream.SetCustomError( strMessage );
@@ -500,10 +500,10 @@ int CLuaFunctionDefs::Load( lua_State* luaVM )
         const char* cpInBuffer = strInput;
         uint uiInSize = strInput.length();
 
-        // Decrypt if required
+        // Deobfuscate if required
         const char* cpBuffer;
         uint uiSize;
-        if ( !g_pNet->DecryptScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, m_pResourceManager->GetResourceName( luaVM ) + "/load" ) )
+        if ( !g_pNet->DeobfuscateScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, m_pResourceManager->GetResourceName( luaVM ) + "/load" ) )
         {
             SString strMessage( "argument 2 is invalid. Please re-compile at http://luac.mtasa.com/", 0 ); 
             argStream.SetCustomError( strMessage );

diff --git a/MTA10/mods/shared_logic/lua/CLuaMain.cpp b/MTA10/mods/shared_logic/lua/CLuaMain.cpp
@@ -2004,10 +2004,10 @@ bool CLuaMain::LoadScriptFromBuffer ( const char* cpInBuffer, unsigned int uiInS
 {
     SString strNiceFilename = ConformResourcePath( szFileName );
 
-    // Decrypt if required
+    // Deobfuscate if required
     const char* cpBuffer;
     uint uiSize;
-    if ( !g_pNet->DecryptScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, strNiceFilename ) )
+    if ( !g_pNet->DeobfuscateScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, strNiceFilename ) )
     {
         SString strMessage( "%s is invalid. Please re-compile at http://luac.mtasa.com/", *strNiceFilename ); 
         g_pClientGame->GetScriptDebugging()->LogError ( m_luaVM, "Loading script failed: %s", *strMessage );

diff --git a/MTA10/sdk/net/CNet.h b/MTA10/sdk/net/CNet.h
@@ -128,7 +128,7 @@ class CNet
     virtual bool                        ValidateBinaryFileName      ( const char* szFilename ) = 0;
     virtual CBinaryFileInterface*       AllocateBinaryFile          ( void ) = 0;
     virtual bool                        EncryptDumpfile             ( const char* szClearPathFilename, const char* szEncryptedPathFilename ) = 0;
-    virtual bool                        DecryptScript               ( const char* cpInBuffer, uint uiInSize, const char** pcpOutBuffer, uint* puiOutSize, const char* szScriptName ) = 0;
+    virtual bool                        DeobfuscateScript           ( const char* cpInBuffer, uint uiInSize, const char** pcpOutBuffer, uint* puiOutSize, const char* szScriptName ) = 0;
     virtual void                        PostCrash                   ( void ) = 0;
     virtual int                         SendTo                      ( SOCKET s, const char* buf, int len, int flags, const struct sockaddr* to, int tolen ) = 0;
 };

diff --git a/MTA10_Server/mods/deathmatch/logic/CResourceChecker.cpp b/MTA10_Server/mods/deathmatch/logic/CResourceChecker.cpp
@@ -400,8 +400,8 @@ void CResourceChecker::CheckLuaFileForIssues ( const string& strPath, const stri
     if ( strFileContents.length () == 0 )
         return;
 
-    // Update decrypt version requirements, and do no more checking if encrypted
-    if ( CheckLuaDecryptRequirements( strFileContents, strFileName, strResourceName, bClientScript ) )
+    // Update deobfuscate version requirements, and do no more checking if obfuscated
+    if ( CheckLuaDeobfuscateRequirements( strFileContents, strFileName, strResourceName, bClientScript ) )
         return;
 
     // Check if a compiled script
@@ -446,12 +446,12 @@ void CResourceChecker::CheckLuaFileForIssues ( const string& strPath, const stri
 
 ///////////////////////////////////////////////////////////////
 //
-// CResourceChecker::CheckLuaDecryptRequirements
+// CResourceChecker::CheckLuaDeobfuscateRequirements
 //
-// Updates version requirements and returns true if encrypted
+// Updates version requirements and returns true if obfuscated
 //
 ///////////////////////////////////////////////////////////////
-bool CResourceChecker::CheckLuaDecryptRequirements ( const string& strFileContents, const string& strFileName, const string& strResourceName, bool bClientScript )
+bool CResourceChecker::CheckLuaDeobfuscateRequirements ( const string& strFileContents, const string& strFileName, const string& strResourceName, bool bClientScript )
 {
     // Get embedded version requirements
     SScriptInfo scriptInfo;
@@ -495,7 +495,7 @@ bool CResourceChecker::CheckLuaDecryptRequirements ( const string& strFileConten
         m_strReqServerReason = strFileName;
     }
 
-    return IsLuaEncryptedScript( strFileContents.c_str(), strFileContents.length() );
+    return IsLuaObfuscatedScript( strFileContents.c_str(), strFileContents.length() );
 }
 
 

diff --git a/MTA10_Server/mods/deathmatch/logic/CResourceChecker.h b/MTA10_Server/mods/deathmatch/logic/CResourceChecker.h
@@ -58,7 +58,7 @@ class CResourceChecker
     void                CheckMetaFileForIssues          ( const string& strPath, const string& strFileName, const string& strResourceName );
     void                CheckMetaSourceForIssues        ( CXMLNode* pRootNode, const string& strFileName, const string& strResourceName, ECheckerModeType checkerMode, bool* pbOutHasChanged = NULL );
     void                CheckLuaFileForIssues           ( const string& strPath, const string& strFileName, const string& strResourceName, bool bClientScript );
-    bool                CheckLuaDecryptRequirements     ( const string& strFileContents, const string& strFileName, const string& strResourceName, bool bClientScript );
+    bool                CheckLuaDeobfuscateRequirements ( const string& strFileContents, const string& strFileName, const string& strResourceName, bool bClientScript );
     void                CheckLuaSourceForIssues         ( string strLuaSource, const string& strFileName, const string& strResourceName, bool bClientScript, bool bCompiledScript, ECheckerModeType checkerMode, string* pstrOutResult = NULL );
     long                FindLuaIdentifier               ( const char* szLuaSource, long* plOutLength, long* plLineNumber );
     bool                UpgradeLuaFunctionName          ( const string& strFunctionName, bool bClientScript, string& strOutUpgraded );

diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaMain.cpp b/MTA10_Server/mods/deathmatch/logic/lua/CLuaMain.cpp
@@ -297,10 +297,10 @@ bool CLuaMain::LoadScriptFromBuffer ( const char* cpInBuffer, unsigned int uiInS
 {
     SString strNiceFilename = ConformResourcePath( szFileName );
 
-    // Decrypt if required
+    // Deobfuscate if required
     const char* cpBuffer;
     uint uiSize;
-    if ( !g_pRealNetServer->DecryptScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, strNiceFilename ) )
+    if ( !g_pRealNetServer->DeobfuscateScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, strNiceFilename ) )
     {
         SString strMessage( "%s is invalid. Please re-compile at http://luac.mtasa.com/", *strNiceFilename ); 
         g_pGame->GetScriptDebugging()->LogError ( m_luaVM, "Loading script failed: %s", *strMessage );

diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp
@@ -1295,10 +1295,10 @@ int CLuaResourceDefs::LoadString( lua_State* luaVM )
         const char* cpInBuffer = strInput;
         uint uiInSize = strInput.length();
 
-        // Decrypt if required
+        // Deobfuscate if required
         const char* cpBuffer;
         uint uiSize;
-        if ( !g_pRealNetServer->DecryptScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, m_pResourceManager->GetResourceName( luaVM ) + "/loadstring" ) )
+        if ( !g_pRealNetServer->DeobfuscateScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, m_pResourceManager->GetResourceName( luaVM ) + "/loadstring" ) )
         {
             SString strMessage( "argument 1 is invalid. Please re-compile at http://luac.mtasa.com/", 0 ); 
             argStream.SetCustomError( strMessage );
@@ -1368,10 +1368,10 @@ int CLuaResourceDefs::Load( lua_State* luaVM )
         const char* cpInBuffer = strInput;
         uint uiInSize = strInput.length();
 
-        // Decrypt if required
+        // Deobfuscate if required
         const char* cpBuffer;
         uint uiSize;
-        if ( !g_pRealNetServer->DecryptScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, m_pResourceManager->GetResourceName( luaVM ) + "/load" ) )
+        if ( !g_pRealNetServer->DeobfuscateScript( cpInBuffer, uiInSize, &cpBuffer, &uiSize, m_pResourceManager->GetResourceName( luaVM ) + "/load" ) )
         {
             SString strMessage( "argument 2 is invalid. Please re-compile at http://luac.mtasa.com/", 0 ); 
             argStream.SetCustomError( strMessage );

diff --git a/MTA10_Server/sdk/net/CNetServer.h b/MTA10_Server/sdk/net/CNetServer.h
@@ -144,7 +144,7 @@ class CNetServer
     virtual bool                            EncryptDumpfile                 ( const char* szClearPathFilename, const char* szEncryptedPathFilename ) { return false; }
     virtual bool                            ValidateHttpCacheFileName       ( const char* szFilename ) { return false; }
     virtual bool                            GetScriptInfo                   ( const char* cpInBuffer, uint uiInSize, SScriptInfo* pOutInfo ) { return false; }
-    virtual bool                            DecryptScript                   ( const char* cpInBuffer, uint uiInSize, const char** pcpOutBuffer, uint* puiOutSize, const char* szScriptName ) { return false; }
+    virtual bool                            DeobfuscateScript               ( const char* cpInBuffer, uint uiInSize, const char** pcpOutBuffer, uint* puiOutSize, const char* szScriptName ) { return false; }
     virtual bool                            GetPlayerPacketUsageStats       ( uchar* packetIdList, uint uiNumPacketIds, SPlayerPacketUsage* pOutStats, uint uiTopCount ) { return false; }
     virtual const char*                     GetLogOutput                    ( void )                                    { return NULL; }
     virtual bool                            IsValidSocket                   ( const NetServerPlayerID& playerID )       { assert( 0 ); return false; }

diff --git a/Shared/sdk/SharedUtil.Misc.h b/Shared/sdk/SharedUtil.Misc.h
@@ -216,7 +216,7 @@ namespace SharedUtil
 
     // Buffer identification
     bool IsLuaCompiledScript( const void* pData, uint uiLength );
-    bool IsLuaEncryptedScript( const void* pData, uint uiLength );
+    bool IsLuaObfuscatedScript( const void* pData, uint uiLength );
 
     //
     // Some templates

diff --git a/Shared/sdk/SharedUtil.Misc.hpp b/Shared/sdk/SharedUtil.Misc.hpp
@@ -1340,8 +1340,8 @@ bool SharedUtil::IsLuaCompiledScript( const void* pData, uint uiLength )
     return ( uiLength > 0 && pCharData[0] == 0x1B );    // Do the same check as what the Lua parser does
 }
 
-// Check for encypted script
-bool SharedUtil::IsLuaEncryptedScript( const void* pData, uint uiLength )
+// Check for obfuscated script
+bool SharedUtil::IsLuaObfuscatedScript( const void* pData, uint uiLength )
 {
     const uchar* pCharData = (const uchar*)pData;
     return ( uiLength > 0 && pCharData[0] == 0x1C );    // Look for our special marker

diff --git a/vendor/lua/src/lapi.c b/vendor/lua/src/lapi.c
@@ -898,6 +898,7 @@ LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data,
 }
 
 
+#ifdef WITH_STRING_DUMP
 LUA_API int lua_dump (lua_State *L, lua_Writer writer, void *data) {
   int status;
   TValue *o;
@@ -911,7 +912,7 @@ LUA_API int lua_dump (lua_State *L, lua_Writer writer, void *data) {
   lua_unlock(L);
   return status;
 }
-
+#endif
 
 LUA_API int  lua_status (lua_State *L) {
   return L->status;

diff --git a/vendor/lua/src/ldump.c b/vendor/lua/src/ldump.c
@@ -14,6 +14,7 @@
 #include "lobject.h"
 #include "lstate.h"
 #include "lundump.h"
+#ifdef WITH_STRING_DUMP
 
 typedef struct {
  lua_State* L;
@@ -162,3 +163,5 @@ int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip
  DumpFunction(f,NULL,&D);
  return D.status;
 }
+
+#endif  //  WITH_STRING_DUMP
diff --git a/vendor/lua/src/lstrlib.c b/vendor/lua/src/lstrlib.c
@@ -144,6 +144,7 @@ static int writer (lua_State *L, const void* b, size_t size, void* B) {
 }
 
 
+#ifdef WITH_STRING_DUMP
 static int str_dump (lua_State *L) {
   luaL_Buffer b;
   luaL_checktype(L, 1, LUA_TFUNCTION);
@@ -154,7 +155,7 @@ static int str_dump (lua_State *L) {
   luaL_pushresult(&b);
   return 1;
 }
-
+#endif
 
 
 /*
@@ -827,7 +828,9 @@ static int str_format (lua_State *L) {
 static const luaL_Reg strlib[] = {
   {"byte", str_byte},
   {"char", str_char},
+#ifdef WITH_STRING_DUMP
   {"dump", str_dump},
+#endif
   {"find", str_find},
   {"format", str_format},
   {"gfind", gfind_nodef},