Replaced ACE_Auto_Array_Ptr
This commit is contained in:
1 parent
33dc72a812
commit
0df19b9087
3 files changed
+8
-8
No files matched your search
@@ -16,13 +16,11 @@
|
|||||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <ace/Guard_T.h>
|
|
||||||
|
|
||||||
#include "Cryptography/BigNumber.h"
|
#include "Cryptography/BigNumber.h"
|
||||||
#include <openssl/bn.h>
|
#include <openssl/bn.h>
|
||||||
#include <openssl/crypto.h>
|
#include <openssl/crypto.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <ace/Auto_Ptr.h>
|
#include <memory>
|
||||||
|
|
||||||
BigNumber::BigNumber()
|
BigNumber::BigNumber()
|
||||||
: _bn(BN_new())
|
: _bn(BN_new())
|
||||||
@@ -170,7 +168,7 @@ bool BigNumber::isZero() const
|
|||||||
return BN_is_zero(_bn);
|
return BN_is_zero(_bn);
|
||||||
}
|
}
|
||||||
|
|
||||||
ACE_Auto_Array_Ptr<uint8> BigNumber::AsByteArray(int32 minSize, bool littleEndian)
|
std::unique_ptr<uint8> BigNumber::AsByteArray(int32 minSize, bool littleEndian)
|
||||||
{
|
{
|
||||||
int length = (minSize >= GetNumBytes()) ? minSize : GetNumBytes();
|
int length = (minSize >= GetNumBytes()) ? minSize : GetNumBytes();
|
||||||
|
|
||||||
@@ -186,7 +184,7 @@ ACE_Auto_Array_Ptr<uint8> BigNumber::AsByteArray(int32 minSize, bool littleEndia
|
|||||||
if (littleEndian)
|
if (littleEndian)
|
||||||
std::reverse(array, array + length);
|
std::reverse(array, array + length);
|
||||||
|
|
||||||
ACE_Auto_Array_Ptr<uint8> ret(array);
|
std::unique_ptr<uint8> ret(array);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,8 +19,9 @@
|
|||||||
#ifndef _AUTH_BIGNUMBER_H
|
#ifndef _AUTH_BIGNUMBER_H
|
||||||
#define _AUTH_BIGNUMBER_H
|
#define _AUTH_BIGNUMBER_H
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
#include "Define.h"
|
#include "Define.h"
|
||||||
#include <ace/Auto_Ptr.h>
|
|
||||||
|
|
||||||
struct bignum_st;
|
struct bignum_st;
|
||||||
|
|
||||||
@@ -87,7 +88,7 @@ class BigNumber
|
|||||||
|
|
||||||
uint32 AsDword();
|
uint32 AsDword();
|
||||||
|
|
||||||
ACE_Auto_Array_Ptr<uint8> AsByteArray(int32 minSize = 0, bool littleEndian = true);
|
std::unique_ptr<uint8> AsByteArray(int32 minSize = 0, bool littleEndian = true);
|
||||||
|
|
||||||
char * AsHexStr() const;
|
char * AsHexStr() const;
|
||||||
char * AsDecStr() const;
|
char * AsDecStr() const;
|
||||||
|
|||||||
@@ -183,7 +183,8 @@ int Master::Run()
|
|||||||
cliThread = new std::thread(CliThread);
|
cliThread = new std::thread(CliThread);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::thread rarThread(RemoteAccessThread);
|
// TODO C++11/Boost
|
||||||
|
// std::thread rarThread(RemoteAccessThread);
|
||||||
|
|
||||||
#if defined(_WIN32) || defined(__linux__)
|
#if defined(_WIN32) || defined(__linux__)
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user