sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now using openssl on windows instead of ms crypto api. Can't stand all these handles for the crypto api, openssl will be required later anyway. MD5 sums will be used when transfering avatars for efficient caching - avatars are identified by their MD5 sum.

Browse Source 
Sorry for making it even harder to compile on windows...
This commit is contained in:
lotodore
2007-09-08 11:00:46 +00:00
parent c5c6bec710
commit d0898ed336
10 changed files with 26 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/linux/rand.cpp
-34
View File
@@ -1,34 +0,0 @@
/***************************************************************************
* Copyright (C) 2007 by Lothar May *
* *
* 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. *
***************************************************************************/
#ifdef _WIN32
#error This source code is not for Win32.
#endif
#include <openssl/rand.h>
#include <core/rand.h>
void
RandomBytes(unsigned char *buf, unsigned size)
{
if(!RAND_bytes(buf, size))
{
RAND_pseudo_bytes(buf, size);
}
}
src/core/rand.h
-7
View File
@@ -1,7 +0,0 @@
#ifndef RAND_H
#define RAND_H
void RandomBytes(unsigned char *buf, unsigned size);
#endif
src/core/win32/rand.cpp
-63
View File
@@ -1,63 +0,0 @@
/***************************************************************************
* Copyright (C) 2007 by Lothar May *
* *
* 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 _WIN32
#error This source code is Win32 only.
#endif
#include <windows.h>
#include <wincrypt.h>
#include <core/rand.h>
class CryptData
{
public:
CryptData()
{
if (!::CryptAcquireContext(
&cryptProvider,
NULL,
NULL,
PROV_RSA_FULL,
CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
{
cryptProvider = 0;
}
}
~CryptData()
{
if (cryptProvider)
CryptReleaseContext(cryptProvider, 0);
}
HCRYPTPROV cryptProvider;
};
static CryptData g_cryptData;
void
RandomBytes(unsigned char *buf, unsigned size)
{
HCRYPTPROV provider = g_cryptData.cryptProvider;
if (provider)
::CryptGenRandom(provider, size, buf);
}
src/engine/local_engine/tools.cpp
+13 -3
View File
@@ -17,8 +17,12 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#define NOMINMAX // for Windows
#include "tools.h"
#include <core/rand.h>
#include <openssl/rand.h>
#include <limits>
using namespace std;
@@ -34,7 +38,10 @@ void Tools::getRandNumber(int start, int end, int howMany, int* randArray, bool
for (i=0; i<howMany; i++) {
RandomBytes(rand_buf,4);
if(!RAND_bytes(rand_buf, 4))
{
RAND_pseudo_bytes(rand_buf, 4);
}
randNumber = 0;
for(j=0; j<4; j++) {
@@ -55,7 +62,10 @@ void Tools::getRandNumber(int start, int end, int howMany, int* randArray, bool
int counter(0);
while (counter < howMany) {
RandomBytes(rand_buf,4);
if(!RAND_bytes(rand_buf, 4))
{
RAND_pseudo_bytes(rand_buf, 4);
}
randNumber = 0;
for(j=0; j<4; j++) {
src/engine/local_engine/tools.h
-2
View File
@@ -20,8 +20,6 @@
#ifndef TOOLS_H
#define TOOLS_H
#include <limits>
class Tools{
public:
src/net/common/servergamestate.cpp
-1
View File
@@ -25,7 +25,6 @@
#include <net/netpacket.h>
#include <net/socket_msg.h>
#include <net/netexception.h>
#include <core/rand.h>
#include <gamedata.h>
#include <game.h>
#include <playerinterface.h>
src/net/common/serverlobbythread.cpp
+7 -2
View File
@@ -24,7 +24,7 @@
#include <net/sendercallback.h>
#include <net/receiverhelper.h>
#include <net/socket_msg.h>
#include <core/rand.h>
#include <openssl/rand.h>
#include <boost/lambda/lambda.hpp>
@@ -490,7 +490,12 @@ ServerLobbyThread::HandleNewConnection(boost::shared_ptr<ConnectData> connData)
// Create a random session id.
// This id can be used to reconnect to the server if the connection was lost.
unsigned sessionId;
RandomBytes((unsigned char *)&sessionId, sizeof(sessionId)); // TODO: check for collisions.
// TODO: check for collisions.
if(!RAND_bytes((unsigned char *)&sessionId, sizeof(sessionId)))
{
RAND_pseudo_bytes((unsigned char *)&sessionId, sizeof(sessionId));
}
// Create a new session.
boost::shared_ptr<SessionData> sessionData(new SessionData(connData->ReleaseSocket(), sessionId));