From bae7ecf012a5d90bdeb1a7ff0a9ddeafbb62cccb Mon Sep 17 00:00:00 2001 From: ultramage Date: Mon, 4 May 2009 12:29:54 +0000 Subject: [PATCH] Reverted the "The md5() of their kafra code is now stored in #kafra_code$" change from r13728. Added md5calc to vs8/vs7/vs6 project files. Applied svn:eol-style to the new sql upgrade file. Note that if you already applied the sql upgrade, your kafra passwords are lost. Also note that txt users will still have to implement their own migration code into the kafra scripts since it was omitted in the previous commits. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13729 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 1 - npc/custom/eAAC_Scripts/quest_warper.txt | 5 ++--- npc/kafras/functions_kafras.txt | 15 +++++++-------- sql-files/upgrade_svn13719.sql | 2 +- sql-files/upgrade_svn13728.sql | 1 - vcproj-6/map-server_sql.dsp | 8 ++++++++ vcproj-6/map-server_txt.dsp | 8 ++++++++ vcproj-7.1/map-server_sql.vcproj | 6 ++++++ vcproj-7.1/map-server_txt.vcproj | 6 ++++++ vcproj-8/map-server_sql.vcproj | 8 ++++++++ vcproj-8/map-server_txt.vcproj | 8 ++++++++ 11 files changed, 54 insertions(+), 14 deletions(-) delete mode 100644 sql-files/upgrade_svn13728.sql diff --git a/npc/Changelog.txt b/npc/Changelog.txt index b79a4ee6bb..0bd383e2e6 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,7 +1,6 @@ Date Added ====== 2009/05/04 - - The md5 checksum of the kafra code is now stored in #kafra_code$ [brianluau] - Added a missing zeny check in the Jawaii Bartender. (bugreport:2897) [brianluau] - Added a missing 'close' in the Mage quest Bookshelf. (bugreport:2873) 2009/05/03 diff --git a/npc/custom/eAAC_Scripts/quest_warper.txt b/npc/custom/eAAC_Scripts/quest_warper.txt index 650ee3a6ed..7ff06cd2eb 100644 --- a/npc/custom/eAAC_Scripts/quest_warper.txt +++ b/npc/custom/eAAC_Scripts/quest_warper.txt @@ -71,7 +71,6 @@ // - Special warpname menu option name bug fixed //-2.1 Updated names to fall within retrictions. [L0ne_W0lf] //-2.2 #kafra_code is now stored as is. [brianluau] -//-2.2b The md5() of their kafra code is now stored in #kafra_code$ [brianluau] //================================================================= //========================Function=&=Script======================== @@ -598,11 +597,11 @@ L_Storage: end; F_CheckKafCode: - if(#kafra_code$=="") return; + if(#kafra_code==0) return; mes "Enter your storage password:"; set @code_,0; input @code_; - if(md5(@code_) != #kafra_code$) { + if(@code_ != #kafra_code) { dispbottom "Wrong storage password."; close; } diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 56382a31f8..4b65bbc9aa 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -58,7 +58,6 @@ //= 6.1 Added menu for Turbo Track Kafra Staff. [L0ne_W0lf] //= 6.2 Updated/Fixed warp cords. [Kisuka] //= 6.3 #kafra_code is now stored as is. [brianluau] -//= 6.3b The md5() of their kafra code is now stored in #kafra_code$ [brianluau] //============================================================ @@ -558,11 +557,11 @@ function script F_KafEnd { // Check Storage Password Function ==================== function script F_CheckKafCode { - if(#kafra_code$=="") return; + if(#kafra_code==0) return; mes "Enter your storage password:"; set @code_,0; input @code_; - if(md5(@code_) != #kafra_code$) { + if(@code_ != #kafra_code) { dispbottom "Wrong storage password."; close2; cutin "",255; @@ -577,7 +576,7 @@ function script F_CheckKafCode { // getarg(0) = NPC Name, getarg(1) = Company Name function script F_SetKafCode { mes getarg(0); - if(#kafra_code$) { + if(#kafra_code) { mes "Your storage is protected with a password. What would you do now?"; next; menu "Change old password -> 5000z",-, @@ -594,7 +593,7 @@ function script F_SetKafCode { mes getarg(0); mes "At first, please enter your ^0000FFold password^000000."; set @code,callfunc("F_EntKafCode"); - if(@code==0 || md5(@code) != #kafra_code$) { + if(@code==0 || @code != #kafra_code) { mes "Wrong password. You can't set a new password."; emotion e_hmm; goto M_END; @@ -616,7 +615,7 @@ M_SET: set Zeny,Zeny-5000; //set RESRVPTS, RESRVPTS + (5000/50); //hardcoded password doesn't add pts - set #kafra_code$,md5(@code); + set #kafra_code,@code; mes "You've protected your storage with a secret password."; mes "Thank you for using "+getarg(1)+"."; emotion e_thx; @@ -636,8 +635,8 @@ M_CLEAR: if(Zeny < 1000) goto L_ZENY; set Zeny,Zeny-1000; //set RESRVPTS, RESRVPTS + (1000/50); //hardcoded password doesn't add pts - if(md5(@code) == #kafra_code$) { - set #kafra_code$,""; + if(@code == #kafra_code) { + set #kafra_code,0; mes "You've successfully cleared your storage password."; mes "Thank you for using "+getarg(1)+"."; emotion e_thx; diff --git a/sql-files/upgrade_svn13719.sql b/sql-files/upgrade_svn13719.sql index 5039ece6c0..478bca3214 100644 --- a/sql-files/upgrade_svn13719.sql +++ b/sql-files/upgrade_svn13719.sql @@ -1 +1 @@ -UPDATE `global_reg_value` SET `value` = (`value` - `account_id` - 1337) WHERE `str` = '#kafra_code'; +UPDATE `global_reg_value` SET `value` = (`value` - `account_id` - 1337) WHERE `str` = '#kafra_code'; diff --git a/sql-files/upgrade_svn13728.sql b/sql-files/upgrade_svn13728.sql deleted file mode 100644 index 6dc8301a56..0000000000 --- a/sql-files/upgrade_svn13728.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `global_reg_value` SET `str`='#kafra_code$',`value`=MD5(`value`) WHERE `str` = '#kafra_code'; diff --git a/vcproj-6/map-server_sql.dsp b/vcproj-6/map-server_sql.dsp index 511cebc98f..c6e278a857 100644 --- a/vcproj-6/map-server_sql.dsp +++ b/vcproj-6/map-server_sql.dsp @@ -107,6 +107,14 @@ SOURCE=..\src\common\malloc.h # End Source File # Begin Source File +SOURCE=..\src\common\md5calc.c +# End Source File +# Begin Source File + +SOURCE=..\src\common\md5calc.h +# End Source File +# Begin Source File + SOURCE=..\src\common\mapindex.c # End Source File # Begin Source File diff --git a/vcproj-6/map-server_txt.dsp b/vcproj-6/map-server_txt.dsp index 9e6a20edb5..32273e5527 100644 --- a/vcproj-6/map-server_txt.dsp +++ b/vcproj-6/map-server_txt.dsp @@ -107,6 +107,14 @@ SOURCE=..\src\common\malloc.h # End Source File # Begin Source File +SOURCE=..\src\common\md5calc.c +# End Source File +# Begin Source File + +SOURCE=..\src\common\md5calc.h +# End Source File +# Begin Source File + SOURCE=..\src\common\mapindex.c # End Source File # Begin Source File diff --git a/vcproj-7.1/map-server_sql.vcproj b/vcproj-7.1/map-server_sql.vcproj index b85d2f9c91..0cff5f3971 100644 --- a/vcproj-7.1/map-server_sql.vcproj +++ b/vcproj-7.1/map-server_sql.vcproj @@ -374,6 +374,12 @@ + + + + diff --git a/vcproj-7.1/map-server_txt.vcproj b/vcproj-7.1/map-server_txt.vcproj index 2ce386feed..a8e7eccf76 100644 --- a/vcproj-7.1/map-server_txt.vcproj +++ b/vcproj-7.1/map-server_txt.vcproj @@ -374,6 +374,12 @@ + + + + diff --git a/vcproj-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj index 9cbc76e505..80ce128e7c 100644 --- a/vcproj-8/map-server_sql.vcproj +++ b/vcproj-8/map-server_sql.vcproj @@ -255,6 +255,14 @@ RelativePath="..\src\common\malloc.h" > + + + + diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj index 7b33d0c9de..01a02027e2 100644 --- a/vcproj-8/map-server_txt.vcproj +++ b/vcproj-8/map-server_txt.vcproj @@ -502,6 +502,14 @@ RelativePath="..\src\common\malloc.h" > + + + +