mirror of
https://github.com/QuasarApp/Heart.git
synced 2025-05-11 08:59:41 +00:00
fix build without ssl
This commit is contained in:
parent
9ff5f6664b
commit
e412b58a28
@ -8,6 +8,8 @@
|
||||
|
||||
#include "authecdsa.h"
|
||||
|
||||
#ifdef USE_HEART_SSL
|
||||
|
||||
#include <openssl/ecdsa.h> // for ECDSA_do_sign, ECDSA_do_verify
|
||||
#include <openssl/obj_mac.h> // for NID_secp192k1
|
||||
#include <openssl/evp.h>
|
||||
@ -239,3 +241,4 @@ bool AuthECDSA::prepareKeyAdnGroupObjects(EC_KEY **eckey, EC_GROUP **ecgroup) {
|
||||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
@ -9,10 +9,14 @@
|
||||
#ifndef AUTHECDSA_H
|
||||
#define AUTHECDSA_H
|
||||
|
||||
#ifdef USE_HEART_SSL
|
||||
|
||||
|
||||
#include "abstractdata.h"
|
||||
#include <asynckeysauth.h>
|
||||
#include <openssl/ec.h> // for EC_GROUP_new_by_curve_name, EC_GROUP_free, EC_KEY_new, EC_KEY_set_group, EC_KEY_generate_key, EC_KEY_free
|
||||
|
||||
#include <openssl/ec.h> // for EC_GROUP_new_by_curve_name, EC_GROUP_free, EC_KEY_new, EC_KEY_set_group, EC_KEY_generate_key,
|
||||
EC_KEY_free
|
||||
|
||||
namespace QH {
|
||||
|
||||
@ -46,5 +50,6 @@ private:
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif // AUTHECDSA_H
|
||||
|
@ -222,7 +222,8 @@ bool DataBase::upgradeDataBase() {
|
||||
if (!fsupportUpgrade) {
|
||||
|
||||
QuasarAppUtils::Params::log("The data base of application do not support soft upgrade. "
|
||||
"Please remove database monyaly and restart application.",
|
||||
"Please remove database monyaly and restart application."
|
||||
"You can disable upgrade functions for this override the upgradeDataBase method. ",
|
||||
QuasarAppUtils::Error);
|
||||
return false;
|
||||
}
|
||||
|
@ -428,7 +428,13 @@ protected:
|
||||
*/
|
||||
virtual DBPatchMap dbPatches() const;
|
||||
|
||||
|
||||
/**
|
||||
* @brief upgradeDataBase This method upgrade data base to actyaly database version.
|
||||
* @note The last version of dbPatches is actyaly version.
|
||||
* @return true if operation finished successful
|
||||
* @note if you want to disable this feature then override this method and return true.
|
||||
*/
|
||||
virtual bool upgradeDataBase();
|
||||
private:
|
||||
/**
|
||||
* @brief workWithSubscribe This method work with subscribe commnads.
|
||||
@ -443,13 +449,6 @@ private:
|
||||
|
||||
bool isForbidenTable(const QString& table);
|
||||
|
||||
/**
|
||||
* @brief upgradeDataBase This method upgrade data base to actyaly database version.
|
||||
* @note The last version of dbPatches is actyaly version.
|
||||
* @return true if operation finished successful
|
||||
*/
|
||||
bool upgradeDataBase();
|
||||
|
||||
ISqlDBCache *_db = nullptr;
|
||||
QString _localNodeName;
|
||||
friend class DataBaseNode;
|
||||
|
@ -9,6 +9,9 @@
|
||||
#include "authecdsa.h"
|
||||
#include <QtTest>
|
||||
#include "thread"
|
||||
|
||||
#ifdef USE_HEART_SSL
|
||||
|
||||
/*
|
||||
* test class
|
||||
*/
|
||||
@ -94,3 +97,4 @@ void ECDSAAuthTest::test() {
|
||||
|
||||
|
||||
}
|
||||
#endif
|
||||
|
@ -11,6 +11,8 @@
|
||||
#include "test.h"
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef USE_HEART_SSL
|
||||
|
||||
class ECDSAAuthTest: public Test, protected TestUtils
|
||||
{
|
||||
public:
|
||||
@ -20,5 +22,6 @@ public:
|
||||
void test();
|
||||
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif // ECDSAAUTHTEST_H
|
||||
|
@ -43,8 +43,12 @@ private slots:
|
||||
TestCase(abstractNodeTest, AbstractNodeTest)
|
||||
TestCase(bigDataTest, BigDataTest);
|
||||
TestCase(shedullerTest, ShedullerTest);
|
||||
|
||||
#ifdef USE_HEART_SSL
|
||||
TestCase(ecdsaAuthTest, ECDSAAuthTest);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#if HEART_BUILD_LVL >= 1
|
||||
TestCase(baseNodeTest, BaseNodeTest)
|
||||
TestCase(singleNodeTest, SingleServerTest)
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit b6d3b0f72e129a78871a42d5e17dac18d1400cdb
|
||||
Subproject commit b0321a2c089f9eebb6d49f275837cf0bfe9864f6
|
Loading…
x
Reference in New Issue
Block a user