Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Moved md5calc to common

Browse Source 
- Answered Skotlex's question and fixed "warning: comparison is always false due to limited range of data type" by restricting script words to ASCII characters only.
- Applied "svn:eol-style native" to makefiles and project files

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9544 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
FlavioJS 2006-12-21 01:16:30 +00:00
parent eb46c3aadc
commit 15258dfdb0
41 changed files with 4740 additions and 5238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -3,6 +3,10 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/12/21
* Fixed "warning: comparison is always false due to limited range of data type"
by restricting script words to ASCII characters only.
* Moved md5calc to common. [FlavioJS]
2006/12/20
* Fixed ISSPACE and ISALPHA casting their returned value to a char, which
can really mess up the scripting engine when the returned value is true,

5
src/common/Makefile
View File

@ -6,7 +6,7 @@ obj:
common: obj/core.o obj/socket.o obj/timer.o obj/db.o obj/plugins.o obj/lock.o \
obj/nullpo.o obj/malloc.o obj/showmsg.o obj/strlib.o obj/utils.o \
obj/graph.o obj/grfio.o obj/minicore.o obj/minisocket.o obj/minimalloc.o \
obj/mapindex.o obj/unz.o obj/ers.o
obj/mapindex.o obj/unz.o obj/ers.o obj/md5calc.o
obj/%.o: %.c
@ -21,7 +21,7 @@ obj/unz.o:
clean:
rm -rf *.o obj
rm -rf *.o obj GNUmakefile
HAVESVN = $(shell which svnversion)
@ -56,5 +56,6 @@ obj/showmsg.o: showmsg.c showmsg.h
obj/strlib.o: strlib.c strlib.h utils.h
obj/mapindex.o: mapindex.c mapindex.h
obj/utils.o: utils.c utils.h malloc.h showmsg.h mmo.h
obj/md5calc.o: md5calc.c md5calc.h
mmo.h: cbasetypes.h
@touch mmo.h

1
src/common/cbasetypes.h
View File

@ -291,5 +291,6 @@ typedef char bool;
#define TOLOWER(c) ((char)tolower((unsigned char)(c)))
#define ISSPACE(c) (isspace((unsigned char)(c)))
#define ISALPHA(c) (isalpha((unsigned char)(c)))
#define ISALNUM(c) (isalnum((unsigned char)(c)))
#endif /* _CBASETYPES_H_ */

0
src/login/md5calc.c → src/common/md5calc.c
View File

0
src/login/md5calc.h → src/common/md5calc.h
View File

13
src/ladmin/Makefile
View File

@ -2,18 +2,17 @@ all txt sql: ladmin
COMMON_OBJ = ../common/obj/minicore.o ../common/obj/minisocket.o ../common/obj/timer.o \
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/strlib.o \
../common/obj/utils.o
../common/obj/utils.o ../common/obj/md5calc.o
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
../common/version.h ../common/malloc.h ../common/showmsg.h ../common/strlib.h \
../common/utils.h
../common/utils.h ../common/md5calc.h
ladmin: ladmin.o md5calc.o $(COMMON_OBJ)
$(CC) -o ../../$@ ladmin.o md5calc.o $(COMMON_OBJ) $(LIB_S)
ladmin: ladmin.o $(COMMON_OBJ)
$(CC) -o ../../$@ ladmin.o $(COMMON_OBJ) $(LIB_S)
clean:
rm -f *.o ../../ladmin
rm -f *.o ../../ladmin GNUmakefile
# DO NOT DELETE
ladmin.o: ladmin.c ladmin.h md5calc.h $(COMMON_H)
md5calc.o: md5calc.c md5calc.h
ladmin.o: ladmin.c ladmin.h $(COMMON_H)

2
src/ladmin/ladmin.c
View File

@ -47,7 +47,7 @@ void Gettimeofday(struct timeval *timenow)
#include "../common/mmo.h"
#ifdef PASSWORDENC
#include "md5calc.h"
#include "../common/md5calc.h"
#endif
//-------------------------------INSTRUCTIONS------------------------------

239
src/ladmin/md5calc.c
View File

@ -1,239 +0,0 @@
// (c) eAthena Dev Team - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
/***********************************************************
* md5 calculation algorithm
*
* The source code referred to the following URL.
* http://www.geocities.co.jp/SiliconValley-Oakland/8878/lab17/lab17.html
*
***********************************************************/
#include "md5calc.h"
#include <string.h>
#include <stdio.h>
#ifndef UINT_MAX
#define UINT_MAX 4294967295U
#endif
// Global variable
static unsigned int *pX;
// Stirng Table
static const unsigned int T[] = {
0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, //0
0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, //4
0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, //8
0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, //12
0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, //16
0xd62f105d, 0x2441453, 0xd8a1e681, 0xe7d3fbc8, //20
0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, //24
0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, //28
0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, //32
0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, //36
0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x4881d05, //40
0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, //44
0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, //48
0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, //52
0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, //56
0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391 //60
};
// ROTATE_LEFT The left is made to rotate x [ n-bit ]. This is diverted as it is from RFC.
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
// The function used for other calculation
static unsigned int F(unsigned int X, unsigned int Y, unsigned int Z)
{
return (X & Y) | (~X & Z);
}
static unsigned int G(unsigned int X, unsigned int Y, unsigned int Z)
{
return (X & Z) | (Y & ~Z);
}
static unsigned int H(unsigned int X, unsigned int Y, unsigned int Z)
{
return X ^ Y ^ Z;
}
static unsigned int I(unsigned int X, unsigned int Y, unsigned int Z)
{
return Y ^ (X | ~Z);
}
static unsigned int Round(unsigned int a, unsigned int b, unsigned int FGHI,
unsigned int k, unsigned int s, unsigned int i)
{
return b + ROTATE_LEFT(a + FGHI + pX[k] + T[i], s);
}
static void Round1(unsigned int *a, unsigned int b, unsigned int c,
unsigned int d,unsigned int k, unsigned int s, unsigned int i)
{
*a = Round(*a, b, F(b,c,d), k, s, i);
}
static void Round2(unsigned int *a, unsigned int b, unsigned int c,
unsigned int d,unsigned int k, unsigned int s, unsigned int i)
{
*a = Round(*a, b, G(b,c,d), k, s, i);
}
static void Round3(unsigned int *a, unsigned int b, unsigned int c,
unsigned int d,unsigned int k, unsigned int s, unsigned int i)
{
*a = Round(*a, b, H(b,c,d), k, s, i);
}
static void Round4(unsigned int *a, unsigned int b, unsigned int c,
unsigned int d,unsigned int k, unsigned int s, unsigned int i)
{
*a = Round(*a, b, I(b,c,d), k, s, i);
}
static void MD5_Round_Calculate(const unsigned char *block,
unsigned int *A2, unsigned int *B2, unsigned int *C2, unsigned int *D2)
{
//create X It is since it is required.
unsigned int X[16]; //512bit 64byte
int j,k;
//Save A as AA, B as BB, C as CC, and and D as DD (saving of A, B, C, and D)
unsigned int A=*A2, B=*B2, C=*C2, D=*D2;
unsigned int AA = A,BB = B,CC = C,DD = D;
//It is a large region variable reluctantly because of calculation of a round. . . for Round1...4
pX = X;
//Copy block(padding_message) i into X
for (j=0,k=0; j<64; j+=4,k++)
X[k] = ( (unsigned int )block[j] ) // 8byte*4 -> 32byte conversion
| ( ((unsigned int )block[j+1]) << 8 ) // A function called Decode as used in the field of RFC
| ( ((unsigned int )block[j+2]) << 16 )
| ( ((unsigned int )block[j+3]) << 24 );
//Round 1
Round1(&A,B,C,D, 0, 7, 0); Round1(&D,A,B,C, 1, 12, 1); Round1(&C,D,A,B, 2, 17, 2); Round1(&B,C,D,A, 3, 22, 3);
Round1(&A,B,C,D, 4, 7, 4); Round1(&D,A,B,C, 5, 12, 5); Round1(&C,D,A,B, 6, 17, 6); Round1(&B,C,D,A, 7, 22, 7);
Round1(&A,B,C,D, 8, 7, 8); Round1(&D,A,B,C, 9, 12, 9); Round1(&C,D,A,B, 10, 17, 10); Round1(&B,C,D,A, 11, 22, 11);
Round1(&A,B,C,D, 12, 7, 12); Round1(&D,A,B,C, 13, 12, 13); Round1(&C,D,A,B, 14, 17, 14); Round1(&B,C,D,A, 15, 22, 15);
//Round 2
Round2(&A,B,C,D, 1, 5, 16); Round2(&D,A,B,C, 6, 9, 17); Round2(&C,D,A,B, 11, 14, 18); Round2(&B,C,D,A, 0, 20, 19);
Round2(&A,B,C,D, 5, 5, 20); Round2(&D,A,B,C, 10, 9, 21); Round2(&C,D,A,B, 15, 14, 22); Round2(&B,C,D,A, 4, 20, 23);
Round2(&A,B,C,D, 9, 5, 24); Round2(&D,A,B,C, 14, 9, 25); Round2(&C,D,A,B, 3, 14, 26); Round2(&B,C,D,A, 8, 20, 27);
Round2(&A,B,C,D, 13, 5, 28); Round2(&D,A,B,C, 2, 9, 29); Round2(&C,D,A,B, 7, 14, 30); Round2(&B,C,D,A, 12, 20, 31);
//Round 3
Round3(&A,B,C,D, 5, 4, 32); Round3(&D,A,B,C, 8, 11, 33); Round3(&C,D,A,B, 11, 16, 34); Round3(&B,C,D,A, 14, 23, 35);
Round3(&A,B,C,D, 1, 4, 36); Round3(&D,A,B,C, 4, 11, 37); Round3(&C,D,A,B, 7, 16, 38); Round3(&B,C,D,A, 10, 23, 39);
Round3(&A,B,C,D, 13, 4, 40); Round3(&D,A,B,C, 0, 11, 41); Round3(&C,D,A,B, 3, 16, 42); Round3(&B,C,D,A, 6, 23, 43);
Round3(&A,B,C,D, 9, 4, 44); Round3(&D,A,B,C, 12, 11, 45); Round3(&C,D,A,B, 15, 16, 46); Round3(&B,C,D,A, 2, 23, 47);
//Round 4
Round4(&A,B,C,D, 0, 6, 48); Round4(&D,A,B,C, 7, 10, 49); Round4(&C,D,A,B, 14, 15, 50); Round4(&B,C,D,A, 5, 21, 51);
Round4(&A,B,C,D, 12, 6, 52); Round4(&D,A,B,C, 3, 10, 53); Round4(&C,D,A,B, 10, 15, 54); Round4(&B,C,D,A, 1, 21, 55);
Round4(&A,B,C,D, 8, 6, 56); Round4(&D,A,B,C, 15, 10, 57); Round4(&C,D,A,B, 6, 15, 58); Round4(&B,C,D,A, 13, 21, 59);
Round4(&A,B,C,D, 4, 6, 60); Round4(&D,A,B,C, 11, 10, 61); Round4(&C,D,A,B, 2, 15, 62); Round4(&B,C,D,A, 9, 21, 63);
// Then perform the following additions. (let's add)
*A2 = A + AA;
*B2 = B + BB;
*C2 = C + CC;
*D2 = D + DD;
//The clearance of confidential information
memset(pX, 0, sizeof(X));
}
//-------------------------------------------------------------------
// The function for the exteriors
/** output is the coded binary in the character sequence which wants to code string. */
void MD5_String2binary(const char * string, char * output)
{
//var
/*8bit*/
unsigned char padding_message[64]; //Extended message 512bit 64byte
unsigned char *pstring; //The position of string in the present scanning notes is held.
// unsigned char digest[16];
/*32bit*/
unsigned int string_byte_len, //The byte chief of string is held.
string_bit_len, //The bit length of string is held.
copy_len, //The number of bytes which is used by 1-3 and which remained
msg_digest[4]; //Message digest 128bit 4byte
unsigned int *A = &msg_digest[0], //The message digest in accordance with RFC (reference)
*B = &msg_digest[1],
*C = &msg_digest[2],
*D = &msg_digest[3];
int i;
//prog
//Step 3.Initialize MD Buffer (although it is the initialization; step 3 of A, B, C, and D -- unavoidable -- a head)
*A = 0x67452301;
*B = 0xefcdab89;
*C = 0x98badcfe;
*D = 0x10325476;
//Step 1.Append Padding Bits (extension of a mark bit)
//1-1
string_byte_len = strlen(string); //The byte chief of a character sequence is acquired.
pstring = (unsigned char *)string; //The position of the present character sequence is set.
//1-2 Repeat calculation until length becomes less than 64 bytes.
for (i=string_byte_len; 64<=i; i-=64,pstring+=64)
MD5_Round_Calculate(pstring, A,B,C,D);
//1-3
copy_len = string_byte_len % 64; //The number of bytes which remained is computed.
strncpy((char *)padding_message, (char *)pstring, copy_len); //A message is copied to an extended bit sequence.
memset(padding_message+copy_len, 0, 64 - copy_len); //It buries by 0 until it becomes extended bit length.
padding_message[copy_len] |= 0x80; //The next of a message is 1.
//1-4
//If 56 bytes or more (less than 64 bytes) of remainder becomes, it will calculate by extending to 64 bytes.
if (56 <= copy_len) {
MD5_Round_Calculate(padding_message, A,B,C,D);
memset(padding_message, 0, 56); //56 bytes is newly fill uped with 0.
}
//Step 2.Append Length (the information on length is added)
string_bit_len = string_byte_len * 8; //From the byte chief to bit length (32 bytes of low rank)
memcpy(&padding_message[56], &string_bit_len, 4); //32 bytes of low rank is set.
//When bit length cannot be expressed in 32 bytes of low rank, it is a beam raising to a higher rank.
if (UINT_MAX / 8 < string_byte_len) {
unsigned int high = (string_byte_len - UINT_MAX / 8) * 8;
memcpy(&padding_message[60], &high, 4);
} else
memset(&padding_message[60], 0, 4); //In this case, it is good for a higher rank at 0.
//Step 4.Process Message in 16-Word Blocks (calculation of MD5)
MD5_Round_Calculate(padding_message, A,B,C,D);
//Step 5.Output (output)
memcpy(output,msg_digest,16);
// memcpy (digest, msg_digest, and 16); //8 byte*4 < - 32byte conversion A function called Encode as used in the field of RFC
/* sprintf(output,
"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
digest[ 0], digest[ 1], digest[ 2], digest[ 3],
digest[ 4], digest[ 5], digest[ 6], digest[ 7],
digest[ 8], digest[ 9], digest[10], digest[11],
digest[12], digest[13], digest[14], digest[15]);*/
}
/** output is the coded character sequence in the character sequence which wants to code string. */
void MD5_String(const char * string, char * output)
{
unsigned char digest[16];
MD5_String2binary(string,(char*)digest);
sprintf(output,
"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
digest[ 0], digest[ 1], digest[ 2], digest[ 3],
digest[ 4], digest[ 5], digest[ 6], digest[ 7],
digest[ 8], digest[ 9], digest[10], digest[11],
digest[12], digest[13], digest[14], digest[15]);
}

10
src/ladmin/md5calc.h
View File

@ -1,10 +0,0 @@
// (c) eAthena Dev Team - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
#ifndef _MD5CALC_H_
#define _MD5CALC_H_
void MD5_String(const char * string, char * output);
void MD5_String2binary(const char * string, char * output);
#endif

15
src/login/Makefile
View File

@ -4,22 +4,23 @@ COMMON_OBJ = ../common/obj/core.o ../common/obj/socket.o ../common/obj/timer.o \
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o \
../common/obj/strlib.o ../common/obj/graph.o ../common/obj/grfio.o \
../common/obj/mapindex.o ../common/obj/ers.o ../zlib/unz.o
../common/obj/mapindex.o ../common/obj/ers.o ../common/obj/md5calc.h \
../zlib/unz.o
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
../common/graph.h ../common/grfio.h ../common/mapindex.h
../common/graph.h ../common/grfio.h ../common/mapindex.h \
../common/md5calc.h
%.o: %.c
$(COMPILE.c) -DTXT_ONLY $(OUTPUT_OPTION) $<
login-server: login.o md5calc.o $(COMMON_OBJ)
$(CC) -o ../../$@ login.o md5calc.o $(COMMON_OBJ) $(LIB_S)
login-server: login.o $(COMMON_OBJ)
$(CC) -o ../../$@ login.o $(COMMON_OBJ) $(LIB_S)
clean:
rm -f *.o ../../login-server
rm -f *.o ../../login-server GNUmakefile
# DO NOT DELETE
login.o: login.c login.h md5calc.h $(COMMON_H)
md5calc.o: md5calc.c md5calc.h
login.o: login.c login.h $(COMMON_H)

2
src/login/login.c
View File

@ -35,7 +35,7 @@
#include "login.h"
#ifdef PASSWORDENC
#include "md5calc.h"
#include "../common/md5calc.h"
#endif
int account_id_count = START_ACCOUNT_NUM;

13
src/login_sql/Makefile
View File

@ -4,19 +4,20 @@ COMMON_OBJ = ../common/obj/core.o ../common/obj/socket.o ../common/obj/timer.o \
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o \
../common/obj/strlib.o ../common/obj/graph.o ../common/obj/grfio.o \
../common/obj/mapindex.o ../common/obj/ers.o ../zlib/unz.o
../common/obj/mapindex.o ../common/obj/ers.o ../common/md5calc.o \
../zlib/unz.o
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
../common/graph.h ../common/grfio.h ../common/mapindex.h
../common/graph.h ../common/grfio.h ../common/mapindex.h \
../common/md5calc.h
login-server_sql: login.o md5calc.o $(COMMON_OBJ)
login-server_sql: login.o $(COMMON_OBJ)
$(CC) -o ../../$@ $^ $(LIB_S)
clean:
rm -f *.o ../../login-server_sql
rm -f *.o ../../login-server_sql GNUmakefile
# DO NOT DELETE
login.o: login.c login.h md5calc.h $(COMMON_H)
md5calc.o: md5calc.c md5calc.h
login.o: login.c login.h $(COMMON_H)

2
src/login_sql/login.c
View File

@ -41,7 +41,7 @@
#include "login.h"
#ifdef PASSWORDENC
#include "md5calc.h"
#include "../common/md5calc.h"
#endif
#define J_MAX_MALLOC_SIZE 65535

6
src/login_sql/make.sh
View File

@ -1,6 +0,0 @@
#!/bin/sh
rsqlt=`rm -rf *.o`
gcc -c login.c -I/usr/local/include/mysql/
gcc -c md5calc.c -I/usr/local/include/mysql/
gcc -c strlib.c
gcc -o login-server login.o strlib.o md5calc.o ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o -L/usr/local/lib/mysql/ -lmysqlclient -lz

239
src/login_sql/md5calc.c
View File

@ -1,239 +0,0 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
/***********************************************************
* md5 calculation algorithm
*
* The source code referred to the following URL.
* http://www.geocities.co.jp/SiliconValley-Oakland/8878/lab17/lab17.html
*
***********************************************************/
#include "md5calc.h"
#include <string.h>
#include <stdio.h>
#ifndef UINT_MAX
#define UINT_MAX 4294967295U
#endif
// Global variable
static unsigned int *pX;
// Stirng Table
static const unsigned int T[] = {
0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, //0
0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, //4
0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, //8
0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, //12
0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, //16
0xd62f105d, 0x2441453, 0xd8a1e681, 0xe7d3fbc8, //20
0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, //24
0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, //28
0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, //32
0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, //36
0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x4881d05, //40
0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, //44
0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, //48
0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, //52
0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, //56
0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391 //60
};
// ROTATE_LEFT The left is made to rotate x [ n-bit ]. This is diverted as it is from RFC.
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
// The function used for other calculation
static unsigned int F(unsigned int X, unsigned int Y, unsigned int Z)
{
return (X & Y) | (~X & Z);
}
static unsigned int G(unsigned int X, unsigned int Y, unsigned int Z)
{
return (X & Z) | (Y & ~Z);
}
static unsigned int H(unsigned int X, unsigned int Y, unsigned int Z)
{
return X ^ Y ^ Z;
}
static unsigned int I(unsigned int X, unsigned int Y, unsigned int Z)
{
return Y ^ (X | ~Z);
}
static unsigned int Round(unsigned int a, unsigned int b, unsigned int FGHI,
unsigned int k, unsigned int s, unsigned int i)
{
return b + ROTATE_LEFT(a + FGHI + pX[k] + T[i], s);
}
static void Round1(unsigned int *a, unsigned int b, unsigned int c,
unsigned int d,unsigned int k, unsigned int s, unsigned int i)
{
*a = Round(*a, b, F(b,c,d), k, s, i);
}
static void Round2(unsigned int *a, unsigned int b, unsigned int c,
unsigned int d,unsigned int k, unsigned int s, unsigned int i)
{
*a = Round(*a, b, G(b,c,d), k, s, i);
}
static void Round3(unsigned int *a, unsigned int b, unsigned int c,
unsigned int d,unsigned int k, unsigned int s, unsigned int i)
{
*a = Round(*a, b, H(b,c,d), k, s, i);
}
static void Round4(unsigned int *a, unsigned int b, unsigned int c,
unsigned int d,unsigned int k, unsigned int s, unsigned int i)
{
*a = Round(*a, b, I(b,c,d), k, s, i);
}
static void MD5_Round_Calculate(const unsigned char *block,
unsigned int *A2, unsigned int *B2, unsigned int *C2, unsigned int *D2)
{
//create X It is since it is required.
unsigned int X[16]; //512bit 64byte
int j,k;
//Save A as AA, B as BB, C as CC, and and D as DD (saving of A, B, C, and D)
unsigned int A=*A2, B=*B2, C=*C2, D=*D2;
unsigned int AA = A,BB = B,CC = C,DD = D;
//It is a large region variable reluctantly because of calculation of a round. . . for Round1...4
pX = X;
//Copy block(padding_message) i into X
for (j=0,k=0; j<64; j+=4,k++)
X[k] = ( (unsigned int )block[j] ) // 8byte*4 -> 32byte conversion
| ( ((unsigned int )block[j+1]) << 8 ) // A function called Decode as used in the field of RFC
| ( ((unsigned int )block[j+2]) << 16 )
| ( ((unsigned int )block[j+3]) << 24 );
//Round 1
Round1(&A,B,C,D, 0, 7, 0); Round1(&D,A,B,C, 1, 12, 1); Round1(&C,D,A,B, 2, 17, 2); Round1(&B,C,D,A, 3, 22, 3);
Round1(&A,B,C,D, 4, 7, 4); Round1(&D,A,B,C, 5, 12, 5); Round1(&C,D,A,B, 6, 17, 6); Round1(&B,C,D,A, 7, 22, 7);
Round1(&A,B,C,D, 8, 7, 8); Round1(&D,A,B,C, 9, 12, 9); Round1(&C,D,A,B, 10, 17, 10); Round1(&B,C,D,A, 11, 22, 11);
Round1(&A,B,C,D, 12, 7, 12); Round1(&D,A,B,C, 13, 12, 13); Round1(&C,D,A,B, 14, 17, 14); Round1(&B,C,D,A, 15, 22, 15);
//Round 2
Round2(&A,B,C,D, 1, 5, 16); Round2(&D,A,B,C, 6, 9, 17); Round2(&C,D,A,B, 11, 14, 18); Round2(&B,C,D,A, 0, 20, 19);
Round2(&A,B,C,D, 5, 5, 20); Round2(&D,A,B,C, 10, 9, 21); Round2(&C,D,A,B, 15, 14, 22); Round2(&B,C,D,A, 4, 20, 23);
Round2(&A,B,C,D, 9, 5, 24); Round2(&D,A,B,C, 14, 9, 25); Round2(&C,D,A,B, 3, 14, 26); Round2(&B,C,D,A, 8, 20, 27);
Round2(&A,B,C,D, 13, 5, 28); Round2(&D,A,B,C, 2, 9, 29); Round2(&C,D,A,B, 7, 14, 30); Round2(&B,C,D,A, 12, 20, 31);
//Round 3
Round3(&A,B,C,D, 5, 4, 32); Round3(&D,A,B,C, 8, 11, 33); Round3(&C,D,A,B, 11, 16, 34); Round3(&B,C,D,A, 14, 23, 35);
Round3(&A,B,C,D, 1, 4, 36); Round3(&D,A,B,C, 4, 11, 37); Round3(&C,D,A,B, 7, 16, 38); Round3(&B,C,D,A, 10, 23, 39);
Round3(&A,B,C,D, 13, 4, 40); Round3(&D,A,B,C, 0, 11, 41); Round3(&C,D,A,B, 3, 16, 42); Round3(&B,C,D,A, 6, 23, 43);
Round3(&A,B,C,D, 9, 4, 44); Round3(&D,A,B,C, 12, 11, 45); Round3(&C,D,A,B, 15, 16, 46); Round3(&B,C,D,A, 2, 23, 47);
//Round 4
Round4(&A,B,C,D, 0, 6, 48); Round4(&D,A,B,C, 7, 10, 49); Round4(&C,D,A,B, 14, 15, 50); Round4(&B,C,D,A, 5, 21, 51);
Round4(&A,B,C,D, 12, 6, 52); Round4(&D,A,B,C, 3, 10, 53); Round4(&C,D,A,B, 10, 15, 54); Round4(&B,C,D,A, 1, 21, 55);
Round4(&A,B,C,D, 8, 6, 56); Round4(&D,A,B,C, 15, 10, 57); Round4(&C,D,A,B, 6, 15, 58); Round4(&B,C,D,A, 13, 21, 59);
Round4(&A,B,C,D, 4, 6, 60); Round4(&D,A,B,C, 11, 10, 61); Round4(&C,D,A,B, 2, 15, 62); Round4(&B,C,D,A, 9, 21, 63);
// Then perform the following additions. (let's add)
*A2 = A + AA;
*B2 = B + BB;
*C2 = C + CC;
*D2 = D + DD;
//The clearance of confidential information
memset(pX, 0, sizeof(X));
}
//-------------------------------------------------------------------
// The function for the exteriors
/** output is the coded binary in the character sequence which wants to code string. */
void MD5_String2binary(const char * string, char * output)
{
//var
/*8bit*/
unsigned char padding_message[64]; //Extended message 512bit 64byte
unsigned char *pstring; //The position of string in the present scanning notes is held.
// unsigned char digest[16];
/*32bit*/
unsigned int string_byte_len, //The byte chief of string is held.
string_bit_len, //The bit length of string is held.
copy_len, //The number of bytes which is used by 1-3 and which remained
msg_digest[4]; //Message digest 128bit 4byte
unsigned int *A = &msg_digest[0], //The message digest in accordance with RFC (reference)
*B = &msg_digest[1],
*C = &msg_digest[2],
*D = &msg_digest[3];
int i;
//prog
//Step 3.Initialize MD Buffer (although it is the initialization; step 3 of A, B, C, and D -- unavoidable -- a head)
*A = 0x67452301;
*B = 0xefcdab89;
*C = 0x98badcfe;
*D = 0x10325476;
//Step 1.Append Padding Bits (extension of a mark bit)
//1-1
string_byte_len = strlen(string); //The byte chief of a character sequence is acquired.
pstring = (unsigned char *)string; //The position of the present character sequence is set.
//1-2 Repeat calculation until length becomes less than 64 bytes.
for (i=string_byte_len; 64<=i; i-=64,pstring+=64)
MD5_Round_Calculate(pstring, A,B,C,D);
//1-3
copy_len = string_byte_len % 64; //The number of bytes which remained is computed.
strncpy((char *)padding_message, (char *)pstring, copy_len); //A message is copied to an extended bit sequence.
memset(padding_message+copy_len, 0, 64 - copy_len); //It buries by 0 until it becomes extended bit length.
padding_message[copy_len] |= 0x80; //The next of a message is 1.
//1-4
//If 56 bytes or more (less than 64 bytes) of remainder becomes, it will calculate by extending to 64 bytes.
if (56 <= copy_len) {
MD5_Round_Calculate(padding_message, A,B,C,D);
memset(padding_message, 0, 56); //56 bytes is newly fill uped with 0.
}
//Step 2.Append Length (the information on length is added)
string_bit_len = string_byte_len * 8; //From the byte chief to bit length (32 bytes of low rank)
memcpy(&padding_message[56], &string_bit_len, 4); //32 bytes of low rank is set.
//When bit length cannot be expressed in 32 bytes of low rank, it is a beam raising to a higher rank.
if (UINT_MAX / 8 < string_byte_len) {
unsigned int high = (string_byte_len - UINT_MAX / 8) * 8;
memcpy(&padding_message[60], &high, 4);
} else
memset(&padding_message[60], 0, 4); //In this case, it is good for a higher rank at 0.
//Step 4.Process Message in 16-Word Blocks (calculation of MD5)
MD5_Round_Calculate(padding_message, A,B,C,D);
//Step 5.Output (output)
memcpy(output,msg_digest,16);
// memcpy (digest, msg_digest, and 16); //8 byte*4 < - 32byte conversion A function called Encode as used in the field of RFC
/* sprintf(output,
"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
digest[ 0], digest[ 1], digest[ 2], digest[ 3],
digest[ 4], digest[ 5], digest[ 6], digest[ 7],
digest[ 8], digest[ 9], digest[10], digest[11],
digest[12], digest[13], digest[14], digest[15]);*/
}
/** output is the coded character sequence in the character sequence which wants to code string. */
void MD5_String(const char * string, char * output)
{
unsigned char digest[16];
MD5_String2binary(string,(char*)digest);
sprintf(output,
"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
digest[ 0], digest[ 1], digest[ 2], digest[ 3],
digest[ 4], digest[ 5], digest[ 6], digest[ 7],
digest[ 8], digest[ 9], digest[10], digest[11],
digest[12], digest[13], digest[14], digest[15]);
}

10
src/login_sql/md5calc.h
View File

@ -1,10 +0,0 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
#ifndef _MD5CALC_H_
#define _MD5CALC_H_
void MD5_String(const char * string, char * output);
void MD5_String2binary(const char * string, char * output);
#endif

2
src/map/npc.c
View File

@ -2943,7 +2943,7 @@ int do_final_npc(void)
if ((bl = map_id2bl(i))){
if (bl->type == BL_NPC)
npc_unload((struct npc_data *)bl);
else if (bl->type&(BL_MOB|BL_PET))//## why BL_PET? [FlavioJS] //## Because this is invoked after saving/wiping all players, which would include all pets. This bit of code will take care of any pets without a master that are still lingering in the map. [Skotlex]
else if (bl->type&(BL_MOB|BL_PET))//# why BL_PET? [FlavioJS] //# Because this is invoked after saving/wiping all players, which would include all pets. This bit of code will take care of any pets without a master that are still lingering in the map. [Skotlex]
unit_free(bl, 0);
}
}

37
src/map/script.c
View File

@ -499,12 +499,11 @@ static const char *skip_word(const char *p)
if(*p=='#') p++; // account変数用
if(*p=='#') p++; // ワールドaccount変数用
while(isalnum(*p)||*p=='_'|| *p>=0x81) { //#FIXME: Changing from unsigned char to signed char makes p never be able to go above 0x81, but what IS 0x81 for?
if(*p>=0x81 && p[1]){
p+=2;
} else
//# Changing from unsigned char to signed char makes p never be able to go above 0x81, but what IS 0x81 for? [Skotlex]
//# It's for multibyte encodings like Shift-JIS. Unfortunately this can be problematic for singlebyte encodings.
// Using (*p)>>7 would yield the appropriate result but it's better to restrict words to ASCII characters only. [FlavioJS]
while( ISALNUM(*p) || *p == '_' )
p++;
}
// postfix
if(*p=='$') p++; // 文字列変数
@ -989,7 +988,7 @@ const char* parse_syntax(const char* p) {
}
break;
case 'c':
if(!strncmp(p,"case",4) && !isalpha(*(p + 4))) {
if(!strncmp(p,"case",4) && !ISALPHA(p[4])) {
// case の処理
if(syntax.curly_count <= 0 || syntax.curly[syntax.curly_count - 1].type != TYPE_SWITCH) {
disp_error_message("parse_syntax: unexpected 'case' ",p);
@ -1044,7 +1043,7 @@ const char* parse_syntax(const char* p) {
syntax.curly[pos].count++;
}
return p + 1;
} else if(!strncmp(p,"continue",8) && !isalpha(*(p + 8))) {
} else if(!strncmp(p,"continue",8) && !ISALPHA(p[8])) {
// continue の処理
char label[256];
int pos = syntax.curly_count - 1;
@ -1077,7 +1076,7 @@ const char* parse_syntax(const char* p) {
}
break;
case 'd':
if(!strncmp(p,"default",7) && !isalpha(p[7])) {
if(!strncmp(p,"default",7) && !ISALPHA(p[7])) {
// switch - default の処理
if(syntax.curly_count <= 0 || syntax.curly[syntax.curly_count - 1].type != TYPE_SWITCH) {
disp_error_message("parse_syntax: unexpected 'default'",p);
@ -1117,7 +1116,7 @@ const char* parse_syntax(const char* p) {
p = skip_word(p);
return p + 1;
}
} else if(!strncmp(p,"do",2) && !isalpha(*(p + 2))) {
} else if(!strncmp(p,"do",2) && !ISALPHA(p[2])) {
int l;
char label[256];
p=skip_word(p);
@ -1136,7 +1135,7 @@ const char* parse_syntax(const char* p) {
}
break;
case 'f':
if(!strncmp(p,"for",3) && !isalpha(*(p + 3))) {
if(!strncmp(p,"for",3) && !ISALPHA(p[3])) {
int l;
char label[256];
int pos = syntax.curly_count;
@ -1215,7 +1214,7 @@ const char* parse_syntax(const char* p) {
l=add_str(label);
set_label(l,script_pos,p);
return p;
} else if(!strncmp(p,"function",8) && !isalpha(*(p + 8))) {
} else if(!strncmp(p,"function",8) && !ISALPHA(p[8])) {
const char *func_name;
// function
p=skip_word(p);
@ -1257,7 +1256,7 @@ const char* parse_syntax(const char* p) {
}
break;
case 'i':
if(!strncmp(p,"if",2) && !isalpha(*(p + 2))) {
if(!strncmp(p,"if",2) && !ISALPHA(p[2])) {
// if() の処理
char label[256];
p=skip_word(p);
@ -1279,7 +1278,7 @@ const char* parse_syntax(const char* p) {
}
break;
case 's':
if(!strncmp(p,"switch",6) && !isalpha(*(p + 6))) {
if(!strncmp(p,"switch",6) && !ISALPHA(p[6])) {
// switch() の処理
char label[256];
syntax.curly[syntax.curly_count].type = TYPE_SWITCH;
@ -1303,7 +1302,7 @@ const char* parse_syntax(const char* p) {
}
break;
case 'w':
if(!strncmp(p,"while",5) && !isalpha(*(p + 5))) {
if(!strncmp(p,"while",5) && !ISALPHA(p[5])) {
int l;
char label[256];
p=skip_word(p);
@ -1371,11 +1370,11 @@ const char* parse_syntax_close_sub(const char* p,int* flag) {
syntax.curly[pos].count++;
p = skip_space(p);
if(!syntax.curly[pos].flag && !strncmp(p,"else",4) && !isalpha(*(p + 4))) {
if(!syntax.curly[pos].flag && !strncmp(p,"else",4) && !ISALPHA(p[4])) {
// else or else - if
p = skip_word(p);
p = skip_space(p);
if(!strncmp(p,"if",2) && !isalpha(*(p + 2))) {
if(!strncmp(p,"if",2) && !ISALPHA(p[2])) {
// else - if
p=skip_word(p);
p=skip_space(p);
@ -11326,7 +11325,7 @@ int buildin_charisalpha(struct script_state *st) {
char *str=conv_str(st,& (st->stack->stack_data[st->start+2]));
int pos=conv_num(st,& (st->stack->stack_data[st->start+3]));
int val = ( str && pos>0 && (unsigned int)pos<strlen(str) ) ? isalpha( str[pos] ) : 0;
int val = ( str && pos>0 && (unsigned int)pos<strlen(str) ) ? ISALPHA( str[pos] ) : 0;
push_val(st->stack,C_INT,val);
return 0;
@ -11366,9 +11365,9 @@ int buildin_compare(struct script_state *st) {
message = conv_str(st,& (st->stack->stack_data[st->start+2]));
cmpstring = conv_str(st,& (st->stack->stack_data[st->start+3]));
for (j = 0; message[j]; j++)
message[j] = tolower(message[j]);
message[j] = TOLOWER(message[j]);
for (j = 0; cmpstring[j]; j++)
cmpstring[j] = tolower(cmpstring[j]);
cmpstring[j] = TOLOWER(cmpstring[j]);
push_val(st->stack,C_INT,(strstr(message,cmpstring) != NULL));
return 0;
}

2
src/plugins/Makefile
View File

@ -42,7 +42,7 @@ upnp.$(PLUGINEXT): ../../plugins/upnp.conf
depend:
makedepend -fGNUmakefile -o.$(PLUGINEXT) -Y. -Y../common *.c
clean:
rm -rf $(PLUGINS)
rm -rf $(PLUGINS) GNUmakefile
# DO NOT DELETE

4
vcproj-7.1/login-server_sql.vcproj
View File

@ -172,7 +172,7 @@
RelativePath="..\src\common\malloc.c">
</File>
<File
RelativePath="..\src\login_sql\md5calc.c">
RelativePath="..\src\common\md5calc.c">
</File>
<File
RelativePath="..\src\common\nullpo.c">
@ -224,7 +224,7 @@
RelativePath="..\src\common\malloc.h">
</File>
<File
RelativePath="..\src\login_sql\md5calc.h">
RelativePath="..\src\common\md5calc.h">
</File>
<File
RelativePath="..\src\common\mmo.h">

4
vcproj-7.1/login-server_txt.vcproj
View File

@ -174,7 +174,7 @@
RelativePath="..\src\common\malloc.c">
</File>
<File
RelativePath="..\src\login\md5calc.c">
RelativePath="..\src\common\md5calc.c">
</File>
<File
RelativePath="..\src\common\nullpo.c">
@ -226,7 +226,7 @@
RelativePath="..\src\common\malloc.h">
</File>
<File
RelativePath="..\src\login\md5calc.h">
RelativePath="..\src\common\md5calc.h">
</File>
<File
RelativePath="..\src\common\mmo.h">

2
vcproj-8/login-server_sql.vcproj
View File

@ -239,7 +239,7 @@
>
</File>
<File
RelativePath="..\src\login_sql\md5calc.c"
RelativePath="..\src\common\md5calc.c"
>
</File>
<File

2
vcproj-8/login-server_txt.vcproj
View File

@ -242,7 +242,7 @@
>
</File>
<File
RelativePath="..\src\login\md5calc.c"
RelativePath="..\src\common\md5calc.c"
>
</File>
<File