This commit is contained in:
lotodore
+7
-6
@@ -111,20 +111,21 @@ SOURCES += pokerth.cpp \
|
|||||||
clientdata.cpp \
|
clientdata.cpp \
|
||||||
clientcallback.cpp \
|
clientcallback.cpp \
|
||||||
socket_helper_cmn.cpp \
|
socket_helper_cmn.cpp \
|
||||||
thread.cpp
|
thread.cpp \
|
||||||
|
rand.cpp
|
||||||
TEMPLATE = vcapp
|
TEMPLATE = vcapp
|
||||||
RESOURCES = src/gui/qt/deck.qrc
|
RESOURCES = src/gui/qt/deck.qrc
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
DEPENDPATH += . src uics src/config src/core/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/waitforservertostartgamedialog src/gui/qt/startnetworkgamedialog src/gui/qt/createnetworkgamedialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/core/
|
DEPENDPATH += . src uics src/config src/core/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/waitforservertostartgamedialog src/gui/qt/startnetworkgamedialog src/gui/qt/createnetworkgamedialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/core src/core/common
|
||||||
INCLUDEPATH += . src uics src/config src/core/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/waitforservertostartgamedialog src/gui/qt/startnetworkgamedialog src/gui/qt/createnetworkgamedialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/core/
|
INCLUDEPATH += . src uics src/config src/core/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/waitforservertostartgamedialog src/gui/qt/startnetworkgamedialog src/gui/qt/createnetworkgamedialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/core src/core/common
|
||||||
win32 {
|
win32 {
|
||||||
DEPENDPATH += src/net/win32/
|
DEPENDPATH += src/net/win32/ src/core/win32
|
||||||
INCLUDEPATH += ../boost/
|
INCLUDEPATH += ../boost/
|
||||||
LIBPATH += ../boost/stage/lib
|
LIBPATH += ../boost/stage/lib
|
||||||
LIBS += ws2_32.lib
|
LIBS += ws2_32.lib advapi32.lib
|
||||||
}
|
}
|
||||||
!win32 {
|
!win32 {
|
||||||
DEPENDPATH += src/net/linux/
|
DEPENDPATH += src/net/linux/ src/core/linux
|
||||||
LIBS += -lboost_thread -l ssl
|
LIBS += -lboost_thread -l ssl
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
#ifndef RAND_H
|
||||||
|
#define RAND_H
|
||||||
|
|
||||||
|
void RandomBytes(unsigned char *buf, unsigned size);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 <boost/thread.hpp>
|
||||||
|
#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;
|
||||||
|
};
|
||||||
|
|
||||||
|
void
|
||||||
|
RandomBytes(unsigned char *buf, unsigned size)
|
||||||
|
{
|
||||||
|
static boost::thread_specific_ptr<CryptData> m_cryptData;
|
||||||
|
|
||||||
|
if (!m_cryptData.get())
|
||||||
|
m_cryptData.reset(new CryptData);
|
||||||
|
|
||||||
|
HCRYPTPROV provider = m_cryptData.get()->cryptProvider;
|
||||||
|
|
||||||
|
if (provider)
|
||||||
|
::CryptGenRandom(provider, size, buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -18,6 +18,7 @@
|
|||||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include "tools.h"
|
#include "tools.h"
|
||||||
|
#include <core/rand.h>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
@@ -43,9 +44,7 @@ void Tools::getRandNumber(int start, int end, int howMany, int* randArray, bool
|
|||||||
|
|
||||||
for (i=0; i<howMany; i++) {
|
for (i=0; i<howMany; i++) {
|
||||||
|
|
||||||
if(!RAND_bytes(rand_buf,4)) {
|
RandomBytes(rand_buf,4);
|
||||||
RAND_pseudo_bytes(rand_buf,4);
|
|
||||||
}
|
|
||||||
|
|
||||||
randNumber = 0;
|
randNumber = 0;
|
||||||
for(j=0; j<4; j++) {
|
for(j=0; j<4; j++) {
|
||||||
@@ -66,9 +65,7 @@ void Tools::getRandNumber(int start, int end, int howMany, int* randArray, bool
|
|||||||
int counter(0);
|
int counter(0);
|
||||||
while (counter < howMany) {
|
while (counter < howMany) {
|
||||||
|
|
||||||
if(!RAND_bytes(rand_buf,4)) {
|
RandomBytes(rand_buf,4);
|
||||||
RAND_pseudo_bytes(rand_buf,4);
|
|
||||||
}
|
|
||||||
|
|
||||||
randNumber = 0;
|
randNumber = 0;
|
||||||
for(j=0; j<4; j++) {
|
for(j=0; j<4; j++) {
|
||||||
|
|||||||
@@ -22,7 +22,6 @@
|
|||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <openssl/rand.h>
|
|
||||||
|
|
||||||
|
|
||||||
class Tools{
|
class Tools{
|
||||||
|
|||||||
Reference in New Issue
Block a user