Remove bundled bnethash.cpp and bnethash.h in D2GS and rely on those files from the 'common' target
This commit is contained in:
relesgoe
parent
cd0726e074
commit
b01c4f661d
4 changed files with 2 additions and 283 deletions
|
|
@ -1,7 +1,5 @@
|
|||
add_executable(d2gs WIN32
|
||||
bn_types.h
|
||||
bnethash.cpp
|
||||
bnethash.h
|
||||
callback.cpp
|
||||
callback.h
|
||||
charlist.cpp
|
||||
|
|
@ -49,7 +47,7 @@ add_executable(d2gs WIN32
|
|||
|
||||
target_compile_definitions(d2gs PRIVATE D2GS _USE_32BIT_TIME_T)
|
||||
|
||||
target_link_libraries(d2gs PRIVATE ws2_32 d2gelib)
|
||||
target_link_libraries(d2gs PRIVATE common ws2_32 d2gelib)
|
||||
|
||||
set_target_properties(d2gs
|
||||
PROPERTIES
|
||||
|
|
|
|||
|
|
@ -1,239 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 1999 Descolada (dyn1-tnt9-237.chicago.il.ameritech.net)
|
||||
* Copyright (C) 1999,2000 Ross Combs (rocombs@cs.nmsu.edu)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
namespace pvpgn
|
||||
{
|
||||
|
||||
namespace d2gs
|
||||
{
|
||||
|
||||
#ifndef ROTL
|
||||
#define ROTL(x,n,w) (((n)%(w)) ? (((x)<<((n)%(w))) | ((x)>>((w)-((n)%(w))))) : (x))
|
||||
#endif
|
||||
#ifndef ROTL32
|
||||
#define ROTL32(x,n) ROTL(x,n,32)
|
||||
#endif
|
||||
|
||||
typedef unsigned int t_uint32;
|
||||
typedef t_uint32 t_hash[5];
|
||||
|
||||
|
||||
static void hash_init(t_hash* hash);
|
||||
static void do_hash(t_hash* hash, t_uint32* tmp);
|
||||
static void hash_set_16(t_uint32* dst, unsigned char const* src, unsigned int count);
|
||||
|
||||
|
||||
static void hash_init(t_hash* hash)
|
||||
{
|
||||
(*hash)[0] = 0x67452301;
|
||||
(*hash)[1] = 0xefcdab89;
|
||||
(*hash)[2] = 0x98badcfe;
|
||||
(*hash)[3] = 0x10325476;
|
||||
(*hash)[4] = 0xc3d2e1f0;
|
||||
}
|
||||
|
||||
|
||||
static void do_hash(t_hash* hash, t_uint32* tmp)
|
||||
{
|
||||
unsigned int i;
|
||||
t_uint32 a, b, c, d, e, g;
|
||||
|
||||
for (i = 0; i < 64; i++)
|
||||
tmp[i + 16] = ROTL32(1, tmp[i] ^ tmp[i + 8] ^ tmp[i + 2] ^ tmp[i + 13]);
|
||||
|
||||
a = (*hash)[0];
|
||||
b = (*hash)[1];
|
||||
c = (*hash)[2];
|
||||
d = (*hash)[3];
|
||||
e = (*hash)[4];
|
||||
|
||||
for (i = 0; i < 20 * 1; i++)
|
||||
{
|
||||
g = tmp[i] + ROTL32(a, 5) + e + ((b & c) | (~b & d)) + 0x5a827999;
|
||||
e = d;
|
||||
d = c;
|
||||
c = ROTL32(b, 30);
|
||||
b = a;
|
||||
a = g;
|
||||
}
|
||||
|
||||
for (; i < 20 * 2; i++)
|
||||
{
|
||||
g = (d ^ c ^ b) + e + ROTL32(g, 5) + tmp[i] + 0x6ed9eba1;
|
||||
e = d;
|
||||
d = c;
|
||||
c = ROTL32(b, 30);
|
||||
b = a;
|
||||
a = g;
|
||||
}
|
||||
|
||||
for (; i < 20 * 3; i++)
|
||||
{
|
||||
g = tmp[i] + ROTL32(g, 5) + e + ((c & b) | (d & c) | (d & b)) - 0x70e44324;
|
||||
e = d;
|
||||
d = c;
|
||||
c = ROTL32(b, 30);
|
||||
b = a;
|
||||
a = g;
|
||||
}
|
||||
|
||||
for (; i < 20 * 4; i++)
|
||||
{
|
||||
g = (d ^ c ^ b) + e + ROTL32(g, 5) + tmp[i] - 0x359d3e2a;
|
||||
e = d;
|
||||
d = c;
|
||||
c = ROTL32(b, 30);
|
||||
b = a;
|
||||
a = g;
|
||||
}
|
||||
|
||||
(*hash)[0] += g;
|
||||
(*hash)[1] += b;
|
||||
(*hash)[2] += c;
|
||||
(*hash)[3] += d;
|
||||
(*hash)[4] += e;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Fill 16 elements of the array of 32 bit values with the bytes from
|
||||
* dst up to count in little endian order. Fill left over space with
|
||||
* zeros
|
||||
*/
|
||||
static void hash_set_16(t_uint32* dst, unsigned char const* src, unsigned int count)
|
||||
{
|
||||
unsigned int i;
|
||||
unsigned int pos;
|
||||
|
||||
for (pos = 0, i = 0; i < 16; i++)
|
||||
{
|
||||
dst[i] = 0;
|
||||
if (pos < count)
|
||||
dst[i] |= ((t_uint32)src[pos]);
|
||||
pos++;
|
||||
if (pos < count)
|
||||
dst[i] |= ((t_uint32)src[pos]) << 8;
|
||||
pos++;
|
||||
if (pos < count)
|
||||
dst[i] |= ((t_uint32)src[pos]) << 16;
|
||||
pos++;
|
||||
if (pos < count)
|
||||
dst[i] |= ((t_uint32)src[pos]) << 24;
|
||||
pos++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
extern int bnet_hash(t_hash* hashout, unsigned int size, void const* datain)
|
||||
{
|
||||
t_uint32 tmp[64 + 16];
|
||||
unsigned char const* data;
|
||||
unsigned int inc;
|
||||
|
||||
if (!hashout || !*hashout)
|
||||
return -1;
|
||||
|
||||
if (size > 0 && !datain)
|
||||
return -1;
|
||||
|
||||
hash_init(hashout);
|
||||
|
||||
data = (const unsigned char*)datain;
|
||||
while (size > 0)
|
||||
{
|
||||
if (size > 64)
|
||||
inc = 64;
|
||||
else
|
||||
inc = size;
|
||||
|
||||
hash_set_16(tmp, data, inc);
|
||||
do_hash(hashout, tmp);
|
||||
|
||||
data += inc;
|
||||
size -= inc;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
extern int hash_eq(t_hash const h1, t_hash const h2)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
if (!h1 || !h2)
|
||||
return -1;
|
||||
|
||||
for (i = 0; i < 5; i++)
|
||||
if (h1[i] != h2[i])
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
extern char const* hash_get_str(t_hash const hash)
|
||||
{
|
||||
static char temp[8 * 5 + 1]; /* each of 5 ints to 8 chars + null */
|
||||
unsigned int i;
|
||||
|
||||
if (!hash)
|
||||
return NULL;
|
||||
|
||||
for (i = 0; i < 5; i++)
|
||||
sprintf(&temp[i * 8], "%08x", hash[i]);
|
||||
|
||||
return temp;
|
||||
}
|
||||
|
||||
|
||||
extern int hash_set_str(t_hash* hash, char const* str)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
if (!hash)
|
||||
return -1;
|
||||
|
||||
if (!*hash)
|
||||
return -1;
|
||||
|
||||
if (!str)
|
||||
return -1;
|
||||
|
||||
if (strlen(str) != 5 * 8)
|
||||
return -1;
|
||||
|
||||
for (i = 0; i < 5; i++)
|
||||
if (sscanf(&str[i * 8], "%8x", &(*hash)[i]) != 1)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 1999 Descolada (dyn1-tnt9-237.chicago.il.ameritech.net)
|
||||
* Copyright (C) 1999,2000 Ross Combs (rocombs@cs.nmsu.edu)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#ifndef INCLUDED_BNETHASH_TYPES
|
||||
#define INCLUDED_BNETHASH_TYPES
|
||||
|
||||
namespace pvpgn
|
||||
{
|
||||
|
||||
namespace d2gs
|
||||
{
|
||||
|
||||
typedef unsigned int t_uint32;
|
||||
typedef t_uint32 t_hash[5];
|
||||
|
||||
extern int bnet_hash(t_hash* hashout, unsigned int size, void const* data);
|
||||
extern int hash_eq(t_hash const h1, t_hash const h2);
|
||||
extern char const* hash_get_str(t_hash const hash);
|
||||
extern int hash_set_str(t_hash* hash, char const* str);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif /* INCLUDED_BNETHASH_TYPES */
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <d2server.h>
|
||||
#include "common/bnethash.h"
|
||||
#include "d2gs.h"
|
||||
#include "eventlog.h"
|
||||
#include "config.h"
|
||||
|
|
@ -16,7 +17,6 @@
|
|||
#include "vars.h"
|
||||
#include "charlist.h"
|
||||
#include "telnetd.h"
|
||||
#include "bnethash.h"
|
||||
#include "utils.h"
|
||||
#include "d2ge.h"
|
||||
#include "server.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue